Skip to content

Commit 4845acf

Browse files
dpagedpage
committed
Javascript string cleanup
1 parent 8ed0b1b commit 4845acf

File tree

22 files changed

+37
-37
lines changed

22 files changed

+37
-37
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export default class DBMSJobSchema extends BaseUISchema {
172172
end_time_js = moment(end_time_js[0] + ' ' + end_time_js[1]);
173173

174174
if(end_time_js.isBefore(start_time_js)) {
175-
setError('jsscend', gettext('Start time must be less than end time'));
175+
setError('jsscend', gettext('Start time must be less than end time.'));
176176
return true;
177177
} else {
178178
setError('jsscend', null);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export default class DBMSScheduleSchema extends BaseUISchema {
7777
end_time_js = moment(end_time_js[0] + ' ' + end_time_js[1]);
7878

7979
if(end_time_js.isBefore(start_time_js)) {
80-
setError('jsscend', gettext('Start time must be less than end time'));
80+
setError('jsscend', gettext('Start time must be less than end time.'));
8181
return true;
8282
} else {
8383
setError('jsscend', null);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ class RangeSchema extends BaseUISchema {
409409

410410
if(state.typtype === 'r') {
411411
if (isEmptyString(state.typname)) {
412-
errmsg = gettext('Subtype cannot be empty');
412+
errmsg = gettext('Subtype cannot be empty.');
413413
setError('typname', errmsg);
414414
return true;
415415
}
@@ -812,13 +812,13 @@ class ExternalSchema extends BaseUISchema {
812812
if(state.typtype === 'b') {
813813

814814
if (isEmptyString(state.typinput)) {
815-
errmsg = gettext('Input function cannot be empty');
815+
errmsg = gettext('Input function cannot be empty.');
816816
setError('typinput', errmsg);
817817
return true;
818818
}
819819

820820
if (isEmptyString(state.typoutput)) {
821-
errmsg = gettext('Output function cannot be empty');
821+
errmsg = gettext('Output function cannot be empty.');
822822
setError('typoutput', errmsg);
823823
return true;
824824
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export default class SubscriptionSchema extends BaseUISchema{
185185
id: 'pub', label: gettext('Publication'),
186186
group: gettext('Connection'), mode: ['create', 'edit'],
187187
deps: ['all_table', 'host', 'port', 'username', 'db', 'password'], disabled: obj.isAllConnectionDataEnter,
188-
helpMessage: gettext('Click the refresh button to get the publications'),
188+
helpMessage: gettext('Click the refresh button to get the publications.'),
189189
helpMessageMode: ['edit', 'create'],
190190
type: (state)=>{
191191
return {
@@ -316,7 +316,7 @@ export default class SubscriptionSchema extends BaseUISchema{
316316
group: gettext('With'),
317317
disabled: obj.isSameDB,
318318
readonly: obj.isConnect, deps :['connect', 'host', 'port'],
319-
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.'),
319+
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.'),
320320
helpMessageMode: ['edit', 'create'],
321321
depChange: (state) => {
322322
// Set create_slot to false if same DB, else true
@@ -332,7 +332,7 @@ export default class SubscriptionSchema extends BaseUISchema{
332332
type: 'switch', mode: ['create','edit', 'properties'],
333333
group: gettext('With'),
334334
readonly: obj.isConnect, deps :['connect'],
335-
helpMessage: gettext('Specifies whether the subscription should be actively replicating, or whether it should be just setup but not started yet.'),
335+
helpMessage: gettext('Specifies whether the subscription should be actively replicating, or whether it should be just set up but not started yet.'),
336336
helpMessageMode: ['edit', 'create'],
337337
},
338338
{
@@ -483,15 +483,15 @@ export default class SubscriptionSchema extends BaseUISchema{
483483
type: 'switch', mode: ['create', 'edit', 'properties'],
484484
group: gettext('With'),
485485
min_version: 170000,
486-
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'),
486+
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.'),
487487
helpMessageMode: ['edit', 'create'],
488488
},
489489
];
490490
}
491491

492492
validate(state, setError) {
493493
let errmsg = null;
494-
errmsg = gettext('Either Host name, Address must be specified.');
494+
errmsg = gettext('Either Host name or Address must be specified.');
495495
if(isEmptyString(state.host)) {
496496
setError('host', errmsg);
497497
return true;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ export default class PgaJobScheduleSchema extends BaseUISchema {
252252
end_time_js = moment(end_time_js[0] + ' ' + end_time_js[1]);
253253

254254
if(end_time_js.isBefore(start_time_js)) {
255-
setError('jscend', gettext('Start time must be less than end time'));
255+
setError('jscend', gettext('Start time must be less than end time.'));
256256
return true;
257257
} else {
258258
setError('jscend', null);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export default class PgaJobStepSchema extends BaseUISchema {
220220
}
221221

222222
if (isEmptyString(state.jstonerror)) {
223-
setError('jstonerror', gettext('Please select valid on error option.'));
223+
setError('jstonerror', gettext('Please select a valid on error option.'));
224224
return true;
225225
} else {
226226
setError('jstonerror', null);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default class RoleSchema extends BaseUISchema {
100100
group: gettext('Definition'), label: gettext('Account expires'),
101101
mode: ['properties', 'edit', 'create'],
102102
deps: ['rolcanlogin'],
103-
helpMessage: gettext('Please note that if you leave this field blank, then password will never expire.'),
103+
helpMessage: gettext('Please note that if you leave this field blank, then the password will never expire.'),
104104
helpMessageMode: ['edit', 'create'],
105105
controlProps: {
106106
ampm: false,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export default class RoleReassign extends BaseUISchema{
5454
{ 'label': gettext('Reassign'), 'value': 'reassign' },
5555
{ 'label': gettext('Drop'), 'value': 'drop' },
5656
],
57-
helpMessage: gettext('Change the ownership or\ndrop the database objects owned by a database role')
57+
helpMessage: gettext('Change the ownership or\ndrop the database objects owned by a database role.')
5858
},
5959
{
6060
id: 'new_role_id',
@@ -96,7 +96,7 @@ export default class RoleReassign extends BaseUISchema{
9696
}
9797
};
9898
},
99-
helpMessage: gettext('New owner of the affected objects'),
99+
helpMessage: gettext('New owner of the affected objects.'),
100100
deps: ['role_op'],
101101
disabled: (state)=>{
102102
return state.role_op == 'drop';
@@ -128,13 +128,13 @@ export default class RoleReassign extends BaseUISchema{
128128
group: gettext('General'),
129129
type: 'switch',
130130
deps: ['role_op'],
131-
helpMessage: gettext('Note: CASCADE will automatically drop objects that depend on the affected objects, and in turn all objects that depend on those objects')
131+
helpMessage: gettext('Note: CASCADE will automatically drop objects that depend on the affected objects, and in turn all objects that depend on those objects.')
132132
},
133133
{
134134
id: 'did',
135135
label: gettext('From database'),
136136
group: gettext('General'),
137-
helpMessage: gettext('Target database on which the operation will be carried out'),
137+
helpMessage: gettext('Target database on which the operation will be carried out.'),
138138
type: ()=>{
139139
return {
140140
type: 'select',
@@ -162,13 +162,13 @@ export default class RoleReassign extends BaseUISchema{
162162
let obj = this;
163163

164164
if (state.role_op == 'reassign' && isEmptyString(state.new_role_id)) {
165-
errmsg = gettext('\'Reassign objects to\' can not be empty');
165+
errmsg = gettext('\'Reassign objects to\' cannot be empty.');
166166
setError('new_role_id', errmsg);
167167
return true;
168168
}
169169

170170
if (isEmptyString(state.did)) {
171-
errmsg = gettext('\'From database \' can not be empty');
171+
errmsg = gettext('\'From database\' cannot be empty.');
172172
setError('did', errmsg);
173173
return true;
174174
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function withCheckPermission(options, callback) {
2121
} else {
2222
pgAdmin.Browser.notifier.alert(
2323
gettext('Permission Denied'),
24-
gettext('You don’t have the necessary permissions to access this feature. Please contact your administrator for assistance')
24+
gettext('You don\'t have the necessary permissions to access this feature. Please contact your administrator for assistance.')
2525
);
2626
}
2727
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ define(
2626
'SQL_NO_CHANGE': gettext('Nothing changed'),
2727
'MUST_BE_INT' : gettext("'%s' must be an integer."),
2828
'MUST_BE_NUM' : gettext("'%s' must be a numeric."),
29-
'INVALID_MIN_MAX' : gettext("Min and Max values are not valid"),
29+
'INVALID_MIN_MAX' : gettext("Min and Max values are not valid."),
3030
'MUST_GR_EQ' : gettext("'%s' must be greater than or equal to %s."),
3131
'MUST_LESS_EQ' : gettext("'%s' must be less than or equal to %s."),
3232
'CANNOT_BE_EMPTY': gettext("'%s' cannot be empty."),

0 commit comments

Comments
 (0)