Bug 1135144 - additionallanguageschange event should trigger language…

… negotiation. r=gandalf
l20n · Mar 2, 2015 · 0617c43 · 0617c43
1 parent 1bcf284
commit 0617c43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/bindings/l20n/runtime.js b/bindings/l20n/runtime.js
@@ -189,6 +189,8 @@ function initResources() {
     // …and listen to langpacks being added and removed
     document.addEventListener('additionallanguageschange', function(evt) {
       registerLocales.call(this, meta, evt.detail);
+      this.ctx.requestLocales.apply(
+        this.ctx, navigator.languages || [navigator.language]);
     }.bind(this));
   } else {
     additionalLanguagesPromise = Promise.resolve();

diff --git a/lib/l20n/context.js b/lib/l20n/context.js
@@ -226,7 +226,11 @@ Context.prototype.requestLocales = function requestLocales() {
     this.availableLocales.concat(this.qps),
     requested,
     this.defaultLocale);
-  freeze.call(this, supported);
+
+  // freeze only if the first language in the fallback chain is new
+  if (this.supportedLocales[0] !== supported[0]) {
+    freeze.call(this, supported);
+  }
 };