Merge branch 'master' into chrome-storage-sync

2016-06-09 16:35:00 -07:00 · 2016-06-09 16:35:00 -07:00 · f121f46a24
commit f121f46a24
parent dc10568917 3dbef4ab8f
50 changed files with 605 additions and 192 deletions
--- a/lib/renderer/chrome-api.js
+++ b/lib/renderer/chrome-api.js
@ -194,4 +194,6 @@ exports.injectTo = function (extensionId, isBackgroundPage, context) {
    setPopup () {},
    getPopup () {}
  }
+
+  chrome.i18n = require('./extensions/i18n.js').setup(extensionId)
 }