Merge pull request #3048 from dmose/negotiateLocales

Fix(l10n): closes #3003, makes locale fallback work
mozilla · Jul 31, 2017 · c51a689 · c51a689
2 parents 2445903 + 0ef253c
commit c51a689
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/system-addon/lib/LocalizationFeed.jsm b/system-addon/lib/LocalizationFeed.jsm
@@ -30,7 +30,14 @@ this.LocalizationFeed = class LocalizationFeed {
   }
 
   updateLocale() {
-    let locale = Services.locale.getRequestedLocale() || DEFAULT_LOCALE;
+    // Just take the first element in the result array, as it should be
+    // the best locale
+    let locale = Services.locale.negotiateLanguages(
+      Services.locale.getAppLocalesAsLangTags(), // desired locales
+      Object.keys(this.allStrings), // available locales
+      DEFAULT_LOCALE // fallback
+    )[0];
+
     let strings = this.allStrings[locale];
 
     // Use the default strings for any that are missing

diff --git a/system-addon/test/unit/lib/LocalizationFeed.test.js b/system-addon/test/unit/lib/LocalizationFeed.test.js
@@ -25,8 +25,6 @@ describe("Localization Feed", () => {
     sandbox = globals.sandbox;
     feed = new LocalizationFeed();
     feed.store = {dispatch: sinon.spy()};
-
-    sandbox.stub(global.Services.locale, "getRequestedLocale");
   });
   afterEach(() => {
     globals.restore();
@@ -50,6 +48,8 @@ describe("Localization Feed", () => {
 
     it("should dispatch with locale and strings for default", () => {
       const locale = DEFAULT_LOCALE;
+      sandbox.stub(global.Services.locale, "negotiateLanguages")
+        .returns([locale]);
       feed.updateLocale();
 
       assert.calledOnce(feed.store.dispatch);
@@ -60,7 +60,8 @@ describe("Localization Feed", () => {
     });
     it("should use strings for other locale", () => {
       const locale = "it";
-      global.Services.locale.getRequestedLocale.returns(locale);
+      sandbox.stub(global.Services.locale, "negotiateLanguages")
+        .returns([locale]);
 
       feed.updateLocale();
 
@@ -72,7 +73,8 @@ describe("Localization Feed", () => {
     });
     it("should use some fallback strings for partial locale", () => {
       const locale = "ru";
-      global.Services.locale.getRequestedLocale.returns(locale);
+      sandbox.stub(global.Services.locale, "negotiateLanguages")
+        .returns([locale]);
 
       feed.updateLocale();
 
@@ -87,8 +89,8 @@ describe("Localization Feed", () => {
     });
     it("should use all default strings for unknown locale", () => {
       const locale = "xyz";
-      global.Services.locale.getRequestedLocale.returns(locale);
-
+      sandbox.stub(global.Services.locale, "negotiateLanguages")
+        .returns([locale]);
       feed.updateLocale();
 
       assert.calledOnce(feed.store.dispatch);

diff --git a/system-addon/test/unit/unit-entry.js b/system-addon/test/unit/unit-entry.js
@@ -28,7 +28,11 @@ overrider.set({
   fetch() {},
   Preferences: FakePrefs,
   Services: {
-    locale: {getRequestedLocale() {}},
+    locale: {
+      getAppLocalesAsLangTags() {},
+      getRequestedLocale() {},
+      negotiateLanguages() {}
+    },
     urlFormatter: {formatURL: str => str},
     mm: {
       addMessageListener: (msg, cb) => cb(),