Javascript string cleanup

web/pgadmin/authenticate/mfa/views.py

@@ -172,7 +172,7 @@ def _mfa_registration_view(
 
     if form_data[mfa.name] == 'SETUP':
         if supported_mfa['registered'] is True:
-            flash(_("'{}' is already registered'").format(mfa.label),
+            flash(_("'{}' is already registered.").format(mfa.label),
                   MessageType.SUCCESS)
             return None
 

web/pgadmin/browser/register_browser_preferences.py

@@ -55,8 +55,8 @@ def register_browser_preferences(self):
             gettext("Hide shared servers?"), 'boolean', False,
             category_label=gettext('Display'),
             help_str=gettext(
-                'If set to True, then all shared servers will be '
-                'hidden from browser tree'
+                'If set to True, all shared servers will be '
+                'hidden from the browser tree.'
             )
         )
 
@@ -75,8 +75,8 @@ def register_browser_preferences(self):
         gettext("Confirm on close or refresh?"), 'boolean',
         True, category_label=PREF_LABEL_DISPLAY,
         help_str=gettext(
-            'Confirm closure or refresh of the browser or browser tab is '
-            'intended before proceeding.'
+            'Confirm that closure or refresh of the browser or browser tab '
+            'is intended before proceeding.'
         )
     )
 
@@ -114,7 +114,7 @@ def register_browser_preferences(self):
         min_val=1, max_val=9999,
         help_str=gettext(
             'The maximum number of history rows to show on '
-            'the Statistics tab for pgAgent jobs'
+            'the Statistics tab for pgAgent jobs.'
         )
     )
 
@@ -410,8 +410,8 @@ def register_browser_preferences(self):
         gettext("Dynamic tab size"), 'boolean', False,
         category_label=PREF_LABEL_TABS_SETTINGS,
         help_str=gettext(
-            'If set to True, the tabs will take full size as per the title, '
-            'it will also applicable for already opened tabs')
+            'If set to True, the tabs will take full size as per the title. '
+            'This will also apply to already opened tabs.')
     )
 
     self.qt_tab_title = self.preference.register(
@@ -422,8 +422,7 @@ def register_browser_preferences(self):
         help_str=gettext(
             'Supported placeholders are %DATABASE%, %USERNAME%, and %SERVER%. '
             'Users can provide any string with or without placeholders of'
-            ' their choice. The blank title will be revert back to the'
-            ' default title with placeholders.'
+            ' their choice. A blank title will revert to the default.'
         )
     )
 
@@ -435,8 +434,8 @@ def register_browser_preferences(self):
         help_str=gettext(
             'Supported placeholders are %SCHEMA%, %TABLE%, %DATABASE%, '
             '%USERNAME%, and %SERVER%. Users can provide any string with or '
-            'without placeholders of their choice. The blank title will be '
-            'revert back to the default title with placeholders.'
+            'without placeholders of their choice. A blank title will revert '
+            'to the default.'
         )
     )
 
@@ -448,8 +447,8 @@ def register_browser_preferences(self):
         help_str=gettext(
             'Supported placeholders are %FUNCTION%, %ARGS%, %SCHEMA% and'
             ' %DATABASE%. Users can provide any string with or '
-            'without placeholders of their choice. The blank title will be'
-            ' revert back to the default title with placeholders.'
+            'without placeholders of their choice. A blank title will revert '
+            'to the default.'
         )
     )
 
@@ -470,9 +469,9 @@ def register_browser_preferences(self):
         category_label=PREF_LABEL_OPTIONS,
         options=open_new_tab_options,
         help_str=gettext(
-            'Select Query Tool, Debugger, Schema Diff, ERD Tool '
-            'or PSQL Tool from the drop-down to set '
-            'open in new browser tab for that particular module.'
+            'Select Query Tool, Debugger, Schema Diff, ERD Tool, '
+            'or PSQL Tool from the drop-down to open that module '
+            'in a new browser tab.'
         ),
         control_props={
             'multiple': True, 'allowClear': False,
@@ -493,8 +492,8 @@ def register_browser_preferences(self):
             help_str=gettext(
                 'Supported placeholders are %DATABASE%, %USERNAME%, '
                 'and %SERVER%. Users can provide any string with or without'
-                ' placeholders of their choice. The blank title will be revert'
-                ' back to the default title with placeholders.'
+                ' placeholders of their choice. A blank title will revert '
+                'to the default.'
             )
         )
 

