From e09aa906141297d83d5bffdc7ca13be0e7a90fe2 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Thu, 14 Apr 2016 20:11:55 +0100 Subject: [PATCH] Rename "Parameters" to "Arguments" and "Variables" to "Parameters" for consistency with the PG docs. Per Susan Douglas. --- .../schemas/functions/templates/function/js/functions.js | 8 ++++---- .../servers/databases/templates/databases/js/databases.js | 4 ++-- .../server_groups/servers/roles/templates/role/js/role.js | 4 ++-- .../browser/server_groups/servers/static/js/variable.js | 2 +- .../tablespaces/templates/tablespaces/js/tablespaces.js | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js index f0227b339..1e8a4ddd5 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/functions/templates/function/js/functions.js @@ -308,16 +308,16 @@ function($, _, S, pgAdmin, pgBrowser, alertify) { group: '{{ _('Security') }}', cell:'boolean', type: 'text', cell: 'string', mode: ['properties'] },{ - id: 'arguments', label: '{{ _('Parameters') }}', cell: 'string', - group: '{{ _('Parameters') }}', type: 'collection', canAdd: function(m){ + id: 'arguments', label: '{{ _('Arguments') }}', cell: 'string', + group: '{{ _('Arguments') }}', type: 'collection', canAdd: function(m){ return m.isNew(); }, canDelete: true, model: ArgumentModel, mode: ['create', 'edit'], columns: ['argtype', 'argmode', 'argname', 'argdefval'], disabled: 'isDisabled' },{ - id: 'variables', label: '{{ _('Variables') }}', type: 'collection', - group: '{{ _('Variables') }}', control: 'variable-collection', + id: 'variables', label: '{{ _('Parameters') }}', type: 'collection', + group: '{{ _('Parameters') }}', control: 'variable-collection', model: pgAdmin.Browser.Node.VariableModel, mode: ['edit', 'create'], canAdd: 'canVarAdd', canEdit: false, canDelete: true, disabled: 'isDisabled' diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js index 9b493a6c5..a6bfb90aa 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js +++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/js/databases.js @@ -294,9 +294,9 @@ function($, _, S, pgAdmin, pgBrowser, Alertify) { editable: false, type: 'collection', group: '{{ _('Security') }}', mode: ['edit', 'create'], canAdd: true, canDelete: true, control: 'unique-col-collection', },{ - id: 'variables', label: '{{ _('Variables') }}', type: 'collection', + id: 'variables', label: '{{ _('Parameters') }}', type: 'collection', model: pgAdmin.Browser.Node.VariableModel, editable: false, - group: '{{ _('Variables') }}', mode: ['edit', 'create'], + group: '{{ _('Parameters') }}', mode: ['edit', 'create'], canAdd: true, canEdit: false, canDelete: true, hasRole: true, control: Backform.VariableCollectionControl, node: 'role' },{ diff --git a/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js index 2fa495d7f..d82fcb0ce 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js +++ b/web/pgadmin/browser/server_groups/servers/roles/templates/role/js/role.js @@ -455,8 +455,8 @@ function($, _, S, pgAdmin, pgBrowser, alertify, Backform) { return this.model.isNew() || (this.model.get('rolname') != d.label); } },{ - id: 'variables', label: '{{ _('Variables') }}', type: 'collection', - group: '{{ _('Variables') }}', hasDatabase: true, url: 'variables', + id: 'variables', label: '{{ _('Parameters') }}', type: 'collection', + group: '{{ _('Parameters') }}', hasDatabase: true, url: 'variables', model: pgBrowser.Node.VariableModel, control: 'variable-collection', mode: [ 'edit', 'create'], canAdd: true, canDelete: true, url: "variables", disabled: 'readonly' diff --git a/web/pgadmin/browser/server_groups/servers/static/js/variable.js b/web/pgadmin/browser/server_groups/servers/static/js/variable.js index 6d829d48e..13eedd939 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/variable.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/variable.js @@ -363,7 +363,7 @@ // TODO:: Do the i18n _.extend(data, { - variable_label: "Variable Name", + variable_label: "Parameter name", add_label: "ADD", database_label: "Database", role_label: "Role" diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js b/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js index 666514997..7314c6c67 100644 --- a/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js +++ b/web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js @@ -133,8 +133,8 @@ function($, _, S, pgAdmin, pgBrowser, alertify) { id: 'description', label:'{{ _('Comment') }}', cell: 'string', type: 'multiline' },{ - id: 'spcoptions', label: '{{ _('Variables') }}', type: 'collection', - group: "Variables", control: 'variable-collection', + id: 'spcoptions', label: '{{ _('Parameters') }}', type: 'collection', + group: "Parameters", control: 'variable-collection', model: pgAdmin.Browser.Node.VariableModel, mode: ['edit', 'create'], canAdd: true, canEdit: false, canDelete: true