From 9e7ab68fb44c576d7cd5a9447867a5cbaac6a9a7 Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Tue, 6 Jul 2021 16:57:47 +0300 Subject: [PATCH] Localize color names in pdf-reader --- chrome/content/zotero/xpcom/reader.js | 9 ++++++--- note-editor | 2 +- pdf-reader | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/chrome/content/zotero/xpcom/reader.js b/chrome/content/zotero/xpcom/reader.js index 11b10f329f..8e6da161db 100644 --- a/chrome/content/zotero/xpcom/reader.js +++ b/chrome/content/zotero/xpcom/reader.js @@ -77,7 +77,10 @@ class ReaderInstance { sidebarWidth: this._sidebarWidth, sidebarOpen: this._sidebarOpen, bottomPlaceholderHeight: this._bottomPlaceholderHeight, - localizedStrings: Zotero.Intl.getPrefixedStrings('pdfReader') + localizedStrings: { + ...Zotero.Intl.getPrefixedStrings('general.'), + ...Zotero.Intl.getPrefixedStrings('pdfReader.') + } }, [buf]); // Set title once again, because `ReaderWindow` isn't loaded the first time this.updateTitle(); @@ -389,7 +392,7 @@ class ReaderInstance { // Colors for (let color of colors) { menuitem = this._window.document.createElement('menuitem'); - menuitem.setAttribute('label', color[0]); + menuitem.setAttribute('label', Zotero.getString(color[0])); menuitem.className = 'menuitem-iconic'; menuitem.setAttribute('disabled', readOnly); menuitem.setAttribute('image', this._getColorIcon(color[1], color[1] === selectedColor)); @@ -431,7 +434,7 @@ class ReaderInstance { let menuitem; for (let color of colors) { menuitem = this._window.document.createElement('menuitem'); - menuitem.setAttribute('label', color[0]); + menuitem.setAttribute('label', Zotero.getString(color[0])); menuitem.className = 'menuitem-iconic'; menuitem.setAttribute('image', this._getColorIcon(color[1], color[1] === selectedColor)); menuitem.addEventListener('command', () => { diff --git a/note-editor b/note-editor index a348bbdebf..02f98e9512 160000 --- a/note-editor +++ b/note-editor @@ -1 +1 @@ -Subproject commit a348bbdebf2771222f628c8d14546e3b410c5a58 +Subproject commit 02f98e95126a2c212aff9c3dcbd82c6c3af768e4 diff --git a/pdf-reader b/pdf-reader index 326c2e0829..1a678ffb5c 160000 --- a/pdf-reader +++ b/pdf-reader @@ -1 +1 @@ -Subproject commit 326c2e0829522662fc35528dbde6454949142bb4 +Subproject commit 1a678ffb5cbfd949a015d1fd25a825643a0bf632