Localize data-l10n-id attributes in renderer process window

Fix #2638 Auditors: @aekeus
brave · Aug 13, 2016 · 23037df · 23037df · luixxiul · Aug 13, 2016
1 parent 227a83c
commit 23037df
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/app/extensions/brave/index-dev.html b/app/extensions/brave/index-dev.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <meta name="availableLanguages" content="en-US">
+    <meta name="availableLanguages" content="">
     <meta name="defaultLanguage" content="en-US">
     <!-- TODO: Don't allow img-src *, needed for favicons -->
     <!-- TODO: Refactor away all unsafe-inline content -->

diff --git a/app/extensions/brave/index.html b/app/extensions/brave/index.html
@@ -2,12 +2,12 @@
 <html>
   <head>
     <meta charset="utf-8">
+    <meta name="availableLanguages" content="">
+    <meta name="defaultLanguage" content="en-US">
     <!-- TODO: Don't allow img-src *, needed for favicons -->
     <!-- TODO: Refactor away all unsafe-inline content -->
     <!-- TODO: Replace suggestqueries.google.com and ac.duckduckgo.com and other search engines with a single config search engine -->
     <meta http-equiv="Content-Security-Policy" content="default-src 'none'; form-action 'none'; referrer no-referrer; script-src 'self'; img-src * data:; style-src 'self' 'unsafe-inline'; font-src 'self'; connect-src 'self' https://s3.amazonaws.com/adblock-data/ https://s3.amazonaws.com/safe-browsing-data/ https://s3.amazonaws.com/tracking-protection-data/ https://s3.amazonaws.com/https-everywhere-data/ https://suggestqueries.google.com https://ac.duckduckgo.com https://completion.amazon.com https://search.yahoo.com https://api.bing.com https://brave-download.global.ssl.fastly.net https://brave-laptop-updates.global.ssl.fastly.net https://laptop-updates-pre.brave.com https://brave-laptop-updates-pre.brave.com; object-src 'self'; plugin-types application/browser-plugin"/>
-    <meta name="availableLanguages" content="en-US"/>
-    <meta name="defaultLanguage" content="en-US"/>
     <title>Brave</title>
     <script src="gen/app.entry.js" async></script>
     <script src="ext/l20n.min.js" async></script>

diff --git a/js/entry.js b/js/entry.js
@@ -33,6 +33,7 @@ const appStoreRenderer = require('./stores/appStoreRenderer')
 const messages = require('./constants/messages')
 const Immutable = require('immutable')
 const patch = require('immutablepatch')
+const l10n = require('./l10n')
 
 // don't allow scaling or zooming of the ui
 webFrame.setPageScaleLimits(1, 1)
@@ -65,3 +66,5 @@ ipc.on(messages.APP_STATE_CHANGE, (e, action) => {
 window.addEventListener('beforeunload', function () {
   ipc.send(messages.LAST_WINDOW_STATE, windowStore.getState().toJS())
 })
+
+l10n.init()
diff --git a/js/l10n.js b/js/l10n.js
@@ -4,6 +4,7 @@
 
 const ipcRenderer = require('electron').ipcRenderer
 const locale = require('../app/locale')
+const {LANGUAGE, REQUEST_LANGUAGE} = require('./constants/messages')
 
 // rendererTranslationCache stores a hash containing the entire set of menu translations
 // for the currently selected language
@@ -26,3 +27,11 @@ exports.translation = (token) => {
     return locale.translation(token)
   }
 }
+
+exports.init = () => {
+  ipcRenderer.on(LANGUAGE, (e, detail) => {
+    document.l10n.requestLanguages([detail.langCode])
+    document.getElementsByName('availableLanguages')[0].content = detail.languageCodes.join(', ')
+  })
+  ipcRenderer.send(REQUEST_LANGUAGE)
+}
diff --git a/js/stores/windowStore.js b/js/stores/windowStore.js
@@ -434,7 +434,7 @@ const doAction = (action) => {
         activeFrameKey))
       let totalOpenTabs = windowState.get('frames').filter((frame) => !frame.get('pinnedLocation')).size
 
-      // If we reach the limit of opened tabs per page while closing tabs, switch to 
+      // If we reach the limit of opened tabs per page while closing tabs, switch to
       // the active tab's page otherwise the user will hang on empty page
       if ((totalOpenTabs % getSetting(settings.TABS_PER_PAGE)) === 0) {
         updateTabPageIndex(FrameStateUtil.getActiveFrame(windowState))