Changed share l10n string to use a generic template for each share menu items

app/browser/menu.js

@@ -107,13 +107,13 @@ const createFileSubmenu = () => {
       submenu: [
         CommonMenu.simpleShareActiveTabMenuItem('emailPageLink', 'email'),
         CommonMenu.separatorMenuItem,
-        CommonMenu.simpleShareActiveTabMenuItem('tweetPageLink', 'twitter'),
-        CommonMenu.simpleShareActiveTabMenuItem('facebookPageLink', 'facebook'),
-        CommonMenu.simpleShareActiveTabMenuItem('pinterestPageLink', 'pinterest'),
-        CommonMenu.simpleShareActiveTabMenuItem('googlePlusPageLink', 'googlePlus'),
-        CommonMenu.simpleShareActiveTabMenuItem('linkedInPageLink', 'linkedIn'),
-        CommonMenu.simpleShareActiveTabMenuItem('bufferPageLink', 'buffer'),
-        CommonMenu.simpleShareActiveTabMenuItem('redditPageLink', 'reddit')
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'twitter'),
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'facebook'),
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'pinterest'),
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'googlePlus'),
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'linkedIn'),
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'buffer'),
+        CommonMenu.simpleShareActiveTabMenuItem('sharePageLink', 'reddit')
       ]
     },
     // Move inside share menu when it's enabled

app/common/commonMenu.js

@@ -143,8 +143,10 @@ module.exports.printMenuItem = () => {
 }
 
 module.exports.simpleShareActiveTabMenuItem = (l10nId, type, accelerator) => {
+  var serviceName = type.charAt(0).toUpperCase() + type.slice(1)
+
   return {
-    label: locale.translation(l10nId),
+    label: locale.translation(l10nId).replace(/{{\s*siteName\s*}}/, serviceName),
     accelerator,
     click: function (item, focusedWindow) {
       appActions.simpleShareActiveTabRequested(type)

app/extensions/brave/locales/en-US/menu.properties

@@ -25,7 +25,6 @@ braveryPayments=Brave Payments…
 braverySite=Site Shield Settings…
 braveryStartUsingPayments=Start using Brave Payments…
 bringAllToFront=Bring All to Front
-bufferPageLink=Share on Buffer…
 checkForUpdates=Check for Updates…
 cleanReload=Clean Reload
 clearBrowsingData=Clear Browsing Data…
@@ -72,15 +71,13 @@ editFolder=Edit Folder…
 emailPageLink=Email Page Link…
 exportBookmarks=Export Bookmarks…
 extensionsManager=Extensions…
-facebookPageLink=Share on Facebook…
 file=File
 find=Find…
 findNext=Find Next
 findOnPage=Find on Page…
 findPrevious=Find Previous
 forgetLearnedSpelling=Forget Learned Spelling
 forward=Forward
-googlePlusPageLink=Share on Google+…
 help=Help
 hideBrave=Hide Brave
 hideOthers=Hide Others
@@ -92,7 +89,6 @@ importFrom=Import from…
 inspectElement=Inspect Element
 learnSpelling=Learn Spelling
 licenseText=This software uses libraries from the FFmpeg project under the LGPLv2.1
-linkedInPageLink=Share on LinkedIn…
 lookupSelection=Look Up “{{selectedVariable}}”
 mergeAllWindows=Merge All Windows
 minimize=Minimize
@@ -124,15 +120,13 @@ pasteAndGo=Paste and Go
 pasteAndSearch=Paste and Search
 pasteWithoutFormatting=Paste Without Formatting
 pinTab=Pin
-pinterestPageLink=Share on Pinterest…
 preferences=Preferences…
 print=Print…
 quit=Quit
 quitApp=Quit Brave
 readingView=Reading View
 recentlyClosed=Recently Closed
 recentlyVisited=Recently Visited
-redditPageLink=Share on Reddit…
 redo=Redo
 reloadPage=Reload Page
 reloadTab=Reload
@@ -149,6 +143,7 @@ selectPreviousTab=Select Previous Tab
 services=Services
 settings=Settings…
 share=Share…
+sharePageLink=Share on {{siteName}}...
 showAll=Show All
 showAllHistory=Show History
 stop=Stop
@@ -159,7 +154,6 @@ toggleBrowserConsole=Toggle Browser Console
 toggleDeveloperTools=Toggle Developer Tools
 toggleFullScreenView=Toggle Full Screen View
 toolbars=Toolbars
-tweetPageLink=Tweet Page…
 undo=Undo
 unmuteTab=Unmute Tab
 unmuteTabs=Unmute Tabs
@@ -172,4 +166,4 @@ window=Window
 zoom=Zoom
 zoom=Zoom
 zoomIn=Zoom In
-zoomOut=Zoom Out
+zoomOut=Zoom Out

app/locale.js

@@ -156,13 +156,7 @@ var rendererIdentifiers = function () {
     'reopenLastClosedTab',
     'print',
     'emailPageLink',
-    'tweetPageLink',
-    'facebookPageLink',
-    'pinterestPageLink',
-    'googlePlusPageLink',
-    'linkedInPageLink',
-    'bufferPageLink',
-    'redditPageLink',
+    'sharePageLink',
     'findOnPage',
     'find',
     'checkForUpdates',

test/unit/app/browser/shareTest.js

@@ -73,7 +73,7 @@ describe('share API', function () {
         assert.equal(this.mockTabs.create.withArgs(expectedUrl).callCount, 0)
       })
     })
-    describe('other', function () {
+    describe('other share page links', function () {
       it('calls createTabRequested with correct args', function () {
         Object.entries(share.templateUrls).forEach(([shareType, template]) => {
           if (shareType === 'email') {

test/unit/app/common/commonMenuTest.js

@@ -105,14 +105,14 @@ describe('Common menu module unit tests', function () {
   describe('simpleShareActiveTabMenuItem', function () {
     it('has the expected defaults set', function () {
       checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'emailPageLink', 'email', 'CmdOrCtrl+Shift+I'), true)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'tweetPageLink', 'twitter'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'facebookPageLink', 'facebook'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'pinterestPageLink', 'pinterest'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'googlePlusPageLink', 'googlePlus'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'linkedInPageLink', 'linkedIn'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'bufferPageLink', 'buffer'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'redditPageLink', 'reddit'), false)
-      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'diggPageLink', 'digg'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'twitter'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'facebook'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'pinterest'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'googlePlus'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'linkedIn'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'buffer'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'reddit'), false)
+      checkExpectedDefaults(commonMenu.simpleShareActiveTabMenuItem.bind(null, 'sharePageLink', 'digg'), false)
     })
   })