web/pgadmin/browser/register_editor_preferences.py

@@ -330,8 +330,8 @@ def register_editor_preferences(self):
         gettext("Expression Width"), 'integer', 50,
         category_label=PREF_LABEL_SQL_FORMATTING,
         help_str=gettext(
-            'maximum number of characters in parenthesized expressions to be '
-            'kept on single line.'
+            'Maximum number of characters in parenthesized expressions to be '
+            'kept on a single line.'
         )
     )
 

web/pgadmin/browser/server_groups/servers/__init__.py

@@ -2042,7 +2042,7 @@ def check_pgpass(self, gid, sid):
             )
         except Exception as e:
             current_app.logger.error(
-                'Cannot able to fetch pgpass status'
+                'Unable to fetch pgpass status'
             )
             return internal_server_error(errormsg=str(e))
 

web/pgadmin/browser/server_groups/servers/databases/casts/__init__.py

@@ -713,12 +713,12 @@ def sql(self, gid, sid, did, cid, json_resp=True):
             status, res = self.conn.execute_scalar(sql)
             if not status:
                 return internal_server_error(gettext(
-                    "Could not generate reversed engineered SQL for the cast."
+                    "Could not generate reverse-engineered SQL for the cast."
                 ) + "\n\n{0}".format(res))
 
             if res is None:
                 return gone(gettext(
-                    "Could not generate reversed engineered SQL for the "
+                    "Could not generate reverse-engineered SQL for the "
                     "cast node."
                 ))
 

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/fts_configurations/__init__.py

@@ -942,15 +942,15 @@ def sql(self, gid, sid, did, scid, cfgid, **kwargs):
             if not status:
                 return internal_server_error(
                     _(
-                        "Could not generate reversed engineered query for the "
+                        "Could not generate reverse-engineered query for the "
                         "FTS Configuration.\n{0}"
                     ).format(res)
                 )
 
             if res is None:
                 return gone(
                     _(
-                        "Could not generate reversed engineered query for "
+                        "Could not generate reverse-engineered query for "
                         "FTS Configuration node.")
                 )
 

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_parsers/__init__.py

@@ -883,15 +883,15 @@ def sql(self, gid, sid, did, scid, pid, **kwargs):
             if not status:
                 return internal_server_error(
                     _(
-                        "Could not generate reversed engineered query for the "
+                        "Could not generate reverse-engineered query for the "
                         "FTS Parser.\n{0}"
                     ).format(res)
                 )
 
             if res is None:
                 return gone(
                     _(
-                        "Could not generate reversed engineered query for "
+                        "Could not generate reverse-engineered query for "
                         "FTS Parser node."
                     )
                 )

web/pgadmin/browser/server_groups/servers/databases/schemas/fts_templates/__init__.py

@@ -755,14 +755,14 @@ def sql(self, gid, sid, did, scid, tid, **kwargs):
         if not status:
             return internal_server_error(
                 gettext(
-                    "Could not generate reversed engineered query for the "
+                    "Could not generate reverse-engineered query for the "
                     "FTS Template.\n{0}").format(res)
             )
 
         if res is None:
             return gone(
                 gettext(
-                    "Could not generate reversed engineered query for "
+                    "Could not generate reverse-engineered query for "
                     "FTS Template node.")
             )
 

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/__init__.py

@@ -904,15 +904,15 @@ def sql(self, gid, sid, rid):
 
         if not status:
             return internal_server_error(
-                _("Could not generate reversed engineered query for the "
+                _("Could not generate reverse-engineered query for the "
                   "role.\n{0}").format(
                     res
                 )
             )
 
         if res is None or (len(res) == 0):
             return gone(
-                _("Could not generate reversed engineered query for the role.")
+                _("Could not generate reverse-engineered query for the role.")
             )
 
         return ajax_response(response=res.strip('\n'))

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."),