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

Revert "Fix a number of cases where strings were not properly marked for translation."

Browse Source 
This reverts commit 1f23838a4c due to unintended side
effects it caused - specifically, expanding Databases on the treeview displayed
Servers again
This commit is contained in:
Dave Page
2017-11-03 16:45:20 +00:00
parent 1f23838a4c
commit b2186db562
32 changed files with 719 additions and 1585 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/static/js/foreign_server.js
View File

@@ -14,8 +14,8 @@ define('pgadmin.node.foreign_server', [
// Defining schema for the Options model
schema: [
{id: 'fsrvoption', label: gettext('Options'), type:'text', cellHeaderClasses:'width_percent_50', group: null, editable: true},
{id: 'fsrvvalue', label: gettext('Value'), type: 'text', cellHeaderClasses:'width_percent_50', group:null, editable: true},
{id: 'fsrvoption', label:'Options', type:'text', cellHeaderClasses:'width_percent_50', group: null, editable: true},
{id: 'fsrvvalue', label:'Value', type: 'text', cellHeaderClasses:'width_percent_50', group:null, editable: true},
],
/* validate function is used to validate the input given by
@@ -144,12 +144,12 @@ define('pgadmin.node.foreign_server', [
id: 'description', label: gettext('Comment'), cell: 'string',
type: 'multiline'
},{
id: 'fsrvoptions', label: gettext('Options'), type: 'collection', group: gettext("Options"),
id: 'fsrvoptions', label: 'Options', type: 'collection', group: gettext("Options"),
model: OptionsModel, control: 'unique-col-collection', mode: ['edit', 'create'],
canAdd: true, canDelete: true, uniqueCol : ['fsrvoption'],
columns: ['fsrvoption','fsrvvalue']
}, pgBrowser.SecurityGroupSchema, {
id: 'fsrvacl', label: gettext('Privileges'), type: 'collection', group: 'security',
id: 'fsrvacl', label: 'Privileges', type: 'collection', group: 'security',
model: pgAdmin.Browser.Node.PrivilegeRoleModel.extend({privileges: ['U']}), control: 'unique-col-collection',
mode: ['edit', 'create'], canAdd: true, canDelete: true, uniqueCol : ['grantee']
},{

2
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/foreign_servers/user_mapping/static/js/user_mapping.js
View File

@@ -133,7 +133,7 @@ define('pgadmin.node.user_mapping', [
id: 'um_oid', label: gettext('OID'), cell: 'string',
type: 'text', disabled: true, mode: ['properties'],
},{
id: 'umoptions', label: gettext('Options'), type: 'collection', group: gettext("Options"),
id: 'umoptions', label: 'Options', type: 'collection', group: gettext("Options"),
model: OptionsModel, control: 'unique-col-collection', mode: ['create', 'edit'],
canAdd: true, canDelete: true, uniqueCol : ['umoption']
}

4
web/pgadmin/browser/server_groups/servers/databases/foreign_data_wrappers/static/js/foreign_data_wrapper.js
View File

@@ -143,7 +143,7 @@ define('pgadmin.node.foreign_data_wrapper', [
id: 'description', label: gettext('Comment'), cell: 'string',
type: 'multiline'
},{
id: 'fdwoptions', label: gettext('Options'), type: 'collection', group: gettext('Options'),
id: 'fdwoptions', label: 'Options', type: 'collection', group: gettext('Options'),
model: OptionsModel, control: 'unique-col-collection', mode: ['edit', 'create'],
canAdd: true, canDelete: true, uniqueCol : ['fdwoption'],
columns: ['fdwoption','fdwvalue']
@@ -153,7 +153,7 @@ define('pgadmin.node.foreign_data_wrapper', [
},{
id: 'security', label: gettext('Security'), type: 'group'
},{
id: 'fdwacl', label: gettext('Privileges'), type: 'collection',
id: 'fdwacl', label: 'Privileges', type: 'collection',
group: 'security', mode: ['edit', 'create'], canAdd: true,
canDelete: true, uniqueCol : ['grantee'],
model: pgBrowser.Node.PrivilegeRoleModel.extend({

4
web/pgadmin/browser/server_groups/servers/databases/schemas/foreign_tables/static/js/foreign_table.js
View File

@@ -46,9 +46,9 @@ define('pgadmin.node.foreign_table', [
value: undefined
},
schema: [
{id: 'option', label: gettext('Option'), type:'text', editable: true, cellHeaderClasses: 'width_percent_30'},
{id: 'option', label:'Option', type:'text', editable: true, cellHeaderClasses: 'width_percent_30'},
{
id: 'value', label: gettext('Value'), type: 'text', editable: true, cellHeaderClasses: 'width_percent_50'
id: 'value', label:'Value', type: 'text', editable: true, cellHeaderClasses: 'width_percent_50'
}
],
validate: function() {

4
web/pgadmin/browser/server_groups/servers/databases/schemas/fts_configurations/static/js/fts_configuration.js
View File

@@ -13,11 +13,11 @@ define('pgadmin.node.fts_configuration', [
keys: ['token'],
// Define the schema for the token/dictionary list
schema: [{
id: 'token', label: gettext('Token'), type:'text', group: null,
id: 'token', label:'Token', type:'text', group: null,
cellHeaderClasses:'width_percent_50',
editable: false, cell: 'string', url: 'tokens'
},{
id: 'dictname', label: gettext('Dictionaries'), type: 'text', group:null,
id: 'dictname', label: 'Dictionaries', type: 'text', group:null,
cellHeaderClasses:'width_percent_50', editable: true,
cell:Backgrid.Extension.MultiSelectAjaxCell, url: 'dictionaries'
}],

4
web/pgadmin/browser/server_groups/servers/databases/schemas/functions/static/js/trigger_function.js
View File

@@ -148,8 +148,8 @@ define('pgadmin.node.trigger_function', [
disabled: 'isDisabled', first_empty: true,
select2: { width: "100%", allowClear: false },
mode: ['create'], visible: 'isVisible', options: [
{label: gettext('trigger'), value: 'trigger'},
{label: gettext('event_trigger'), value: 'event_trigger'}
{label: 'trigger', value: 'trigger'},
{label: 'event_trigger', value: 'event_trigger'}
]
},{
id: 'prorettypename', label: gettext('Return type'), cell: 'string',

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/column/static/js/column.js
View File

@@ -549,13 +549,13 @@ define('pgadmin.node.column', [
type: 'multiline', mode: ['properties', 'create', 'edit'],
disabled: 'notInSchema'
},{
id: 'attoptions', label: gettext('Variables'), type: 'collection',
id: 'attoptions', label: 'Variables', type: 'collection',
group: gettext('Variables'), control: 'unique-col-collection',
model: VariablesModel, uniqueCol : ['name'],
mode: ['edit', 'create'], canAdd: true, canEdit: false,
canDelete: true
}, pgBrowser.SecurityGroupSchema, {
id: 'attacl', label: gettext('Privileges'), type: 'collection',
id: 'attacl', label: 'Privileges', type: 'collection',
group: 'security', control: 'unique-col-collection',
model: pgBrowser.Node.PrivilegeRoleModel.extend({
privileges: ['a','r','w','x']}),

4
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
View File

@@ -38,11 +38,11 @@ define('pgadmin.node.foreign_key', [
referenced: undefined
},
schema: [{
id: 'local_column', label: gettext('Local'), type:'text', editable: false,
id: 'local_column', label:'Local', type:'text', editable: false,
cellHeaderClasses: 'width_percent_50', cell:'string',
headerCell: Backgrid.Extension.CustomHeaderCell
},{
id: 'referenced', label: gettext('Referenced'), type: 'text', editable: false,
id: 'referenced', label:'Referenced', type: 'text', editable: false,
cell:'string', cellHeaderClasses: 'width_percent_50',
headerCell: Backgrid.Extension.CustomHeaderCell
}]

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

@@ -363,7 +363,7 @@ define('pgadmin.node.index', [
type: 'text', disabled: 'inSchemaWithModelCheck', mode: ['create', 'edit'],
control: 'sql-field', visible: true, group: gettext('Definition')
},{
id: 'columns', label: gettext('Columns'), type: 'collection', deps: ['amname'],
id: 'columns', label: 'Columns', type: 'collection', deps: ['amname'],
group: gettext('Definition'), model: ColumnModel, mode: ['edit', 'create'],
canAdd: function(m) {
// We will disable it if it's in 'edit' mode

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

@@ -822,9 +822,9 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
editable: false, type: 'select2', select2: {allowClear: false},
group: 'partition', deps: ['is_partitioned'],
options:[{
label: gettext('Range'), value: 'range'
label: 'Range', value: 'range'
},{
label: gettext('List'), value: 'list'
label: 'List', value: 'list'
}],
mode:['create'],
visible: function(m) {

14
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/partition.utils.js
View File

@@ -64,13 +64,13 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
},
keys:['pt_column'],
schema: [{
id: 'key_type', label: gettext('Key type'), type:'select2', editable: true,
id: 'key_type', label:'Key type', type:'select2', editable: true,
cell:'select2', cellHeaderClasses: 'width_percent_25',
select2: {allowClear: false},
options:[{
label: gettext('Column'), value: 'column'
label: 'Column', value: 'column'
},{
label: gettext('Expression'), value: 'expression'
label: 'Expression', value: 'expression'
}]
},{
id: 'pt_column', label: gettext('Column'), type:'text',
@@ -179,7 +179,7 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
return true;
}
},{
id: 'expression', label: gettext('Expression'), type:'text',
id: 'expression', label:'Expression', type:'text',
cell:Backgrid.Extension.StringDepCell,
cellHeaderClasses: 'width_percent_45',
deps: ['key_type'],
@@ -258,7 +258,7 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
return false;
}, cellFunction: getPartitionCell
},{
id: 'values_from', label: gettext('From'), type:'text',
id: 'values_from', label:'From', type:'text',
cell:Backgrid.Extension.StringDepCell,
cellHeaderClasses: 'width_percent_20',
editable: function(m) {
@@ -270,7 +270,7 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
return false;
}
},{
id: 'values_to', label: gettext('To'), type:'text',
id: 'values_to', label:'To', type:'text',
cell:Backgrid.Extension.StringDepCell,
cellHeaderClasses: 'width_percent_20',
editable: function(m) {
@@ -282,7 +282,7 @@ function(gettext, $, _, pgBrowser, Backform, Backgrid) {
return false;
}
},{
id: 'values_in', label: gettext('In'), type:'text',
id: 'values_in', label:'In', type:'text',
cell:Backgrid.Extension.StringDepCell,
cellHeaderClasses: 'width_percent_25',
editable: function(m) {

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

@@ -824,9 +824,9 @@ define('pgadmin.node.table', [
editable: false, type: 'select2', select2: {allowClear: false},
group: 'partition', deps: ['is_partitioned'],
options:[{
label: gettext('Range'), value: 'range'
label: 'Range', value: 'range'
},{
label: gettext('List'), value: 'list'
label: 'List', value: 'list'
}],
mode:['create'],
visible: function(m) {

6
web/pgadmin/browser/server_groups/servers/static/js/privilege.js
View File

@@ -48,7 +48,7 @@ define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform',
*/
privileges:[],
schema: [{
id: 'grantee', label: gettext('Grantee'), type:'text', group: null,
id: 'grantee', label:'Grantee', type:'text', group: null,
editable: true, cellHeaderClasses: 'width_percent_40',
node: 'role',
disabled : function(m) {
@@ -146,7 +146,7 @@ define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform',
}
}),
},{
id: 'privileges', label: gettext('Privileges'),
id: 'privileges', label:'Privileges',
type: 'collection', model: PrivilegeModel, group: null,
cell: 'privilege', control: 'text', cellHeaderClasses: 'width_percent_40',
disabled : function(column, collection) {
@@ -158,7 +158,7 @@ define(['sources/gettext', 'underscore', 'jquery', 'backbone', 'backform',
this.attributes.node_info.server.user.name == column.get('grantor'));
}
},{
id: 'grantor', label: gettext('Grantor'), type: 'text', disabled: true,
id: 'grantor', label: 'Grantor', type: 'text', disabled: true,
cell: 'node-list-by-name', node: 'role'
}],

12
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@@ -691,12 +691,12 @@ define('pgadmin.node.server', [
id: 'sslmode', label: gettext('SSL mode'), type: 'options', group: gettext('SSL'),
mode: ['properties', 'edit', 'create'], disabled: 'isConnected',
'options': [
{label: gettext('Allow'), value: 'allow'},
{label: gettext('Prefer'), value: 'prefer'},
{label: gettext('Require'), value: 'require'},
{label: gettext('Disable'), value: 'disable'},
{label: gettext('Verify-CA'), value: 'verify-ca'},
{label: gettext('Verify-Full'), value: 'verify-full'}
{label: 'Allow', value: 'allow'},
{label: 'Prefer', value: 'prefer'},
{label: 'Require', value: 'require'},
{label: 'Disable', value: 'disable'},
{label: 'Verify-CA', value: 'verify-ca'},
{label: 'Verify-Full', value: 'verify-full'}
]
},{
id: 'sslcert', label: gettext('Client certificate'), type: 'text',

8
web/pgadmin/browser/server_groups/servers/static/js/variable.js
View File

@@ -131,7 +131,7 @@ define([
},
schema: [
{
id: 'name', label: gettext('Name'), type:'text', cellHeaderClasses: 'width_percent_30',
id: 'name', label:'Name', type:'text', cellHeaderClasses: 'width_percent_30',
editable: function(m) {
return (m instanceof Backbone.Collection) ? true : m.isNew();
},
@@ -170,13 +170,13 @@ define([
}
},
{
id: 'value', label: gettext('Value'), type: 'text', editable: true,
id: 'value', label:'Value', type: 'text', editable: true,
cellFunction: cellFunction, cellHeaderClasses: 'width_percent_40'
},
{id: 'database', label: gettext('Database'), type: 'text', editable: true,
{id: 'database', label:'Database', type: 'text', editable: true,
node: 'database', cell: Backgrid.Extension.NodeListByNameCell
},
{id: 'role', label: gettext('Role'), type: 'text', editable: true,
{id: 'role', label:'Role', type: 'text', editable: true,
node: 'role', cell: Backgrid.Extension.NodeListByNameCell}
],
toJSON: function() {

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

@@ -114,10 +114,10 @@ define('pgadmin.node.tablespace', [
type: 'text', disabled: false, control: 'select2',
select2: { allowClear: false, width: "100%" },
options: [
{label: gettext("All"), value: 'all'},
{label: gettext("Tables"), value: 'tables'},
{label: gettext("Indexes"), value: 'indexes'},
{label: gettext("Materialized views"), value: 'materialized_views'},
{label: "All", value: 'all'},
{label: "Tables", value: 'tables'},
{label: "Indexes", value: 'indexes'},
{label: "Materialized views", value: 'materialized_views'},
]
},{
id: 'user', label: gettext('Object owner'),