From 355c61e6d88adf44d03557787ae04d088657ce5c Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Wed, 25 Jun 2025 16:38:34 +0300 Subject: [PATCH] Update reader submodule and support overriding FTL with current locale --- chrome/content/zotero/xpcom/reader.js | 10 ++++------ reader | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js index a113cb4214..1a47340520 100644 --- a/chrome/content/zotero/xpcom/reader.js +++ b/chrome/content/zotero/xpcom/reader.js @@ -35,11 +35,6 @@ const ZipReader = Components.Constructor( Components.utils.import("resource://gre/modules/InlineSpellChecker.jsm"); -let ftl = [ - Zotero.File.getContentsFromURL(`chrome://zotero/locale/zotero.ftl`), - Zotero.File.getContentsFromURL(`chrome://zotero/locale/reader.ftl`), -]; - // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Errors/Invalid_array_length const ARRAYBUFFER_MAX_LENGTH = Services.appinfo.is64Bit ? Math.pow(2, 33) @@ -211,7 +206,10 @@ class ReaderInstance { contextPaneOpen: this._contextPaneOpen, rtl: Zotero.rtl, fontSize: Zotero.Prefs.get('fontSize'), - ftl, + ftl: [ + Zotero.File.getContentsFromURL('chrome://zotero/locale/zotero.ftl'), + Zotero.File.getContentsFromURL('chrome://zotero/locale/reader.ftl'), + ], showAnnotations: true, textSelectionAnnotationMode: Zotero.Prefs.get('reader.textSelectionAnnotationMode'), customThemes: Zotero.SyncedSettings.get(Zotero.Libraries.userLibraryID, 'readerCustomThemes') ?? [], diff --git a/reader b/reader index b23aeeefc3..bec7d4396d 160000 --- a/reader +++ b/reader @@ -1 +1 @@ -Subproject commit b23aeeefc36f03df02457d79f7f7e241881089c0 +Subproject commit bec7d4396df3d7e9e508d209a1f058549d842d39