From 4bd412aa9b2160c699d0baea699752ab088169f9 Mon Sep 17 00:00:00 2001 From: Gitoffthelawn Date: Thu, 23 Jan 2020 02:02:12 -0800 Subject: [PATCH 01/16] Improve accessibility by adjusting AMO links Let's open this to everyone and not assume any specific language or country. AMO will automatically redirect to user's language and country. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e85c870..1ee8f84 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ The Firefox Multi-Account Containers extension lets you carve out a separate box for each of your online lives – no more opening a different browser just to check your work email! [Learn More Here](https://blog.mozilla.org/firefox/introducing-firefox-multi-account-containers/) -[Available on addons.mozilla.org](https://addons.mozilla.org/en-GB/firefox/addon/multi-account-containers/) +[Available on addons.mozilla.org](https://addons.mozilla.org/firefox/addon/multi-account-containers/) For more info, see: @@ -43,12 +43,12 @@ There is a timeout test that sometimes fails on certain machines, so make sure t #### Publish to AMO 1. `npm run-script build` -2. [Upload the `.zip` to AMO](https://addons.mozilla.org/en-US/developers/addon/multi-account-containers/versions/submit/) +2. [Upload the `.zip` to AMO](https://addons.mozilla.org/developers/addon/multi-account-containers/versions/submit/) #### Publish to GitHub Finally, we also publish the release to GitHub for those followers. -1. Download the signed `.xpi` from [the addon versions page](https://addons.mozilla.org/en-US/developers/addon/multi-account-containers/versions) +1. Download the signed `.xpi` from [the addon versions page](https://addons.mozilla.org/developers/addon/multi-account-containers/versions) 2. [Make the new release on GitHub](https://github.com/mozilla/multi-account-containers/releases/new) * Use the version number for "Tag version" and "Release title" From c03c3c118c1d55c4eea636a045cfe7dfa181c9ac Mon Sep 17 00:00:00 2001 From: Khansa Kiasatina Date: Sun, 8 Mar 2020 17:02:58 -0400 Subject: [PATCH 02/16] fix alignment --- src/css/confirm-page.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/css/confirm-page.css b/src/css/confirm-page.css index 113ffef..87c10f2 100644 --- a/src/css/confirm-page.css +++ b/src/css/confirm-page.css @@ -77,6 +77,10 @@ dfn { font-style: normal; } +#deny, #confirm { + flex-grow: 1; +} + .button-container > button { min-inline-size: 240px; } From 2ed9eaee8a71196fb2551ca35d58448e425d92d9 Mon Sep 17 00:00:00 2001 From: Khansa Kiasatina Date: Fri, 13 Mar 2020 17:25:09 -0400 Subject: [PATCH 03/16] fix lint --- src/css/confirm-page.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/css/confirm-page.css b/src/css/confirm-page.css index 87c10f2..9f86242 100644 --- a/src/css/confirm-page.css +++ b/src/css/confirm-page.css @@ -28,7 +28,7 @@ button .container-name, /* for a mid sized window we have enough for this but not our image */ .title { - background-image: url("chrome://global/skin/icons/info.svg"); + background-image: url('chrome://global/skin/icons/info.svg'); } } @@ -77,7 +77,8 @@ dfn { font-style: normal; } -#deny, #confirm { +#deny, +#confirm { flex-grow: 1; } From a1d01f8ff2f04d677a3423866a9df7d6f994f06b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andre=20Schr=C3=B6der?= Date: Wed, 23 Dec 2020 04:13:16 +0100 Subject: [PATCH 04/16] Fix development instructions in README web-ext will not work when following the instructions without having this diff applied: ``` $ ./node_modules/web-ext/bin/web-ext run -s src/ (node:41062) Warning: Accessing non-existent property 'cat' of module exports inside circular dependency (Use `node --trace-warnings ...` to show where the warning was created) (node:41062) Warning: Accessing non-existent property 'cd' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'chmod' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'cp' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'dirs' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'pushd' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'popd' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'echo' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'tempdir' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'pwd' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'exec' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'ls' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'find' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'grep' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'head' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'ln' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'mkdir' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'rm' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'mv' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'sed' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'set' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'sort' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'tail' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'test' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'to' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'toEnd' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'touch' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'uniq' of module exports inside circular dependency (node:41062) Warning: Accessing non-existent property 'which' of module exports inside circular dependency Applying config file: ./package.json Running web extension from /home/andre/Git/multi-account-containers/src Use --verbose or open Tools > Web Developer > Browser Console to see logging WebExtError: Temporary add-on installation is not supported in this version of Firefox (you need Firefox 49 or higher). For older Firefox versions, use --pre-install at FirefoxDesktopExtensionRunner._callee6$ (/home/andre/Git/multi-account-containers/node_modules/web-ext/dist/webpack:/src/extension-runners/firefox-desktop.js:273:19) at tryCatch (/home/andre/Git/multi-account-containers/node_modules/web-ext/node_modules/regenerator-runtime/runtime.js:62:40) at Generator.invoke [as _invoke] (/home/andre/Git/multi-account-containers/node_modules/web-ext/node_modules/regenerator-runtime/runtime.js:296:22) at Generator.prototype. [as throw] (/home/andre/Git/multi-account-containers/node_modules/web-ext/node_modules/regenerator-runtime/runtime.js:114:21) at step (/home/andre/Git/multi-account-containers/node_modules/web-ext/dist/webpack:/node_modules/babel-runtime/helpers/asyncToGenerator.js:17:1) at /home/andre/Git/multi-account-containers/node_modules/web-ext/dist/webpack:/node_modules/babel-runtime/helpers/asyncToGenerator.js:30:1 at processTicksAndRejections (node:internal/process/task_queues:93:5) ``` web-ext will work when following the instructions with having this diff applied: ``` $ web-ext run -s src/ Applying config file: ./package.json Running web extension from /home/andre/Git/multi-account-containers/src Use --verbose or open Tools > Web Developer > Browser Console to see logging Installed /home/andre/Git/multi-account-containers/src as a temporary add-on The extension will reload if any source file changes Press R to reload (and Ctrl-C to quit) ``` I copied the wording from https://github.com/mdn/webextensions-examples/blob/2184fee75afcde39328384b36adf9e52c5917949/README.md I guess the underlying problem is that the web-ext version specified in the package.json is very outdated. By installing the web-ext tool via the provided instructions it fixes the problem. Furthermore, the `webextensions-examples` repo doesn't specify web-ext in their package.json which means that installing web-ext via the provided instructions seems to be the preferred way. (So maybe web-ext should be removed from the package.json entirely?) Fixes #1926 --- README.md | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 47dce0c..67fef55 100644 --- a/README.md +++ b/README.md @@ -18,17 +18,32 @@ For more info, see: ## Development -1. `npm install` -2. `./node_modules/web-ext/bin/web-ext run -s src/` +To run this extension: + +1. Open Firefox and load the `about:debugging` page. Click + [Load Temporary Add-on](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox) + and select the `manifest.json` file within the folder of an example extension. + Here is a [video](https://www.youtube.com/watch?v=cer9EUKegG4) + that demonstrates how to do this. +2. Install the + [web-ext](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext) + tool. At the command line, open the example extension's folder and type + `web-ext run -s src/`. This launches Firefox and installs the extension automatically. + This tool provides some additional development features, such as + [automatic reloading](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext#Automatic_extension_reloading). ### Testing -`npm run test` -or +``` +# Install dependencies +npm install -`npm run lint` +# Run all tests +npm run test -for just the linter +# Only run the linter +npm run lint +``` There is a timeout test that sometimes fails on certain machines, so make sure to run the tests on your clone before you make any changes to see if you have this problem. From 649110ed454a9400b1d875cf4834ed4e4293bdf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Schr=C3=B6der?= Date: Mon, 11 Jan 2021 20:09:11 +0100 Subject: [PATCH 05/16] fix concerns --- README.md | 51 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 67fef55..438ff2c 100644 --- a/README.md +++ b/README.md @@ -18,32 +18,43 @@ For more info, see: ## Development -To run this extension: +### Running Locally -1. Open Firefox and load the `about:debugging` page. Click - [Load Temporary Add-on](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox) - and select the `manifest.json` file within the folder of an example extension. - Here is a [video](https://www.youtube.com/watch?v=cer9EUKegG4) - that demonstrates how to do this. -2. Install the - [web-ext](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext) - tool. At the command line, open the example extension's folder and type - `web-ext run -s src/`. This launches Firefox and installs the extension automatically. - This tool provides some additional development features, such as - [automatic reloading](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext#Automatic_extension_reloading). +#### via WebExtensions API (web-ext) + +1. Install the [web-ext](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext) tool. +2. Run `web-ext run -s src/`. This launches Firefox and installs the extension automatically. + +This tool provides some additional development features, such as [automatic reloading](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext#Automatic_extension_reloading). + +#### via about:debugging in Firefox + +1. Open the `about:debugging` page in Firefox. +2. Click on `This FIrefox`. +3. Click on [Load Temporary Add-on](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox). +4. Select `src/manifest.json`. + +Here is a [video](https://www.youtube.com/watch?v=cer9EUKegG4) that demonstrates how to do this. ### Testing -``` -# Install dependencies -npm install +* Install dependencies: -# Run all tests -npm run test + ``` + npm install + ``` -# Only run the linter -npm run lint -``` +* Run all tests: + + ``` + npm run test + ``` + +* Only run the linter: + + ``` + npm run lint + ``` There is a timeout test that sometimes fails on certain machines, so make sure to run the tests on your clone before you make any changes to see if you have this problem. From 4d76c937fec9ab0a681c2fdd9ee9f82fde885426 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Schr=C3=B6der?= Date: Mon, 11 Jan 2021 20:11:06 +0100 Subject: [PATCH 06/16] fix typos --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 438ff2c..39b33c8 100644 --- a/README.md +++ b/README.md @@ -20,17 +20,17 @@ For more info, see: ### Running Locally -#### via WebExtensions API (web-ext) +#### Via WebExtensions API (web-ext) 1. Install the [web-ext](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext) tool. 2. Run `web-ext run -s src/`. This launches Firefox and installs the extension automatically. This tool provides some additional development features, such as [automatic reloading](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Getting_started_with_web-ext#Automatic_extension_reloading). -#### via about:debugging in Firefox +#### Via about:debugging in Firefox 1. Open the `about:debugging` page in Firefox. -2. Click on `This FIrefox`. +2. Click on `This Firefox`. 3. Click on [Load Temporary Add-on](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Temporary_Installation_in_Firefox). 4. Select `src/manifest.json`. From 86edd8c8a29b4cc083692fbcbbb4be2b525d5ec6 Mon Sep 17 00:00:00 2001 From: Noah Callaway Date: Fri, 23 Apr 2021 00:10:37 -0700 Subject: [PATCH 07/16] Rename 'always open in' title --- src/js/popup.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index 22a4b4c..98d2ef0 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -803,8 +803,8 @@ Logic.registerPanel(P_CONTAINER_INFO, { }); // Populating the panel: name and icon document.getElementById("container-info-title").textContent = identity.name; - - const alwaysOpen = document.querySelector("#always-open-in-info-panel"); + + const alwaysOpen = document.querySelector("#always-open-in-info-panel"); Utils.addEnterHandler(alwaysOpen, async () => { Utils.alwaysOpenInContainer(identity); window.close(); @@ -941,7 +941,7 @@ Logic.registerPanel(OPEN_NEW_CONTAINER_PICKER, { tr.setAttribute("tabindex", "0"); const td = document.createElement("td"); - td.innerHTML = Utils.escaped` + td.innerHTML = Utils.escaped`
@@ -1139,10 +1139,10 @@ Logic.registerPanel(REOPEN_IN_CONTAINER_PICKER, { Utils.addEnterHandler(tr, () => { Utils.reloadInContainer( - currentTab.url, - false, + currentTab.url, + false, 0, - currentTab.index + 1, + currentTab.index + 1, currentTab.active ); window.close(); @@ -1156,7 +1156,7 @@ Logic.registerPanel(REOPEN_IN_CONTAINER_PICKER, { tr.setAttribute("tabindex", "0"); const td = document.createElement("td"); - td.innerHTML = Utils.escaped` + td.innerHTML = Utils.escaped`
Date: Tue, 18 May 2021 14:36:29 -0300 Subject: [PATCH 08/16] Replace deprecated method Close #2047 --- src/js/background/assignManager.js | 2 +- src/js/background/backgroundLogic.js | 2 +- src/js/content-script.js | 2 +- src/js/popup.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js index 032adb1..02aa274 100644 --- a/src/js/background/assignManager.js +++ b/src/js/background/assignManager.js @@ -698,7 +698,7 @@ window.assignManager = { reloadPageInContainer(url, currentUserContextId, userContextId, index, active, neverAsk = false, openerTabId = null) { const cookieStoreId = backgroundLogic.cookieStoreId(userContextId); - const loadPage = browser.extension.getURL("confirm-page.html"); + const loadPage = browser.runtime.getURL("confirm-page.html"); // False represents assignment is not permitted // If the user has explicitly checked "Never Ask Again" on the warning page we will send them straight there if (neverAsk) { diff --git a/src/js/background/backgroundLogic.js b/src/js/background/backgroundLogic.js index 7643221..4c55306 100644 --- a/src/js/background/backgroundLogic.js +++ b/src/js/background/backgroundLogic.js @@ -22,7 +22,7 @@ const backgroundLogic = { }, async getExtensionInfo() { - const manifestPath = browser.extension.getURL("manifest.json"); + const manifestPath = browser.runtime.getURL("manifest.json"); const response = await fetch(manifestPath); const extensionInfo = await response.json(); return extensionInfo; diff --git a/src/js/content-script.js b/src/js/content-script.js index 1bf6a6e..539e43a 100644 --- a/src/js/content-script.js +++ b/src/js/content-script.js @@ -24,7 +24,7 @@ async function addMessage(message) { divElement.innerText = message.text; const imageElement = document.createElement("img"); - const imagePath = browser.extension.getURL("/img/container-site-d-24.png"); + const imagePath = browser.runtime.getURL("/img/container-site-d-24.png"); const response = await fetch(imagePath); const blob = await response.blob(); const objectUrl = URL.createObjectURL(blob); diff --git a/src/js/popup.js b/src/js/popup.js index 22a4b4c..6a4f090 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -41,7 +41,7 @@ function addRemoveSiteIsolation() { } async function getExtensionInfo() { - const manifestPath = browser.extension.getURL("manifest.json"); + const manifestPath = browser.runtime.getURL("manifest.json"); const response = await fetch(manifestPath); const extensionInfo = await response.json(); return extensionInfo; From 56b85a8cddbf2a1c3f8914f457e142983ef1a1c2 Mon Sep 17 00:00:00 2001 From: Luca Greco Date: Wed, 14 Jul 2021 20:25:04 +0200 Subject: [PATCH 09/16] fix: Add unlimitedStorage permission to make sure storage.local doesn't hit quota limits or IndexedDB QuotaManager data eviction --- src/manifest.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/manifest.json b/src/manifest.json index 7c8991b..85e4750 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -25,6 +25,7 @@ "idle", "management", "storage", + "unlimitedStorage", "tabs", "webRequestBlocking", "webRequest" From 0b760ce465e1ccd2e760ae3667f8d9aa38c5d60e Mon Sep 17 00:00:00 2001 From: Maxx Crawford Date: Mon, 9 Aug 2021 09:32:45 -0500 Subject: [PATCH 10/16] Update version number to 7.4.0 --- package.json | 2 +- src/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c5d4a91..26d2e1a 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "testpilot-containers", "title": "Multi-Account Containers", "description": "Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.", - "version": "7.3.0", + "version": "7.4.0", "author": "Andrea Marchesini, Luke Crouch and Jonathan Kingston", "bugs": { "url": "https://github.com/mozilla/multi-account-containers/issues" diff --git a/src/manifest.json b/src/manifest.json index 85e4750..29381e7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Firefox Multi-Account Containers", - "version": "7.3.0", + "version": "7.4.0", "incognito": "not_allowed", "description": "Multi-Account Containers helps you keep all the parts of your online life contained in different tabs. Custom labels and color-coded tabs help keep different activities — like online shopping, travel planning, or checking work email — separate.", "icons": { From 05dc48eac2d12dc65dc2e062ad3d64d0fe77051a Mon Sep 17 00:00:00 2001 From: Lesley Norton Date: Thu, 16 Sep 2021 10:55:54 -0500 Subject: [PATCH 11/16] Start i18n --- src/_locales/en/messages.json | 256 ++++++++++++++++++++++++++++++++++ src/confirm-page.html | 17 ++- src/js/confirm-page.js | 20 +-- src/js/i18n.js | 9 ++ src/manifest.json | 1 + src/options.html | 53 +++---- src/pageActionPopup.html | 7 +- src/popup.html | 227 ++++++++++++++---------------- 8 files changed, 415 insertions(+), 175 deletions(-) create mode 100644 src/_locales/en/messages.json create mode 100644 src/js/i18n.js diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json new file mode 100644 index 0000000..e1c87f9 --- /dev/null +++ b/src/_locales/en/messages.json @@ -0,0 +1,256 @@ +{ + "openInNewTabTitle": { + "message": "Open New Tab in…", + "description": "Menu title" + }, + "reopenThisSiteIn": { + "message": "Reopen This Site in…", + "description": "Menu title" + }, + "sortTabsByContainer": { + "message": "Sort Tabs by Container", + "description": "Menu title" + }, + "alwaysOpenThisSiteIn": { + "message": "Always Open This Site in…", + "description": "Menu title" + }, + "alwaysOpenSiteInContainer": { + "message": "Always Open Site in Container" + }, + "openNewTabInThisContainer": { + "message" : "Open New Tab in this Container" + }, + "openTabs": { + "message": "Open Tabs" + }, + "moveTabsToANewWindow": { + "message": "Move Tabs to a New Window" + }, + "onboarding-1-header": { + "message": "A better way to manage all the things you do online" + }, + "onboarding-1-description": { + "message": "Use containers to organize tasks, manage accounts, and keep your focus where you want it." + }, + "onboarding-1-sec-header": { + "message": "A simple and secure way to manage your online life" + }, + "onboarding-1-sec-description": { + "message" : "Use containers to organize tasks, manage accounts, and store sensitive data." + }, + "onboarding-2-header": { + "message": "Put containers to work for you." + }, + "onboarding-2-description": { + "message": "Features like color-coding and separate container tabs help you find things easily, focus your attention, and minimize distractions." + }, + "onboarding-2-sec-description": { + "message": "Color-coding helps you categorize your online life, find things easily, and minimize distractions." + }, + "onboarding-3-header": { + "message": "A place for everything, and everything in its place." + }, + "onboarding-3-description": { + "message": "Start with the containers we've created, or create your own." + }, + "onboarding-3-sec-header": { + "message": "Set boundaries for your browsing." + }, + "onboarding-3-sec-description": { + "message": "Cookies are stored within a container, so you can segment sensitive data and browsing history to stay organized and to limit the impact of online trackers." + }, + "onboarding-4-header": { + "message": "Always open sites in the containers you want." + }, + "onboarding-4-description": { + "message": "Right-click inside a container tab to assign the site to always open in the container." + }, + "onboarding-5-header": { + "message": "Container tabs when you need them." + }, + "onboarding-5-description": { + "message": "Long-press the New Tab button to create a new container tab." + }, + "onboarding-6-header": { + "message": "Syncing Containers is now Available!" + }, + "onboarding-6-description": { + "message": "Turn on Sync to share container and site assignments with any computer connected to your Firefox Account." + }, + "onboarding-7-header": { + "message": "Firefox Account is required to sync." + }, + "onboarding-7-description": { + "message": "Click Sign In to confirm that your Firefox Account is active." + }, + "oneHundredTabsHeader": { + "message": "100 tabs!" + }, + "youHaveOpened": { + "message": "You've opened 100 Container tabs." + }, + "spreadTheWord": { + "message": "If you enjoy Containers, help us spread the word!" + }, + "rate": { + "message": "Rate" + }, + "share": { + "message": "Share" + }, + "tweet": { + "message": "Tweet" + }, + "default": { + "message": "Default" + }, + "manageContainers": { + "message": "Manage Containers" + }, + "hideThisContainer": { + "message": "Hide This Container" + }, + "removeThisContainer": { + "message": "Remove This Container" + }, + "removeThisContainerConfirmation": { + "message": "Are you sure you want to remove this Container?" + }, + "cancel": { + "message": "Cancel" + }, + "ok": { + "message": "OK" + }, + "sitesAssignedToThisContainer": { + "message": "Sites assigned to this container" + }, + "options": { + "message": "Options" + }, + "name": { + "message": "Name" + }, + "color": { + "message": "Color" + }, + "icon": { + "message": "Icon" + }, + "limitToDesignatedSites": { + "message": "Limit to Designated Sites" + }, + "deleteThisContainer": { + "message": "Delete This Container" + }, + "manageSiteList": { + "message": "Manage Site List…" + }, + "manageThisContainer": { + "message": "Manage This Container" + }, + "containers": { + "message": "Containers" + }, + "done": { + "message": "Done" + }, + "getStarted": { + "message": "Get Started" + }, + "signIn": { + "message": "Sign In" + }, + "notNow": { + "message": "Not Now" + }, + "startSyncing": { + "message": "Start Syncing" + }, + "info": { + "message": "info" + }, + "next": { + "message": "Next" + }, + "openThisSiteConfirmation": { + "message": "Open this site in your assigned container?" + }, + "wouldYouStillLikeToOpenConfirmation": { + "message": "Would you still like to open in this current container?" + }, + "rememberMyDecision": { + "message": " Remember my decision for this site" + }, + "optionalPermissions": { + "message": "Optional Permissions:" + }, + "keyboardShortCuts": { + "message": "Keyboard Shortcuts:" + }, + "onboarding": { + "message": "Onboarding" + }, + "resetOnboardingPanels": { + "message": "Reset Onboarding Panels" + }, + "onboardingToggle": { + "message": "Toggle this to see the onboarding panels again." + }, + "tabBehavior": { + "message": "Tab behavior:" + }, + "firefoxAccountsSync": { + "message": "Firefox Accounts Sync:" + }, + "enableBookMarkMenus": { + "message": "Enable Bookmark Menus" + }, + "enableSync": { + "message": "Enable Sync" + }, + "enableBookMarkMenusDescription": { + "message": "This setting allows you to open a bookmark or folder of bookmarks in a container." + }, + "enableSyncDescription": { + "message": "This setting allows you to sync your containers and site assignments across devices." + }, + "replaceTab": { + "message": "This setting allows you to sync your containers and site assignments across devices." + }, + "replaceTabDescription": { + "message": "Replace the current tab if a page which is assigned to another container is opened (instead of keeping the current tab open). Opening tabs with middle mouse button is not affected." + }, + "editWhichContainer": { + "message": "Edit which container is opened when using the numbered shortcuts." + }, + "keyboardShortCut": { + "message": "Container to open with Keyboard Shortcut $keyId$", + "placeholders": { + "keyId": { + "content": "$1" + } + } + }, + "confirmNavigationTitle": { + "message": "Multi-Account Containers Confirm Navigation", + "description": "This is the title of a confirmation page. Please do not translate \"Multi-Account Containers\"." + }, + "openInContainer": { + "message": "Open in $containerName$ Container", + "placeholders": { + "containerName": { + "content": "$1" + } + } + }, + "youAskedFirefox": { + "message": "You asked Firefox to always open $containerName$ for this site:", + "placeholders": { + "containerName": { + "content": "$1" + } + } + } +} diff --git a/src/confirm-page.html b/src/confirm-page.html index 9ebe6be..a3d7704 100644 --- a/src/confirm-page.html +++ b/src/confirm-page.html @@ -1,31 +1,30 @@ - Multi-Account Containers Confirm Navigation + +
-

Open this site in your assigned container?

+

-

- You asked Firefox to always open for this site:
-

+

-

Would you still like to open in this current container?

+




- - + +
diff --git a/src/js/confirm-page.js b/src/js/confirm-page.js index 5ca5323..77f9e28 100644 --- a/src/js/confirm-page.js +++ b/src/js/confirm-page.js @@ -7,21 +7,21 @@ async function load() { redirectUrlElement.textContent = redirectUrl; appendFavicon(redirectUrl, redirectUrlElement); - const container = await browser.contextualIdentities.get(cookieStoreId); - [...document.querySelectorAll(".container-name")].forEach((containerNameElement) => { - containerNameElement.textContent = container.name; - }); - - // If default container, button will default to normal HTML content - if (currentCookieStoreId) { - const currentContainer = await browser.contextualIdentities.get(currentCookieStoreId); - document.getElementById("current-container-name").textContent = currentContainer.name; - } document.getElementById("deny").addEventListener("click", (e) => { e.preventDefault(); denySubmit(redirectUrl); }); + const container = await browser.contextualIdentities.get(cookieStoreId); + const currentContainer = currentCookieStoreId ? await browser.contextualIdentities.get(currentCookieStoreId) : null; + const currentContainerName = currentContainer ? currentContainer.name : "" + + document.querySelectorAll("[data-message-id]").forEach(el => { + const elementData = el.dataset; + const containerName = elementData.messageArg === "container-name" ? container.name : currentContainerName; + el.textContent = browser.i18n.getMessage(elementData.messageId, containerName); + }); + document.getElementById("confirm").addEventListener("click", (e) => { e.preventDefault(); confirmSubmit(redirectUrl, cookieStoreId); diff --git a/src/js/i18n.js b/src/js/i18n.js new file mode 100644 index 0000000..3c07064 --- /dev/null +++ b/src/js/i18n.js @@ -0,0 +1,9 @@ +document.addEventListener("DOMContentLoaded", async () => { + document.querySelectorAll("[data-i18n-message-id]").forEach(el => { + const messageArgs = el.dataset.i18nPlaceholder ? el.dataset.i18nPlaceholder : null; + el.textContent = browser.i18n.getMessage(el.dataset.i18nMessageId, [messageArgs]); + }); + document.querySelectorAll("[data-i18n-attribute]").forEach(el => { + el.setAttribute(el.dataset.i18nAttribute, browser.i18n.getMessage(el.dataset.i18nAttributeMessageId)); + }); +}); diff --git a/src/manifest.json b/src/manifest.json index 29381e7..80d812d 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -140,6 +140,7 @@ "run_at": "document_start" } ], + "default_locale": "en", "web_accessible_resources": [ "/img/container-site-d-24.png" ], diff --git a/src/options.html b/src/options.html index 7fe1b24..3f9b66c 100644 --- a/src/options.html +++ b/src/options.html @@ -3,85 +3,86 @@ +
-

Optional Permissions:

-