Merge branch 'master' into chrome-storage-sync

This commit is contained in:
Jessica Lord 2016-06-09 16:35:00 -07:00
commit f121f46a24
50 changed files with 605 additions and 192 deletions

View file

@ -0,0 +1,10 @@
{
"foo": {
"message": "foo - $BAZ$ ($2)",
"placeholders": {
"baz": {
"content": "$1"
}
}
}
}

View file

@ -13,6 +13,8 @@
testStorage(function (items) {
var message = JSON.stringify({
runtimeId: chrome.runtime.id,
tabId: chrome.devtools.inspectedWindow.tabId,
i18nString: chrome.i18n.getMessage('foo', ['bar', 'baz']),
storageItems: items
})
var sendMessage = `require('electron').ipcRenderer.send('answer', ${message})`

View file

@ -1,5 +1,6 @@
{
"name": "foo",
"version": "1.0",
"devtools_page": "foo.html"
"devtools_page": "foo.html",
"default_locale": "en"
}