pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various minor string fixes.

pull/90/head
Dave Page 2022-08-17 12:47:13 +01:00
parent 71647c886d
commit c8ef4733d0
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/misc/cloud/static/js/CloudWizard.jsx
View File

@ -310,7 +310,7 @@ export default function CloudWizard({ nodeInfo, nodeData, onClose}) {
}
})
.catch((error) => {
setErrMsg([MESSAGE_TYPE.ERROR, gettext(`Error while verification EDB BigAnimal: ${error.response.data.errormsg}`)]);
setErrMsg([MESSAGE_TYPE.ERROR, gettext(`Error while verifying EDB BigAnimal: ${error.response.data.errormsg}`)]);
});
}, 1000);

2
web/pgadmin/misc/cloud/static/js/azure.js
View File

@ -60,7 +60,7 @@ export function AzureCredentials(props) {
}
})
.catch((error) => {
_eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD',[MESSAGE_TYPE.ERROR, gettext(`Error while verification Microsoft Azure: ${error}`)]);
_eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD',[MESSAGE_TYPE.ERROR, gettext(`Error while verifying Microsoft Azure: ${error}`)]);
reject(false);
});
});

14
web/pgadmin/misc/cloud/static/js/azure_schema.ui.js
View File

@ -44,7 +44,7 @@ class AzureCredSchema extends BaseUISchema {
isError = true;
setErrMsg(
'azure_tenant_id',
gettext('Azure Tenant Id is required for Azure interactive authentication.')
gettext('Azure Tenant ID is required for Azure interactive authentication.')
);
}
return isError;
@ -427,7 +427,7 @@ class AzureDatabaseSchema extends BaseUISchema {
if (data.db_username.length < 1 && data.db_username.length > 63 && !/^[A-Za-z0-9]*$/.test(data.db_username)) {
setErrMsg(
'db_username',
gettext('Admin username must be more than 1 character & less than 63 and must only contains characters and numbers.')
gettext('The Admin username must be between 1-63 characters long, and must only contain alphabetic characters and numbers.')
);
return true;
}
@ -435,7 +435,7 @@ class AzureDatabaseSchema extends BaseUISchema {
if (
['azure_superuser', 'azure_pg_admin', 'admin', 'administrator', 'root', 'guest', 'public'].includes(data.db_username) ||
data.db_username.startsWith('pg_')) {
setErrMsg('db_username', gettext('Specified Admin username is not allowed'));
setErrMsg('db_username', gettext('Specified Admin username is not allowed.'));
return true;
}
return false;
@ -487,7 +487,7 @@ class AzureDatabaseSchema extends BaseUISchema {
mode: ['create'],
noEmpty: true,
helpMessage: gettext(
'The admin username must be 1-63 characters long and can only contain character, numbers and the underscore character. The username cannot be "azure_superuser", "azure_pg_admin", "admin", "administrator", "root", "guest", "public", or start with "pg_".'
'The admin username must be 1-63 characters long and can only contain characters, numbers and the underscore character. The username cannot be "azure_superuser", "azure_pg_admin", "admin", "administrator", "root", "guest", "public", or start with "pg_".'
),
},
{
@ -524,7 +524,7 @@ class AzureNetworkSchema extends BaseUISchema {
type: 'text',
mode: ['create'],
helpMessage: gettext(
'List of IP Addresses or range of IP Addresses (start IP Address - end IP address) from which inbound traffic should be accepted. Add multiple IP addresses/ranges separated with commas, for example: "192.168.0.50, 192.168.0.100 - 192.168.0.200"'
'List of IP addresses or range of IP addresses (start IP Address - end IP address) from which inbound traffic should be accepted. Add multiple IP addresses/ranges separated with commas, for example: "192.168.0.50, 192.168.0.100 - 192.168.0.200"'
),
},
];
@ -704,7 +704,7 @@ class AzureClusterSchema extends BaseUISchema {
setErr('db_instance_class',gettext('Instance class cannot be empty.'));
return true;
}
}
}
validateNetworkDetails(data, setErr){
if(isEmptyString(data.instance_type)){
@ -725,7 +725,7 @@ class AzureClusterSchema extends BaseUISchema {
validate(data, setErr) {
if ( !isEmptyString(data.name) && (!/^[a-z0-9\-]*$/.test(data.name) || data.name.length < 3)) {
setErr('name',gettext('Name must be more than 2 characters or more & must only contain lowercase letters, numbers, and hyphens'));
setErr('name',gettext('Name must be more than 2 characters and must only contain lowercase letters, numbers, and hyphens'));
return true;
}

4
web/pgadmin/misc/cloud/static/js/biganimal.js
View File

@ -149,7 +149,7 @@ export function validateBigAnimal() {
}
})
.catch((error) => {
reject(`Error while fetchng EDB BigAnimal verification uri: ${error.response.data.errormsg}`);
reject(`Error while fetching EDB BigAnimal verification URI: ${error.response.data.errormsg}`);
});
});
}
@ -188,7 +188,7 @@ export function getBigAnimalSummary(cloud, bigAnimalInstanceData, bigAnimalDatab
createData('Database Type', bigAnimalDatabaseData.database_type),
createData('Database Version', bigAnimalDatabaseData.postgres_version),
createData('High Availability', bigAnimalDatabaseData.high_availability),
createData('No of Standby Replicas', bigAnimalDatabaseData.replicas),
createData('No. of Standby Replicas', bigAnimalDatabaseData.replicas),
];
return [rows1, rows2, rows3, rows4];

