pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename the menu 'Disconnect Server' to 'Disconnect from server'. Fixes #7163

pull/71/head
Akshay Joshi 2022-02-07 16:12:30 +05:30
parent 1141aeb524
commit 6d1926bb63
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/en_US/images/object_menu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 126 KiB

6
docs/en_US/menu_bar.rst
View File

@ -53,20 +53,20 @@ following options (in alphabetical order):
| *Clear SSH Tunnel Password* | If you have saved the ssh tunnel password, click to clear the saved password. | | *Clear SSH Tunnel Password* | If you have saved the ssh tunnel password, click to clear the saved password. |
| | Enable only when password is already saved. | | | Enable only when password is already saved. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Connect Server...* | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server. | | *Connect Server* | Click to open the :ref:`Connect to Server <connect_to_server>` dialog to establish a connection with a server. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Create* | Click *Create* to access a context menu that provides context-sensitive selections. | | *Create* | Click *Create* to access a context menu that provides context-sensitive selections. |
| | Your selection opens a *Create* dialog for creating a new object. | | | Your selection opens a *Create* dialog for creating a new object. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Delete/Drop* | Click to delete the currently selected object from the server. | | *Delete/Drop* | Click to delete the currently selected object from the server. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Disconnect Server...* | Click to disconnect the currently selected server. | | *Disconnect from server* | Click to disconnect from the currently selected server. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Drop Cascade* | Click to delete the currently selected object and all dependent objects from the server. | | *Drop Cascade* | Click to delete the currently selected object and all dependent objects from the server. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Properties...* | Click to review or modify the currently selected object's properties. | | *Properties...* | Click to review or modify the currently selected object's properties. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Refresh...* | Click to refresh the currently selected object. | | *Refresh* | Click to refresh the currently selected object. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Remove Server* | Click to remove the currently selected server. | | *Remove Server* | Click to remove the currently selected server. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+

1
docs/en_US/release_notes_6_5.rst
View File

@ -16,6 +16,7 @@ Housekeeping
| `Issue #7016 <https://redmine.postgresql.org/issues/7016>`_ - Port Dependent, dependencies, statistics panel to React. | `Issue #7016 <https://redmine.postgresql.org/issues/7016>`_ - Port Dependent, dependencies, statistics panel to React.
| `Issue #7017 <https://redmine.postgresql.org/issues/7017>`_ - Port Import/Export dialog to React. | `Issue #7017 <https://redmine.postgresql.org/issues/7017>`_ - Port Import/Export dialog to React.
| `Issue #7163 <https://redmine.postgresql.org/issues/7163>`_ - Rename the menu 'Disconnect Server' to 'Disconnect from server'.
Bug fixes Bug fixes
********* *********

2
docs/en_US/tree_control.rst
View File

@ -53,7 +53,7 @@ following selections (options appear in alphabetical order):
+---------------------------+---------------------------------------------------------------------------------------------------------------------------+ +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
| *Disconnect Database...* | Click to terminate a database connection. | | *Disconnect Database...* | Click to terminate a database connection. |
+---------------------------+---------------------------------------------------------------------------------------------------------------------------+ +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
| *Disconnect Server...* | Click to refresh the currently selected object. | | *Disconnect from server* | Click to disconnect from the currently selected server. |
+---------------------------+---------------------------------------------------------------------------------------------------------------------------+ +---------------------------+---------------------------------------------------------------------------------------------------------------------------+
| *Drop Cascade* | Click to delete the currently selected object and all dependent objects from the server. | | *Drop Cascade* | Click to delete the currently selected object and all dependent objects from the server. |
+---------------------------+---------------------------------------------------------------------------------------------------------------------------+ +---------------------------+---------------------------------------------------------------------------------------------------------------------------+

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

@ -92,14 +92,14 @@ define('pgadmin.node.server', [
applies: ['object', 'context'], callback: 'connect_server', applies: ['object', 'context'], callback: 'connect_server',
category: 'connect', priority: 4, label: gettext('Connect Server'), category: 'connect', priority: 4, label: gettext('Connect Server'),
icon: 'fa fa-link', enable : 'is_not_connected',data: { icon: 'fa fa-link', enable : 'is_not_connected',data: {
data_disabled: gettext('Database is already connected.'), data_disabled: gettext('Database server is already connected.'),
}, },
},{ },{
name: 'disconnect_server', node: 'server', module: this, name: 'disconnect_server', node: 'server', module: this,
applies: ['object', 'context'], callback: 'disconnect_server', applies: ['object', 'context'], callback: 'disconnect_server',
category: 'drop', priority: 5, label: gettext('Disconnect Server'), category: 'drop', priority: 5, label: gettext('Disconnect from server'),
icon: 'fa fa-unlink', enable : 'is_connected',data: { icon: 'fa fa-unlink', enable : 'is_connected',data: {
data_disabled: gettext('Database is already disconnected.'), data_disabled: gettext('Database server is already disconnected.'),
}, },
}, },
{ {
@ -285,8 +285,8 @@ define('pgadmin.node.server', [
if (notify) { if (notify) {
Notify.confirm( Notify.confirm(
gettext('Disconnect server'), gettext('Disconnect from server'),
gettext('Are you sure you want to disconnect the server %s?', d.label), gettext('Are you sure you want to disconnect from the server %s?', d.label),
function() { disconnect(); }, function() { disconnect(); },
function() { return true;}, function() { return true;},
); );