diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index 6ed138b20..77120cd59 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -62,12 +62,13 @@ BROWSER_STATIC = 'browser.static' JQUERY_ACIPLUGIN = 'jquery.aciplugin' BROWSER_INDEX = 'browser.index' PGADMIN_BROWSER = 'pgAdmin.Browser' -PASS_ERROR_MSG = 'Your password has not been changed.' -SMTP_SOCKET_ERROR = 'SMTP Socket error: {error}\n {pass_error}'.format( +PASS_ERROR_MSG = gettext('Your password has not been changed.') +SMTP_SOCKET_ERROR = gettext( + 'SMTP Socket error: {error}\n {pass_error}').format( + error={}, pass_error=PASS_ERROR_MSG) +SMTP_ERROR = gettext('SMTP error: {error}\n {pass_error}').format( error={}, pass_error=PASS_ERROR_MSG) -SMTP_ERROR = 'SMTP error: {error}\n {pass_error}'.format( - error={}, pass_error=PASS_ERROR_MSG) -PASS_ERROR = 'Error: {error}\n {pass_error}'.format( +PASS_ERROR = gettext('Error: {error}\n {pass_error}').format( error={}, pass_error=PASS_ERROR_MSG) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js index 9f4f1754b..67bfcc9a6 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/domains/static/js/domain.js @@ -264,7 +264,7 @@ define('pgadmin.node.domain', [ },{ id: 'typdefault', label: gettext('Default'), cell: 'string', type: 'text', group: gettext('Definition'), - placeholder: 'Enter an expression or a value.', + placeholder: gettext('Enter an expression or a value.'), },{ id: 'typnotnull', label: gettext('Not NULL?'), cell: 'boolean', type: 'switch', group: gettext('Definition'), diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js index 1b79cd5c6..a372b02a8 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js @@ -203,7 +203,7 @@ define('pgadmin.node.foreign_table', [ },{ id: 'typdefault', label: gettext('Default'), type: 'text', cell: 'string', min_version: 90300, group: gettext('Definition'), - placeholder: 'Enter an expression or a value.', + placeholder: gettext('Enter an expression or a value.'), cellHeaderClasses: 'width_percent_10', editable: function(m) { if(!(_.isUndefined(m.get('inheritedid')) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js index dea984e81..2cc732b61 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/columns/static/js/column.js @@ -40,7 +40,7 @@ define('pgadmin.node.column', [ type: 'text', disabled: false, node: 'column', options: [['n_distinct', 'n_distinct'], ['n_distinct_inherited','n_distinct_inherited']], - select2: {placeholder: 'Select variable'}, + select2: {placeholder: gettext('Select variable')}, cellHeaderClasses:'width_percent_50', },{ id: 'value', label: gettext('Value'), @@ -483,7 +483,7 @@ define('pgadmin.node.column', [ id: 'attstorage', label: gettext('Storage'), group: gettext('Definition'), type: 'text', mode: ['properties', 'edit'], cell: 'string', disabled: 'inSchemaWithColumnCheck', first_empty: true, - control: 'select2', select2: { placeholder: 'Select storage', + control: 'select2', select2: { placeholder: gettext('Select storage'), allowClear: false, width: '100%', }, @@ -575,7 +575,7 @@ define('pgadmin.node.column', [ }, { id: 'attidentity', label: gettext('Identity'), control: 'select2', cell: 'select2', - select2: {placeholder: 'Select identity', allowClear: false, width: '100%'}, + select2: {placeholder: gettext('Select identity'), allowClear: false, width: '100%'}, min_version: 100000, group: gettext('Constraints'), 'options': [ {label: gettext('ALWAYS'), value: 'a'}, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js index 9353c036d..d8ef7b361 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/exclusion_constraint/static/js/exclusion_constraint.js @@ -358,7 +358,7 @@ define('pgadmin.node.exclusion_constraint', [ }, select2: { allowClear: false, width: 'style', - placeholder: 'Select column', + placeholder: gettext('Select column'), }, first_empty: !self.model.isNew(), readonly: function() { return !_.isUndefined(self.model.get('oid')); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js index 547e3d167..302728bad 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js @@ -164,7 +164,7 @@ define('pgadmin.node.foreign_key', [ id: 'references', label:'', type: 'text', cache_level: 'server', select2: { allowClear: false, width: 'style', - placeholder: 'Select foreign table', + placeholder: gettext('Select foreign table'), }, first_empty: true, control: Backform.NodeListByNameControl.extend({ formatter: Backform.ControlFormatter, diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js index faf9d6636..42bf288ae 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/row_security_policies/static/js/row_security_policy.js @@ -123,7 +123,7 @@ define('pgadmin.node.row_security_policy', [ }, { id: 'rls_expression_key_note', label: gettext('RLS policy expression'), - type: 'note', group: 'Commands', mode: ['create', 'edit'], + type: 'note', group: gettext('Commands'), mode: ['create', 'edit'], text: [ '