ZenBrowserMirrors/pdf.js
1
0
Fork 0
mirror of https://github.com/zen-browser/pdf.js.git synced 2025-07-09 17:55:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Replace the GENERIC-only "locale" with "localeProperties" in AppOptions
This commit is contained in:
Tim van der Meij 2024-07-23 15:50:29 +02:00 • committed by GitHub
commit cb737512de
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/app.js
View file

@ -336,7 +336,7 @@ const PDFViewerApplication = {
(typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) && (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) &&
params.has("locale") params.has("locale")
) { ) {
AppOptions.set("locale", params.get("locale")); AppOptions.set("localeProperties", { lang: params.get("locale") });
} }
// Set some specific preferences for tests. // Set some specific preferences for tests.

10
web/app_options.js
View file

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

2
web/genericcom.js
View file

@ -39,7 +39,7 @@ class Preferences extends BasePreferences {
class ExternalServices extends BaseExternalServices { class ExternalServices extends BaseExternalServices {
async createL10n() { async createL10n() {
return new GenericL10n(AppOptions.get("locale")); return new GenericL10n(AppOptions.get("localeProperties")?.lang);
} }
createScripting() { createScripting() {