10
web/pgadmin/misc/cloud/static/js/cloud_db_details_schema.ui.js
View File

@ -39,7 +39,7 @@ class CloudInstanceDetailsSchema extends BaseUISchema {
}, {
id: 'public_ip', label: gettext('Public IP range'), type: 'text',
mode: ['create'],
helpMessage: gettext('IP Address range for permitting the inbound traffic. Ex: 127.0.0.1/32, add multiple ip addresses/ranges by comma separated.'),
helpMessage: gettext('IP address range for allowed inbound traffic, for example: 127.0.0.1/32. Add multiple IP addresses/ranges separated with commas.'),
}, {
type: 'nested-fieldset', label: gettext('Version & Instance'),
mode: ['create'],
@ -161,7 +161,7 @@ class DatabaseSchema extends BaseUISchema {
}, {
id: 'db_password', label: gettext('Password'), type: 'password',
mode: ['create'], noEmpty: true,
helpMessage: gettext('At least 8 printable ASCII characters. Can not contain any of the following: / \(slash\), \'\(single quote\), "\(double quote\) and @ \(at sign\).')
helpMessage: gettext('At least 8 printable ASCII characters. Cannot contain any of the following: / \(slash\), \'\(single quote\), "\(double quote\) and @ \(at sign\).')
}, {
id: 'db_confirm_password', label: gettext('Confirm password'),
type: 'password',
@ -489,7 +489,7 @@ class BigAnimalDatabaseSchema extends BaseUISchema {
return true;
}
if (data.high_availability == true && (isEmptyString(data.replicas) || data.replicas <= 0)) {
setErrMsg('replicas', gettext('Please select no. of stand by replicas.'));
setErrMsg('replicas', gettext('Please select number of stand by replicas.'));
return true;
}
return false;
@ -575,7 +575,7 @@ class BigAnimalClusterSchema extends BaseUISchema {
},{
id: 'biganimal_public_ip', label: gettext('Public IP range'), type: 'text',
mode: ['create'],
helpMessage: gettext('IP Address range for permitting the inbound traffic. Ex: 127.0.0.1/32, add multiple ip addresses/ranges by comma separated. Leave it blank for 0.0.0.0/0'),
helpMessage: gettext('IP address range for allowed inbound traffic, for example: 127.0.0.1/32. Add multiple IP addresses/ranges separated with commas. Leave blank for 0.0.0.0/0'),
},{
type: 'nested-fieldset', label: gettext('Instance Type'),
mode: ['create'], deps: ['region'],
@ -616,7 +616,7 @@ class BigAnimalHighAvailSchema extends BaseUISchema {
id: 'high_availability_note', type: 'note',
mode: ['create'],
text: gettext('High availability clusters are configured with one primary and up to two '
+ 'stand by replicas. Clusters are configured across availability zones in regions with availability zones.'),
+ 'standby replicas. Clusters are configured across availability zones in regions with availability zones.'),
},{
id: 'high_availability', label: gettext('High availability'), type: 'switch',
mode: ['create']