Merge pull request #18486 from Snuffleupagus/AppOptions-replace-locale

Replace the GENERIC-only "locale" with "localeProperties" in AppOptions
mozilla · Jul 23, 2024 · cb73751 · cb73751
2 parents 1c65ad3 + 7ebfad6
commit cb73751
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/web/app.js b/web/app.js
@@ -336,7 +336,7 @@ const PDFViewerApplication = {
       (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
       params.has("locale")
     ) {
-      AppOptions.set("locale", params.get("locale"));
+      AppOptions.set("localeProperties", { lang: params.get("locale") });
     }
 
     // Set some specific preferences for tests.

diff --git a/web/app_options.js b/web/app_options.js
@@ -90,7 +90,10 @@ const defaultOptions = {
   },
   localeProperties: {
     /** @type {Object} */
-    value: null,
+    value:
+      typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")
+        ? { lang: navigator.language || "en-US" }
+        : null,
     kind: OptionKind.BROWSER,
   },
   nimbusDataStr: {
@@ -473,11 +476,6 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
     value: typeof PDFJSDev !== "undefined" && PDFJSDev.test("TESTING"),
     kind: OptionKind.VIEWER,
   };
-  defaultOptions.locale = {
-    /** @type {string} */
-    value: navigator.language || "en-US",
-    kind: OptionKind.VIEWER,
-  };
 } else if (PDFJSDev.test("CHROME")) {
   defaultOptions.disableTelemetry = {
     /** @type {boolean} */

diff --git a/web/genericcom.js b/web/genericcom.js
@@ -39,7 +39,7 @@ class Preferences extends BasePreferences {
 
 class ExternalServices extends BaseExternalServices {
   async createL10n() {
-    return new GenericL10n(AppOptions.get("locale"));
+    return new GenericL10n(AppOptions.get("localeProperties")?.lang);
   }
 
   createScripting() {