From d4cad892de4c8da087c4efee2e8955caa630675c Mon Sep 17 00:00:00 2001
From: Jonathan Sampson <jjdsampson@gmail.com>
Date: Thu, 13 Apr 2017 00:58:40 -0500
Subject: [PATCH] Adds title attributes to extension buttons

---
 app/extensions.js                             | 19 ++++++++++++-------
 .../brave/locales/en-US/app.properties        |  1 +
 app/renderer/components/browserAction.js      |  2 ++
 js/components/button.js                       |  1 +
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/extensions.js b/app/extensions.js
index 623b339cdea..9f2f24fcb64 100644
--- a/app/extensions.js
+++ b/app/extensions.js
@@ -371,18 +371,23 @@ module.exports.init = () => {
 
   let insertLocaleStrings = (installInfo) => {
     let pattern = /^__MSG_(.*)__$/
-    let properties = ['name', 'description']
     let defaultLocale = installInfo.manifest.default_locale
     if (defaultLocale) {
       let msgPath = path.join(installInfo.base_path, '_locales', defaultLocale, 'messages.json')
       if (fs.existsSync(msgPath)) {
         let messages = JSON.parse(fs.readFileSync(msgPath).toString())
-        properties.forEach((property) => {
-          let matches = installInfo[property].match(pattern)
-          if (matches) {
-            installInfo[property] = messages[matches[1]].message
-          }
-        })
+        if (installInfo.name) {
+          let name = installInfo.name.match(pattern)
+          name && (installInfo.name = messages[name[1]].message)
+        }
+        if (installInfo.description) {
+          let description = installInfo.name.match(pattern)
+          description && (installInfo.description = messages[description[1]].message)
+        }
+        if (installInfo.manifest.browser_action.default_title) {
+          let defaultTitle = installInfo.manifest.browser_action.default_title.match(pattern)
+          defaultTitle && (installInfo.manifest.browser_action.default_title = messages[defaultTitle[1]].message)
+        }
       }
     }
     return installInfo
diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties
index 97a698bc4c8..5c40df199fd 100644
--- a/app/extensions/brave/locales/en-US/app.properties
+++ b/app/extensions/brave/locales/en-US/app.properties
@@ -259,3 +259,4 @@ preventMoreAlerts=Prevent this page from creating additional dialogs
 copied=Copied!
 connectionError=Server connection failed. Please make sure you are connected to the Internet.
 unknownError=Oops, something went wrong.
+browserActionButton.title={{name}}
diff --git a/app/renderer/components/browserAction.js b/app/renderer/components/browserAction.js
index 9feed6cfe7a..d924dd87311 100644
--- a/app/renderer/components/browserAction.js
+++ b/app/renderer/components/browserAction.js
@@ -48,6 +48,8 @@ class BrowserAction extends ImmutableComponent {
     // TODO(bridiver) should have some visual notification of hover/press
     return <div className={css(styles.browserActionButton)}>
       <Button iconClass='extensionBrowserAction'
+        l10nId='browserActionButton'
+        l10nArgs={{ name: this.props.browserAction.get('title') }}
         className={css(styles.extensionButton)}
         inlineStyles={{
           backgroundImage: extensionState.browserActionBackgroundImage(this.props.browserAction, this.props.tabId)
diff --git a/js/components/button.js b/js/components/button.js
index a2083b40e81..b14198679f1 100644
--- a/js/components/button.js
+++ b/js/components/button.js
@@ -13,6 +13,7 @@ class Button extends ImmutableComponent {
         data-l10n-id={this.props.l10nId}
         data-test-id={this.props.testId}
         data-test2-id={this.props.test2Id}
+        data-l10n-args={JSON.stringify(this.props.l10nArgs || {})}
         style={this.props.inlineStyles}
         data-button-value={this.props.dataButtonValue}
         className={cx({