IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Various string improvements and fixes.

Browse Source
This commit is contained in:
Alexander Lakhin
2017-11-01 12:58:19 +00:00
committed by Dave Page
parent 714a429879
commit 9be1364d1a
21 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/__init__.py
View File

@@ -325,7 +325,7 @@ class ForeignDataWrapperView(PGChildNodeView):
if len(res['rows']) == 0:
return gone(
gettext("Couldnot find the foreign data wrapper information.")
gettext("Could not find the foreign data wrapper information.")
)
if res['rows'][0]['fdwoptions'] is not None:
@@ -568,7 +568,7 @@ class ForeignDataWrapperView(PGChildNodeView):
if len(res['rows']) == 0:
return gone(
gettext("Couldnot find the foreign data wrapper information.")
gettext("Could not find the foreign data wrapper information.")
)
if res['rows'][0]['fdwoptions'] is not None:

2
web/pgadmin/browser/server_groups/servers/databases/languages/static/js/language.js
View File

@@ -252,7 +252,7 @@ define('pgadmin.node.language', [
var handler_func = this.get('lanproc');
if (_.isUndefined(handler_func) || _.isNull(handler_func) ||
String(handler_func).replace(/^\s+|\s+$/g, '') == '') {
var msg = gettext('Handler Function cannot be empty');
var msg = gettext('Handler Function cannot be empty.');
this.errorModel.set('lanproc', msg);
return msg;
} else {

2
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/__init__.py
View File

@@ -430,7 +430,7 @@ class CollationView(PGChildNodeView):
status=410,
success=0,
errormsg=gettext(
"Definition incomplete. Please provide Locale OR Copy Collation OR LC_TYPE/LC_COLLATE"
"Definition incomplete. Please provide Locale OR Copy Collation OR LC_TYPE/LC_COLLATE."
)
)

4
web/pgadmin/browser/server_groups/servers/databases/schemas/collations/static/js/collation.js
View File

@@ -164,8 +164,8 @@ define('pgadmin.node.collation', [
|| String(this.get('copy_collation')).replace(/^\s+|\s+$/g, '') == '')) {
copy_coll_flag = true;
}
if (locale_flag && (lc_coll_flag || lc_coll_flag) && copy_coll_flag) {
msg = gettext('Definition incomplete, Please provide Locale OR Copy collation OR LC_TYPE/LC_COLLATE!');
if (locale_flag && (lc_coll_flag || lc_type_flag) && copy_coll_flag) {
msg = gettext('Definition incomplete. Please provide Locale OR Copy Collation OR LC_TYPE/LC_COLLATE.');
err['locale'] = msg
}
return null;

4
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/__init__.py
View File

@@ -862,7 +862,7 @@ class FtsConfigurationView(PGChildNodeView):
if not status:
return internal_server_error(
_(
"ERROR: Could not generate reversed engineered query for the FTS Configuration!\n{0}"
"Could not generate reversed engineered query for the FTS Configuration.\n{0}"
).format(
res
)
@@ -871,7 +871,7 @@ class FtsConfigurationView(PGChildNodeView):
if res is None:
return gone(
_(
"ERROR: Could not generate reversed engineered query for FTS Configuration node!")
"Could not generate reversed engineered query for FTS Configuration node.")
)
return ajax_response(response=res)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/__init__.py
View File

@@ -392,7 +392,7 @@ class FunctionView(PGChildNodeView, DataTypeReader):
if fnid is not None:
if len(rset['rows']) == 0:
return gone(
_("Could not find the specified %s").format(self.node_type)
_("Could not find the specified %s.").format(self.node_type)
)
row = rset['rows'][0]

2
web/pgadmin/browser/server_groups/servers/databases/schemas/packages/__init__.py
View File

@@ -453,7 +453,7 @@ class PackageView(PGChildNodeView):
return make_json_response(
success=1,
info=_("Packge dropped"),
info=_("Package dropped"),
data={
'id': pkgid,
'scid': scid,

2
web/pgadmin/browser/server_groups/servers/databases/schemas/sequences/static/js/sequence.js
View File

@@ -188,7 +188,7 @@ define('pgadmin.node.sequence', [
editable: false, type: 'collection', canAdd: true, canDelete: true,
control: 'unique-col-collection',
},{
id: 'securities', label: gettext('Securitiy Labels'), canAdd: true,
id: 'securities', label: gettext('Security Labels'), canAdd: true,
model: pgBrowser.SecLabelModel, editable: false,
type: 'collection', canEdit: false, group: 'security',
mode: ['edit', 'create'], canDelete: true,

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/__init__.py
View File

@@ -623,7 +623,7 @@ class CheckConstraintView(PGChildNodeView):
return make_json_response(
success=1,
info=_("Check Constraint dropped."),
info=_("Check constraint dropped."),
data={
'id': tid,
'scid': scid,

8
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
View File

@@ -255,7 +255,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
alertify.confirm(
gettext('Reset statistics'),
S(gettext('Are you sure you want to reset the statistics for table %s?')).sprintf(d._label).value(),
S(gettext('Are you sure you want to reset the statistics for table "%s"?')).sprintf(d._label).value(),
function (e) {
if (e) {
var data = d;
@@ -733,7 +733,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
if (!_.isUndefined(tbl_name) &&
tbl_name !== '' && column_collection.length !== 0) {
var msg = gettext('Changing of type table will clear columns collection');
var msg = gettext('Changing of table type will clear columns collection.');
alertify.confirm(msg, function (e) {
if (e) {
// User clicks Ok, lets clear columns collection
@@ -975,9 +975,9 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
},{
id: 'partition_note', label: gettext('Partition'),
type: 'note', group: 'partition',
text: gettext('Above control will be used to Create/Attach/Detach partitions.<br>' +
text: gettext('The control above is used to Create/Attach/Detach partitions.<br>' +
'<ul><li>Create Mode: User will be able to create N number of partitions. Mode switch control is disabled in this scenario.</li>' +
'<li>Edit Mode: User will be able to create/attach/detach N number of partitions.' +
'<li>Edit Mode: User will be able to create/attach/detach N number of partitions. ' +
'In attach mode there will be list of suitable tables to be attached.</li></ul>'),
visible: function(m) {
if(!_.isUndefined(m.node_info) && !_.isUndefined(m.node_info.server)

2
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
View File

@@ -219,7 +219,7 @@ define('pgadmin.node.table', [
alertify.confirm(
gettext('Reset statistics'),
S(gettext('Are you sure you want to reset the statistics for table %s?')).sprintf(d._label).value(),
S(gettext('Are you sure you want to reset the statistics for table "%s"?')).sprintf(d._label).value(),
function (e) {
if (e) {
var data = d;

4
web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
View File

@@ -217,9 +217,9 @@ define('pgadmin.node.type', [
else if (this.get('is_precision')
&& !_.isUndefined(this.get('precision'))) {
if (this.get('precision') < this.get('min_val'))
errmsg = gettext('Scale should not be less than %(value)s', {value: this.get('min_val')});
errmsg = gettext('Scale should not be less than %(value)s', {value: this.get('min_val')});
if (this.get('precision') > this.get('max_val'))
errmsg = gettext('Scale should not be greater than %(value)s', {value: this.get('max_val')});
errmsg = gettext('Scale should not be greater than %(value)s', {value: this.get('max_val')});
// If we have any error set then throw it to user
if(errmsg) {
this.errorModel.set('precision', errmsg)

2
web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
View File

@@ -168,7 +168,7 @@ define('pgadmin.node.tablespace', [
alertify.dialog('move_objects_dlg' ,function factory() {
return {
main: function() {
var title = gettext('Move objects to another tablespace ');
var title = gettext('Move objects to another tablespace');
this.set('title', title);
},
build: function() {