diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js index 915189591..b218f423c 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/rules/static/js/rule.js @@ -115,12 +115,12 @@ define('pgadmin.node.rule', [ { name: 'enable_rule', node: 'rule', module: this, applies: ['object', 'context'], callback: 'enable_rule', - category: 'connect', priority: 3, label: gettext('Enable rule'), + category: 'connect', priority: 3, label: gettext('Enable'), icon: 'fa fa-check', enable: 'canCreate_with_rule_enable', },{ name: 'disable_rule', node: 'rule', module: this, applies: ['object', 'context'], callback: 'disable_rule', - category: 'drop', priority: 3, label: gettext('Disable rule'), + category: 'drop', priority: 3, label: gettext('Disable'), icon: 'fa fa-times', enable: 'canCreate_with_rule_disable' } ]); diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js index 6d0a8db8c..fe82d0cc7 100644 --- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js +++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js @@ -79,12 +79,12 @@ define('pgadmin.node.trigger', [ },{ name: 'enable_trigger', node: 'trigger', module: this, applies: ['object', 'context'], callback: 'enable_trigger', - category: 'connect', priority: 3, label: gettext('Enable trigger'), + category: 'connect', priority: 3, label: gettext('Enable'), icon: 'fa fa-check', enable : 'canCreate_with_trigger_enable', },{ name: 'disable_trigger', node: 'trigger', module: this, applies: ['object', 'context'], callback: 'disable_trigger', - category: 'drop', priority: 3, label: gettext('Disable trigger'), + category: 'drop', priority: 3, label: gettext('Disable'), icon: 'fa fa-times', enable : 'canCreate_with_trigger_disable', },{ name: 'create_trigger_onView', node: 'view', module: this, diff --git a/web/pgadmin/browser/static/js/collection.js b/web/pgadmin/browser/static/js/collection.js index 39c2e772f..4ee9659e6 100644 --- a/web/pgadmin/browser/static/js/collection.js +++ b/web/pgadmin/browser/static/js/collection.js @@ -45,7 +45,7 @@ define([ pgAdmin.Browser.add_menus([{ name: 'refresh', node: this.type, module: this, applies: ['object', 'context'], callback: 'refresh', - priority: 1, label: gettext('Refresh...'), + priority: 1, label: gettext('Refresh'), icon: 'fa fa-sync-alt', }]); diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js index d9f887a39..650d6418b 100644 --- a/web/pgadmin/browser/static/js/node.js +++ b/web/pgadmin/browser/static/js/node.js @@ -118,7 +118,7 @@ define('pgadmin.browser.node', [ applies: ['object', 'context'], callback: 'refresh', priority: 1, - label: gettext('Refresh...'), + label: gettext('Refresh'), icon: 'fa fa-sync-alt', }]); diff --git a/web/pgadmin/tools/debugger/static/js/debugger.js b/web/pgadmin/tools/debugger/static/js/debugger.js index ea34c2bd5..fd3e04879 100644 --- a/web/pgadmin/tools/debugger/static/js/debugger.js +++ b/web/pgadmin/tools/debugger/static/js/debugger.js @@ -58,7 +58,7 @@ define([ callback: 'check_func_debuggable', category: gettext('Debugging'), priority: 10, - label: gettext('Set breakpoint'), + label: gettext('Set Breakpoint'), data: { object: 'function', debug_type: 'indirect', @@ -87,7 +87,7 @@ define([ callback: 'check_func_debuggable', category: gettext('Debugging'), priority: 10, - label: gettext('Set breakpoint'), + label: gettext('Set Breakpoint'), data: { object: 'procedure', debug_type: 'indirect', @@ -101,7 +101,7 @@ define([ applies: ['object', 'context'], callback: 'check_func_debuggable', priority: 10, - label: gettext('Set breakpoint'), + label: gettext('Set Breakpoint'), category: gettext('Debugging'), icon: 'fa fa-arrow-circle-right', data: { @@ -116,7 +116,7 @@ define([ applies: ['object', 'context'], callback: 'check_func_debuggable', priority: 10, - label: gettext('Set breakpoint'), + label: gettext('Set Breakpoint'), category: gettext('Debugging'), icon: 'fa fa-arrow-circle-right', data: { @@ -146,7 +146,7 @@ define([ callback: 'check_func_debuggable', category: gettext('Debugging'), priority: 10, - label: gettext('Set breakpoint'), + label: gettext('Set Breakpoint'), data: { object: 'edbfunc', debug_type: 'indirect', @@ -175,7 +175,7 @@ define([ callback: 'check_func_debuggable', category: gettext('Debugging'), priority: 10, - label: gettext('Set breakpoint'), + label: gettext('Set Breakpoint'), data: { object: 'edbproc', debug_type: 'indirect', diff --git a/web/regression/feature_utils/pgadmin_page.py b/web/regression/feature_utils/pgadmin_page.py index aa714d423..c44f62358 100644 --- a/web/regression/feature_utils/pgadmin_page.py +++ b/web/regression/feature_utils/pgadmin_page.py @@ -714,7 +714,7 @@ class PgadminPage: # get the element which contains 'aria-expanded' info xpath_for_refresh_btn = "//li[@class='context-menu-item']" \ - "/span[text()='Refresh...']" + "/span[text()='Refresh']" # add code to refresh button, sometime the collapsing button # is not visible even if there is sub node.