Javascript string cleanup

web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_jobs/static/js/dbms_job.ui.js

@@ -172,7 +172,7 @@ export default class DBMSJobSchema extends BaseUISchema {
         end_time_js = moment(end_time_js[0] + ' ' + end_time_js[1]);
 
         if(end_time_js.isBefore(start_time_js)) {
-          setError('jsscend', gettext('Start time must be less than end time'));
+          setError('jsscend', gettext('Start time must be earlier than end time.'));
           return true;
         } else {
           setError('jsscend', null);

web/pgadmin/browser/server_groups/servers/databases/dbms_job_scheduler/dbms_schedules/static/js/dbms_schedule.ui.js

@@ -77,7 +77,7 @@ export default class DBMSScheduleSchema extends BaseUISchema {
       end_time_js = moment(end_time_js[0] + ' ' + end_time_js[1]);
 
       if(end_time_js.isBefore(start_time_js)) {
-        setError('jsscend', gettext('Start time must be less than end time'));
+        setError('jsscend', gettext('Start time must be earlier than end time.'));
         return true;
       } else {
         setError('jsscend', null);

web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.ui.js

@@ -409,7 +409,7 @@ class RangeSchema extends BaseUISchema {
 
     if(state.typtype === 'r') {
       if (isEmptyString(state.typname)) {
-        errmsg = gettext('Subtype cannot be empty');
+        errmsg = gettext('Subtype cannot be empty.');
         setError('typname', errmsg);
         return true;
       }
@@ -812,13 +812,13 @@ class ExternalSchema extends BaseUISchema {
     if(state.typtype === 'b') {
 
       if (isEmptyString(state.typinput)) {
-        errmsg = gettext('Input function cannot be empty');
+        errmsg = gettext('Input function cannot be empty.');
         setError('typinput', errmsg);
         return true;
       }
 
       if (isEmptyString(state.typoutput)) {
-        errmsg = gettext('Output function cannot be empty');
+        errmsg = gettext('Output function cannot be empty.');
         setError('typoutput', errmsg);
         return true;
       }

web/pgadmin/browser/server_groups/servers/databases/subscriptions/static/js/subscription.ui.js

@@ -185,7 +185,7 @@ export default class SubscriptionSchema extends BaseUISchema{
       id: 'pub', label: gettext('Publication'),
       group: gettext('Connection'), mode: ['create', 'edit'],
       deps: ['all_table', 'host', 'port', 'username', 'db', 'password'], disabled: obj.isAllConnectionDataEnter,
-      helpMessage: gettext('Click the refresh button to get the publications'),
+      helpMessage: gettext('Click the refresh button to get the publications.'),
       helpMessageMode: ['edit', 'create'],
       type: (state)=>{
         return {
@@ -316,7 +316,7 @@ export default class SubscriptionSchema extends BaseUISchema{
       group: gettext('With'),
       disabled: obj.isSameDB,
       readonly: obj.isConnect, deps :['connect', 'host', 'port'],
-      helpMessage: gettext('Specifies whether the command should create the replication slot on the publisher.This field will be disabled and set to false if subscription connects to same database.Otherwise, the CREATE SUBSCRIPTION call will hang.'),
+      helpMessage: gettext('Specifies whether the command should create the replication slot on the publisher. This field will be disabled and set to false if the subscription connects to the same database. Otherwise, the CREATE SUBSCRIPTION call will hang.'),
       helpMessageMode: ['edit', 'create'],
       depChange: (state) => {
         // Set create_slot to false if same DB, else true
@@ -332,7 +332,7 @@ export default class SubscriptionSchema extends BaseUISchema{
       type: 'switch', mode: ['create','edit', 'properties'],
       group: gettext('With'),
       readonly: obj.isConnect, deps :['connect'],
-      helpMessage: gettext('Specifies whether the subscription should be actively replicating, or whether it should be just setup but not started yet.'),
+      helpMessage: gettext('Specifies whether the subscription should be actively replicating, or whether it should be just set up but not started yet.'),
       helpMessageMode: ['edit', 'create'],
     },
     {
@@ -483,15 +483,15 @@ export default class SubscriptionSchema extends BaseUISchema{
       type: 'switch', mode: ['create', 'edit', 'properties'],
       group: gettext('With'),
       min_version: 170000,
-      helpMessage: gettext('Specifies whether the replication slots associated with the subscription are enabled to be synced to the standbys so that logical replication can be resumed from the new primary after failover'),
+      helpMessage: gettext('Specifies whether the replication slots associated with the subscription are enabled to be synced to the standbys so that logical replication can be resumed from the new primary after failover.'),
       helpMessageMode: ['edit', 'create'],
     },
     ];
   }
 
   validate(state, setError) {
     let errmsg = null;
-    errmsg = gettext('Either Host name, Address must be specified.');
+    errmsg = gettext('Either Host name or Address must be specified.');
     if(isEmptyString(state.host)) {
       setError('host', errmsg);
       return true;

web/pgadmin/browser/server_groups/servers/pgagent/schedules/static/js/pga_schedule.ui.js

@@ -252,7 +252,7 @@ export default class PgaJobScheduleSchema extends BaseUISchema {
       end_time_js = moment(end_time_js[0] + ' ' + end_time_js[1]);
 
       if(end_time_js.isBefore(start_time_js)) {
-        setError('jscend', gettext('Start time must be less than end time'));
+        setError('jscend', gettext('Start time must be earlier than end time.'));
         return true;
       } else {
         setError('jscend', null);

web/pgadmin/browser/server_groups/servers/pgagent/steps/static/js/pga_jobstep.ui.js

@@ -220,7 +220,7 @@ export default class PgaJobStepSchema extends BaseUISchema {
     }
 
     if (isEmptyString(state.jstonerror)) {
-      setError('jstonerror', gettext('Please select valid on error option.'));
+      setError('jstonerror', gettext('Please select a valid on error option.'));
       return true;
     } else {
       setError('jstonerror', null);

web/pgadmin/browser/server_groups/servers/roles/static/js/role.ui.js

@@ -100,7 +100,7 @@ export default class RoleSchema extends BaseUISchema {
         group: gettext('Definition'), label: gettext('Account expires'),
         mode: ['properties', 'edit', 'create'],
         deps: ['rolcanlogin'],
-        helpMessage: gettext('Please note that if you leave this field blank, then password will never expire.'),
+        helpMessage: gettext('Please note that if you leave this field blank, then the password will never expire.'),
         helpMessageMode: ['edit', 'create'],
         controlProps: {
           ampm: false,

web/pgadmin/browser/server_groups/servers/roles/static/js/roleReassign.js

@@ -54,7 +54,7 @@ export default class RoleReassign extends BaseUISchema{
           { 'label': gettext('Reassign'), 'value': 'reassign' },
           { 'label': gettext('Drop'), 'value': 'drop' },
         ],
-        helpMessage: gettext('Change the ownership or\ndrop the database objects owned by a database role')
+        helpMessage: gettext('Change the ownership or\ndrop the database objects owned by a database role.')
       },
       {
         id: 'new_role_id',
@@ -96,7 +96,7 @@ export default class RoleReassign extends BaseUISchema{
             }
           };
         },
-        helpMessage: gettext('New owner of the affected objects'),
+        helpMessage: gettext('New owner of the affected objects.'),
         deps: ['role_op'],
         disabled: (state)=>{
           return state.role_op == 'drop';
@@ -128,13 +128,13 @@ export default class RoleReassign extends BaseUISchema{
         group: gettext('General'),
         type: 'switch',
         deps: ['role_op'],
-        helpMessage: gettext('Note: CASCADE will automatically drop objects that depend on the affected objects, and in turn all objects that depend on those objects')
+        helpMessage: gettext('Note: CASCADE will automatically drop objects that depend on the affected objects, and in turn all objects that depend on those objects.')
       },
       {
         id: 'did',
         label: gettext('From database'),
         group: gettext('General'),
-        helpMessage: gettext('Target database on which the operation will be carried out'),
+        helpMessage: gettext('Target database on which the operation will be carried out.'),
         type: ()=>{
           return {
             type: 'select',
@@ -162,13 +162,13 @@ export default class RoleReassign extends BaseUISchema{
     let obj = this;
 
     if (state.role_op == 'reassign' && isEmptyString(state.new_role_id)) {
-      errmsg = gettext('\'Reassign objects to\' can not be empty');
+      errmsg = gettext('\'Reassign objects to\' cannot be empty.');
       setError('new_role_id', errmsg);
       return true;
     }
 
     if (isEmptyString(state.did)) {
-      errmsg = gettext('\'From database \' can not be empty');
+      errmsg = gettext('\'From database\' cannot be empty.');
       setError('did', errmsg);
       return true;
     }

web/pgadmin/browser/static/js/withCheckPermission.js

@@ -21,7 +21,7 @@ export default function withCheckPermission(options, callback) {
     } else {
       pgAdmin.Browser.notifier.alert(
         gettext('Permission Denied'),
-        gettext('You don’t have the necessary permissions to access this feature. Please contact your administrator for assistance')
+        gettext('You don\'t have the necessary permissions to access this feature. Please contact your administrator for assistance.')
       );
     }
   };

web/pgadmin/browser/templates/browser/js/messages.js

@@ -26,7 +26,7 @@ define(
     'SQL_NO_CHANGE': gettext('Nothing changed'),
     'MUST_BE_INT' : gettext("'%s' must be an integer."),
     'MUST_BE_NUM' : gettext("'%s' must be a numeric."),
-    'INVALID_MIN_MAX' : gettext("Min and Max values are not valid"),
+    'INVALID_MIN_MAX' : gettext("Min and Max values are not valid."),
     'MUST_GR_EQ' : gettext("'%s' must be greater than or equal to %s."),
     'MUST_LESS_EQ' : gettext("'%s' must be less than or equal to %s."),
     'CANNOT_BE_EMPTY': gettext("'%s' cannot be empty."),

web/pgadmin/misc/cloud/static/js/aws_schema.ui.js

@@ -101,7 +101,7 @@ class CloudDBCredSchema extends BaseUISchema {
       }, {
         id: 'session_token', label: gettext('AWS session token'), type: 'multiline',
         mode: ['create'], noEmpty: false,
-        helpMessage: gettext('Temporary AWS session required session token.')
+        helpMessage: gettext('Session token required for temporary AWS sessions.')
       }
     ];
   }

web/pgadmin/misc/cloud/static/js/azure.js

@@ -31,7 +31,7 @@ export function AzureCredentials(props) {
           'static', { 'filename': 'img/loading.gif'}
         );
         const axiosApi = getApiInstance();
-        _eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD', [MESSAGE_TYPE.INFO, 'Microsoft Azure authentication process is in progress..<img src="' + loading_icon_url + '" alt="' + gettext('Loading...') + '">']);
+        _eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD', [MESSAGE_TYPE.INFO, 'Microsoft Azure authentication process is in progress. <img src="' + loading_icon_url + '" alt="' + gettext('Loading...') + '">']);
         let _url = url_for('azure.verify_credentials');
         const post_data = {
           cloud: 'azure',

web/pgadmin/misc/cloud/static/js/azure_schema.ui.js

@@ -166,7 +166,7 @@ class AzureCredSchema extends BaseUISchema {
         deps: ['auth_btn'],
         type: (state)=>({
           type: 'note',
-          text: `To complete the authenticatation, use a web browser to open the page https://microsoft.com/devicelogin and enter the code : <strong>${state.auth_code}</strong>`,
+          text: `To complete the authentication, use a web browser to open the page https://microsoft.com/devicelogin and enter the code: <strong>${state.auth_code}</strong>`,
         }),
         visible: (state)=>{
           return Boolean(state.auth_code);
@@ -720,7 +720,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 and 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;
     }
 

web/pgadmin/misc/cloud/static/js/google.js

@@ -32,7 +32,7 @@ export function GoogleCredentials(props) {
           'static', { 'filename': 'img/loading.gif'}
         );
         const axiosApi = getApiInstance();
-        _eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD', [MESSAGE_TYPE.INFO, 'Google authentication process is in progress..<img src="' + loading_icon_url + '" alt="' + gettext('Loading...') + '">']);
+        _eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD', [MESSAGE_TYPE.INFO, 'Google authentication process is in progress. <img src="' + loading_icon_url + '" alt="' + gettext('Loading...') + '">']);
         let _url = url_for('google.verify_credentials');
         const post_data = {
           cloud: 'google',
@@ -52,8 +52,8 @@ export function GoogleCredentials(props) {
             }
           })
           .catch((error) => {
-            _eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD',[MESSAGE_TYPE.ERROR, gettext(`Error while authentication: ${error}`)]);
-            reject(new Error(gettext(`Error while authentication: ${error}`)));
+            _eventBus.fireEvent('SET_ERROR_MESSAGE_FOR_CLOUD_WIZARD',[MESSAGE_TYPE.ERROR, gettext(`Error during authentication: ${error}`)]);
+            reject(new Error(gettext(`Error during authentication: ${error}`)));
           });
         });
       },

web/pgadmin/misc/cloud/static/js/google_schema.ui.js

@@ -334,7 +334,7 @@ class GoogleHighAvailabilitySchema extends BaseUISchema {
 
   validate(data, setErrMsg) {
     if (data.high_availability && (isEmptyString(data.secondary_availability_zone)) || (data.secondary_availability_zone == data.availability_zone)) {
-      setErrMsg('secondary_availability_zone', gettext('Please select Secondary availability zone different than primary.'));
+      setErrMsg('secondary_availability_zone', gettext('Please select a secondary availability zone different from the primary.'));
       return true;
     }
     return false;
@@ -505,7 +505,7 @@ class GoogleClusterSchema extends BaseUISchema {
 
   validate(data, setErr) {
     if ( !isEmptyString(data.name) && (!/^(?=[a-z])[a-z0-9-]*$/.test(data.name) || data.name.length > 97)) {
-      setErr('name',gettext('Name must only contain lowercase letters, numbers, and hyphens.Should start with a letter and must be 97 characters or less'));
+      setErr('name',gettext('Name must only contain lowercase letters, numbers, and hyphens. Should start with a letter and must be 97 characters or less.'));
       return true;
     }
     return false;

web/pgadmin/tools/backup/static/js/backup.ui.js

@@ -596,7 +596,7 @@ export default class BackupSchema extends BaseUISchema {
     }, {
       id: 'server_note',
       label: gettext('Note'),
-      text: gettext('The backup format will be PLAIN'),
+      text: gettext('The backup format will be PLAIN.'),
       type: 'note',
       visible: function() {
         return obj.backupType === 'server';
@@ -744,7 +744,7 @@ export default class BackupSchema extends BaseUISchema {
       label: gettext('objects'),
       group: gettext('Objects'),
       type: 'tree',
-      helpMessage: gettext('If Schema(s) is selected then it will take the backup of that selected schema(s) only'),
+      helpMessage: gettext('If Schema(s) is selected then it will take the backup of the selected schema(s) only.'),
       treeData: this.treeData,
       visible: () => {
         return isVisibleForServerBackup(obj?.backupType);

web/pgadmin/tools/backup/static/js/backupGlobal.ui.js

@@ -93,7 +93,7 @@ export default class BackupGlobalSchema extends BaseUISchema {
     }, {
       id: 'globals_note',
       label: gettext('Note'),
-      text: gettext('Only objects global to the entire database will be backed up, in PLAIN format'),
+      text: gettext('Only objects global to the entire database will be backed up, in PLAIN format.'),
       type: 'note',
     }];
   }

web/pgadmin/tools/erd/static/js/erd_tool/dialogs/OneToOneDialog.js

@@ -73,7 +73,7 @@ class OneToOneSchema extends BaseUISchema {
   validate(state, setError) {
     let tableData = this.localTableData.getData();
     if (tableData.primary_key.length && state.constraint_type === 'primary_key') {
-      setError('constraint_type', gettext('Primary key already exists, please select different constraint.'));
+      setError('constraint_type', gettext('Primary key already exists, please select a different constraint.'));
       return true;
     }
     return false;

web/pgadmin/tools/import_export/static/js/import_export.ui.js

@@ -135,7 +135,7 @@ export default class ImportExportSchema extends BaseUISchema {
           return (state?.format == 'binary' || !state?.is_import);
         },
         visible: !obj.isQueryExport,
-        helpMessage: gettext('Specifies how to behave when encountering an error converting a columns input value into its data type. An error_action value of stop means fail the command, while ignore means discard the input row and continue with the next one. The default is stop. The ignore option is applicable only for COPY FROM when the FORMAT is text or csv.')
+        helpMessage: gettext('Specifies how to behave when encountering an error converting a column\'s input value into its data type. An error_action value of stop means fail the command, while ignore means discard the input row and continue with the next one. The default is stop. The ignore option is applicable only for COPY FROM when the FORMAT is text or csv.')
       },
       {
         id: 'log_verbosity',
@@ -271,7 +271,7 @@ export default class ImportExportSchema extends BaseUISchema {
         disabled: function(state) {
           return (state?.format == 'binary' || !state?.is_import);
         },
-        helpMessage: gettext('Specifies the string that represents a default value. Each time the string is found in the input file, the default value of the corresponding column will be used. This option is allowed only in COPY FROM, and only when not using binary format'),
+        helpMessage: gettext('Specifies the string that represents a default value. Each time the string is found in the input file, the default value of the corresponding column will be used. This option is allowed only in COPY FROM, and only when not using binary format.'),
       },
       {
         id: 'export_group', type: 'group', label: obj.isQueryExport ? gettext('Query') : gettext('Columns'),
@@ -317,7 +317,7 @@ export default class ImportExportSchema extends BaseUISchema {
         group: 'export_group',
         type: 'sql',
         visible: obj.isQueryExport,
-        helpMessage: gettext('Specifies A SELECT, VALUES, INSERT, UPDATE, DELETE, or MERGE command whose results are to be copied.'),
+        helpMessage: gettext('Specifies a SELECT, VALUES, INSERT, UPDATE, DELETE, or MERGE command whose results are to be copied.'),
       },
       {
         id: 'force_quote_columns',
@@ -407,7 +407,7 @@ export default class ImportExportSchema extends BaseUISchema {
     if (this.isQueryExport) {
       let errmsg = null;
       if (isEmptyString(state.query)) {
-        errmsg = gettext('Export Data Query can not be empty.');
+        errmsg = gettext('Export Data Query cannot be empty.');
         setError('query', errmsg);
         return true;
       } else {

web/pgadmin/tools/maintenance/static/js/maintenance.ui.js

@@ -267,7 +267,7 @@ export class VacuumSchema extends BaseUISchema {
         }
         return false;
       },
-      helpMessage: gettext('Sizes should be specified as a string containing the numerical size followed by any one of the following memory units: kB (kilobytes), MB (megabytes), GB (gigabytes), or TB (terabytes)'),
+      helpMessage: gettext('Sizes should be specified as a string containing the numerical size followed by any one of the following memory units: kB (kilobytes), MB (megabytes), GB (gigabytes), or TB (terabytes).'),
       min_version: 160000,
     }, {
       id: 'reindex_system',

web/pgadmin/tools/psql/static/js/PsqlModule.js

@@ -91,7 +91,7 @@ export default class Psql {
       label: gettext('PSQL Tool'),
       data:{
         applies: 'tools',
-        data_disabled: gettext('Please select a database from the object explorer to access Pql Tool.'),
+        data_disabled: gettext('Please select a database from the object explorer to access the PSQL Tool.'),
       },
       permission: AllPermissionTypes.TOOLS_PSQL_TOOL,
     }];

web/pgadmin/tools/sqleditor/static/js/show_view_data.js

@@ -62,7 +62,7 @@ export default class DataFilterSchema extends BaseUISchema {
     let errmsg = null;
 
     if (isEmptyString(state.filter_sql)) {
-      errmsg = gettext('Data filter can not be empty.');
+      errmsg = gettext('Data filter cannot be empty.');
       setError('filter_sql', errmsg);
       return true;
     } else {