Pass in the PDFJS.locale option to ExternalServices.createL10n

This allows us to remove an otherwise unnecessary `PDFJS` dependency from the `web/genericcom.js` file.
This commit is contained in:
Jonas Jenwald 2018-02-13 14:22:14 +01:00
parent 77efed6626
commit 74ffd1d865
4 changed files with 7 additions and 6 deletions

View File

@ -353,7 +353,9 @@ let PDFViewerApplication = {
* @private
*/
_initializeL10n() {
this.l10n = this.externalServices.createL10n();
this.l10n = this.externalServices.createL10n({
locale: PDFJS.locale,
});
return this.l10n.getDirection().then((dir) => {
document.getElementsByTagName('html')[0].dir = dir;
});

View File

@ -342,7 +342,7 @@ ChromeExternalServices.createDownloadManager = function() {
ChromeExternalServices.createPreferences = function() {
return new ChromePreferences();
};
ChromeExternalServices.createL10n = function() {
ChromeExternalServices.createL10n = function(options) {
return new GenericL10n(navigator.language);
};
PDFViewerApplication.externalServices = ChromeExternalServices;

View File

@ -264,7 +264,7 @@ PDFViewerApplication.externalServices = {
return new FirefoxPreferences();
},
createL10n() {
createL10n(options) {
let mozL10n = document.mozL10n;
// TODO refactor mozL10n.setExternalLocalizerServices
return new MozL10n(mozL10n);

View File

@ -17,7 +17,6 @@ import { DefaultExternalServices, PDFViewerApplication } from './app';
import { BasePreferences } from './preferences';
import { DownloadManager } from './download_manager';
import { GenericL10n } from './genericl10n';
import { PDFJS } from 'pdfjs-lib';
if (typeof PDFJSDev !== 'undefined' && !PDFJSDev.test('GENERIC')) {
throw new Error('Module "pdfjs-web/genericcom" shall not be used outside ' +
@ -49,8 +48,8 @@ GenericExternalServices.createDownloadManager = function() {
GenericExternalServices.createPreferences = function() {
return new GenericPreferences();
};
GenericExternalServices.createL10n = function () {
return new GenericL10n(PDFJS.locale);
GenericExternalServices.createL10n = function(options) {
return new GenericL10n(options.locale);
};
PDFViewerApplication.externalServices = GenericExternalServices;