From: Christian Kamm <mail@ckamm.de>
Date: Thu, 6 Jul 2017 09:32:58 +0000 (+0200)
Subject: SocketAPI: Change strings to a consistent _MENU_TITLE postfix
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~704^2^2~60
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ca2ffd4fb3d1133253bc63b17b7dd0ce746a8766;p=nextcloud-desktop.git

SocketAPI: Change strings to a consistent _MENU_TITLE postfix
---

diff --git a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
index 0591824bb..2e917d132 100644
--- a/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
+++ b/shell_integration/MacOSX/OwnCloudFinderSync/FinderSyncExt/FinderSync.m
@@ -103,8 +103,8 @@
 
 	id contextMenuTitle = [_strings objectForKey:@"CONTEXT_MENU_TITLE"];
 	id shareTitle = [_strings objectForKey:@"SHARE_MENU_TITLE"];
-	id copyLinkTitle = [_strings objectForKey:@"COPY_PRIVATE_LINK_TITLE"];
-	id emailLinkTitle = [_strings objectForKey:@"EMAIL_PRIVATE_LINK_TITLE"];
+	id copyLinkTitle = [_strings objectForKey:@"COPY_PRIVATE_LINK_MENU_TITLE"];
+	id emailLinkTitle = [_strings objectForKey:@"EMAIL_PRIVATE_LINK_MENU_TITLE"];
 	if (contextMenuTitle && !onlyRootsSelected) {
         NSMenu *menu = [[NSMenu alloc] initWithTitle:@""];
         NSMenu *subMenu = [[NSMenu alloc] initWithTitle:@""];
diff --git a/shell_integration/dolphin/ownclouddolphinpluginhelper.h b/shell_integration/dolphin/ownclouddolphinpluginhelper.h
index 7d4e7ba14..294d1969d 100644
--- a/shell_integration/dolphin/ownclouddolphinpluginhelper.h
+++ b/shell_integration/dolphin/ownclouddolphinpluginhelper.h
@@ -41,8 +41,8 @@ public:
         return _strings.value("SHARE_MENU_TITLE", "Share...");
     }
 
-    QString copyPrivateLinkTitle() const { return _strings["COPY_PRIVATE_LINK_TITLE"]; }
-    QString emailPrivateLinkTitle() const { return _strings["EMAIL_PRIVATE_LINK_TITLE"]; }
+    QString copyPrivateLinkTitle() const { return _strings["COPY_PRIVATE_LINK_MENU_TITLE"]; }
+    QString emailPrivateLinkTitle() const { return _strings["EMAIL_PRIVATE_LINK_MENU_TITLE"]; }
 
 signals:
     void commandRecieved(const QByteArray &cmd);
diff --git a/shell_integration/nautilus/syncstate.py b/shell_integration/nautilus/syncstate.py
index 9a0f35ed7..082be4e22 100644
--- a/shell_integration/nautilus/syncstate.py
+++ b/shell_integration/nautilus/syncstate.py
@@ -240,15 +240,15 @@ class MenuExtension(GObject.GObject, Nautilus.MenuProvider):
 
         # Add permalink menu options, but hide these options for older clients
         # that don't have these actions.
-        if 'COPY_PRIVATE_LINK_TITLE' in self.strings:
+        if 'COPY_PRIVATE_LINK_MENU_TITLE' in self.strings:
             item_copyprivatelink = Nautilus.MenuItem(
-                name='CopyPrivateLink', label=self.strings.get('COPY_PRIVATE_LINK_TITLE', 'Copy private link to clipboard'))
+                name='CopyPrivateLink', label=self.strings.get('COPY_PRIVATE_LINK_MENU_TITLE', 'Copy private link to clipboard'))
             item_copyprivatelink.connect("activate", self.context_menu_action, 'COPY_PRIVATE_LINK', file)
             menu.append_item(item_copyprivatelink)
 
-        if 'EMAIL_PRIVATE_LINK_TITLE' in self.strings:
+        if 'EMAIL_PRIVATE_LINK_MENU_TITLE' in self.strings:
             item_emailprivatelink = Nautilus.MenuItem(
-                name='EmailPrivateLink', label=self.strings.get('EMAIL_PRIVATE_LINK_TITLE', 'Send private link by email...'))
+                name='EmailPrivateLink', label=self.strings.get('EMAIL_PRIVATE_LINK_MENU_TITLE', 'Send private link by email...'))
             item_emailprivatelink.connect("activate", self.context_menu_action, 'EMAIL_PRIVATE_LINK', file)
             menu.append_item(item_emailprivatelink)
 
diff --git a/shell_integration/windows/OCContextMenu/OCClientInterface.cpp b/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
index 56facf600..6c6396fa5 100644
--- a/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
+++ b/shell_integration/windows/OCContextMenu/OCClientInterface.cpp
@@ -64,9 +64,9 @@ OCClientInterface::ContextMenuInfo OCClientInterface::FetchInfo()
                     info.shareMenuTitle = move(stringValue);
                 else if (stringName == L"CONTEXT_MENU_TITLE")
                     info.contextMenuTitle = move(stringValue);
-                else if (stringName == L"COPY_PRIVATE_LINK_TITLE")
+                else if (stringName == L"COPY_PRIVATE_LINK_MENU_TITLE")
                     info.copyLinkMenuTitle = move(stringValue);
-                else if (stringName == L"EMAIL_PRIVATE_LINK_TITLE")
+                else if (stringName == L"EMAIL_PRIVATE_LINK_MENU_TITLE")
                     info.emailLinkMenuTitle = move(stringValue);
             }
             else if (StringUtil::begins_with(response, wstring(L"GET_STRINGS:END"))) {
diff --git a/src/gui/socketapi.cpp b/src/gui/socketapi.cpp
index 6fc4ea405..9141bf76f 100644
--- a/src/gui/socketapi.cpp
+++ b/src/gui/socketapi.cpp
@@ -529,8 +529,8 @@ void SocketApi::command_GET_STRINGS(const QString &, SocketListener *listener)
         { "SHARE_MENU_TITLE", tr("Share with %1...", "parameter is ownCloud").arg(Theme::instance()->appNameGUI()) },
         { "APPNAME", Theme::instance()->appNameGUI() },
         { "CONTEXT_MENU_TITLE", Theme::instance()->appNameGUI() },
-        { "COPY_PRIVATE_LINK_TITLE", tr("Copy private link to clipboard") },
-        { "EMAIL_PRIVATE_LINK_TITLE", tr("Send private link by email...") },
+        { "COPY_PRIVATE_LINK_MENU_TITLE", tr("Copy private link to clipboard") },
+        { "EMAIL_PRIVATE_LINK_MENU_TITLE", tr("Send private link by email...") },
     } };
     listener->sendMessage(QString("GET_STRINGS:BEGIN"));
     for (auto key_value : strings) {