public inbox for [email protected]
help / color / mirror / Atom feedpgAdmin 4 - added missing gettexts
2+ messages / 2 participants
[nested] [flat]
* pgAdmin 4 - added missing gettexts
@ 2020-10-25 12:53 Libor M. <[email protected]>
2020-10-27 05:46 ` Re: pgAdmin 4 - added missing gettexts Akshay Joshi <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Libor M. @ 2020-10-25 12:53 UTC (permalink / raw)
To: pgadmin-hackers
Hi,
I added missing gettext usage. Diff file is attached.
Best regards,
Libor M.
E-mail: [email protected]
GitHub: https://github.com/liborm85
Attachments:
[application/octet-stream] pgadmin4_add_gettext.diff (13.1K, 2-pgadmin4_add_gettext.diff)
download | inline diff:
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: [
'<ul><li>',
'<strong>', gettext('Using: '), '</strong>',
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
index 8cb83f31a..489d8b403 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/types/static/js/type.js
@@ -344,11 +344,11 @@ define('pgadmin.node.type', [
select2: { allowClear: false },
options: function() {
return [
- {label: 'Composite', value: 'c'},
- {label: 'Enumeration', value: 'e'},
- {label: 'External', value: 'b'},
- {label: 'Range', value: 'r'},
- {label: 'Shell', value: 'p'},
+ {label: gettext('Composite'), value: 'c'},
+ {label: gettext('Enumeration'), value: 'e'},
+ {label: gettext('External'), value: 'b'},
+ {label: gettext('Range'), value: 'r'},
+ {label: gettext('Shell'), value: 'p'},
];
},
// If create mode then by default open composite type
diff --git a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
index 1f5424f23..726b118bb 100644
--- a/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
+++ b/web/pgadmin/tools/grant_wizard/static/js/grant_wizard.js
@@ -111,7 +111,7 @@ define([
<div class="custom-control custom-checkbox custom-checkbox-no-label">
<input tabindex="-1" type="checkbox" class="custom-control-input" id="${id}" />
<label class="custom-control-label" for="${id}">
- <span class="sr-only">Select All<span>
+ <span class="sr-only">` + gettext('Select All') + `<span>
</label>
</div>
`);
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 26c88bc42..2bb9f3820 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -101,7 +101,7 @@ define('tools.querytool', [
this.set_server_version(opts.server_ver);
this.trigger('pgadmin-sqleditor:view:initialised');
this.connection_list = [
- {'server_group': null,'server': null, 'database': null, 'user': null, 'role': null, 'title': '<New Connection>'},
+ {'server_group': null,'server': null, 'database': null, 'user': null, 'role': null, 'title': '<' + gettext('New Connection') + '>'},
];
},
diff --git a/web/pgadmin/tools/sqleditor/utils/constant_definition.py b/web/pgadmin/tools/sqleditor/utils/constant_definition.py
index 1f3296b63..bc4226c3c 100644
--- a/web/pgadmin/tools/sqleditor/utils/constant_definition.py
+++ b/web/pgadmin/tools/sqleditor/utils/constant_definition.py
@@ -8,6 +8,7 @@
##########################################################################
"""Definition of constants for SQLEditor."""
+from flask_babelex import gettext
# Async Constants
ASYNC_OK = 1
@@ -24,9 +25,9 @@ TX_STATUS_INERROR = 3
# Connection status codes mapping
CONNECTION_STATUS_MESSAGE_MAPPING = dict({
- 0: 'The session is idle and there is no current transaction.',
- 1: 'A command is currently in progress.',
- 2: 'The session is idle in a valid transaction block.',
- 3: 'The session is idle in a failed transaction block.',
- 4: 'The connection with the server is bad.'
+ 0: gettext('The session is idle and there is no current transaction.'),
+ 1: gettext('A command is currently in progress.'),
+ 2: gettext('The session is idle in a valid transaction block.'),
+ 3: gettext('The session is idle in a failed transaction block.'),
+ 4: gettext('The connection with the server is bad.')
})
diff --git a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
index 642a1ebe1..c697ffd0b 100644
--- a/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
+++ b/web/pgadmin/tools/sqleditor/utils/query_tool_preferences.py
@@ -739,9 +739,9 @@ def register_query_tool_preferences(self):
self.keyword_case = self.preference.register(
'editor', 'keyword_case',
gettext("Keyword case"), 'radioModern', 'upper',
- options=[{'label': 'Upper case', 'value': 'upper'},
- {'label': 'Lower case', 'value': 'lower'},
- {'label': 'Capitalized', 'value': 'capitalize'}],
+ options=[{'label': gettext('Upper case'), 'value': 'upper'},
+ {'label': gettext('Lower case'), 'value': 'lower'},
+ {'label': gettext('Capitalized'), 'value': 'capitalize'}],
category_label=PREF_LABEL_SQL_FORMATTING,
help_str=gettext(
'Convert keywords to upper, lower, or capitalized casing.'
@@ -751,9 +751,9 @@ def register_query_tool_preferences(self):
self.identifier_case = self.preference.register(
'editor', 'identifier_case',
gettext("Identifier case"), 'radioModern', 'upper',
- options=[{'label': 'Upper case', 'value': 'upper'},
- {'label': 'Lower case', 'value': 'lower'},
- {'label': 'Capitalized', 'value': 'capitalize'}],
+ options=[{'label': gettext('Upper case'), 'value': 'upper'},
+ {'label': gettext('Lower case'), 'value': 'lower'},
+ {'label': gettext('Capitalized'), 'value': 'capitalize'}],
category_label=PREF_LABEL_SQL_FORMATTING,
help_str=gettext(
'Convert identifiers to upper, lower, or capitalized casing.'
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: pgAdmin 4 - added missing gettexts
2020-10-25 12:53 pgAdmin 4 - added missing gettexts Libor M. <[email protected]>
@ 2020-10-27 05:46 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Akshay Joshi @ 2020-10-27 05:46 UTC (permalink / raw)
To: Libor M. <[email protected]>; +Cc: pgadmin-hackers
Thanks, patch applied.
On Sun, Oct 25, 2020 at 10:18 PM Libor M. <[email protected]> wrote:
> Hi,
> I added missing gettext usage. Diff file is attached.
>
> Best regards,
>
> Libor M.
>
> E-mail: [email protected]
> GitHub: https://github.com/liborm85
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Sr. Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2020-10-27 05:46 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2020-10-25 12:53 pgAdmin 4 - added missing gettexts Libor M. <[email protected]>
2020-10-27 05:46 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox