Merge pull request #1402 from brave/token-grant

Fixes grant locale mix
brave · Jan 21, 2019 · cdfba01 · cdfba01
2 parents 6da3ac8 + 4cb9faf
commit cdfba01
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 33 deletions.
diff --git a/browser/ui/webui/brave_webui_source.cc b/browser/ui/webui/brave_webui_source.cc
@@ -413,7 +413,7 @@ void CustomizeWebUIHTMLSource(const std::string &name, content::WebUIDataSource*
         { "titleBTC", IDS_BRAVE_UI_TITLE_BTC},
         { "titleETH", IDS_BRAVE_UI_TITLE_ETH},
         { "titleLTC", IDS_BRAVE_UI_TITLE_LTC},
-        { "tokenGrant", IDS_BRAVE_UI_TOKEN_GRANT },
+        { "tokenGrantClaimed", IDS_BRAVE_UI_TOKEN_GRANT_CLAIMED },
         { "tokens", IDS_BRAVE_UI_TOKENS },
         { "total", IDS_BRAVE_UI_TOTAL },
         { "transactions", IDS_BRAVE_UI_TRANSACTIONS },

diff --git a/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json b/components/brave_rewards/resources/extension/brave_rewards/_locales/en_US/messages.json
@@ -128,6 +128,10 @@
     "description": "Month"
   },
   "tokenGrant": {
+    "message": "Token Grants",
+    "description": "Title for grant notification"
+  },
+  "tokenGrantClaimed": {
     "message": "Token Grants Claimed",
     "description": "Title for grant section in wallet summary"
   },

diff --git a/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts b/components/brave_rewards/resources/extension/brave_rewards/background/api/locale_api.ts
@@ -77,6 +77,7 @@ export const getUIMessages = (): Record<string, string> => {
     'rewardsContributeAttentionScore',
     'rewardsSummary',
     'tokenGrant',
+    'tokenGrantClaimed',
     'unVerifiedPublisher',
     'unVerifiedText',
     'unVerifiedTextMore',

diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd
@@ -420,7 +420,7 @@
       <message name="IDS_BRAVE_UI_TITLE_BTC" desc="">Bitcoin (BTC)</message>
       <message name="IDS_BRAVE_UI_TITLE_ETH" desc="">Ethereum (ETH)</message>
       <message name="IDS_BRAVE_UI_TITLE_LTC" desc="">Litecoin (LTC)</message>
-      <message name="IDS_BRAVE_UI_TOKEN_GRANT" desc="">Token Grants Claimed</message>
+      <message name="IDS_BRAVE_UI_TOKEN_GRANT_CLAIMED" desc="">Token Grants Claimed</message>
       <message name="IDS_BRAVE_UI_TOKENS" desc="">tokens</message>
       <message name="IDS_BRAVE_UI_TOTAL" desc="">Total</message>
       <message name="IDS_BRAVE_UI_TRANSACTIONS" desc="">Transactions</message>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -273,7 +273,7 @@
     "@types/react-dom": "^16.0.7",
     "@types/react-redux": "6.0.4",
     "awesome-typescript-loader": "^5.2.0",
-    "brave-ui": "github:brave/brave-ui#5bafe81d7043cc87021e9f2aea99867165534d42",
+    "brave-ui": "github:brave/brave-ui#d0369cb8a3c075f863abbb5d8bdc33ab67f84da2",
     "css-loader": "^0.28.9",
     "csstype": "^2.5.5",
     "emptykit.css": "^1.0.1",