From ded077dc8e645e552259681f34fe7c089e8f1b6f Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Thu, 27 May 2021 13:37:26 +0300 Subject: [PATCH] Use Zotero.appName for localization in note-editor Fixes #2073 --- chrome/content/zotero/xpcom/editorInstance.js | 2 ++ chrome/locale/en-US/zotero/zotero.properties | 2 +- note-editor | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js index 6468e7fba9..6cba64c4b9 100644 --- a/chrome/content/zotero/xpcom/editorInstance.js +++ b/chrome/content/zotero/xpcom/editorInstance.js @@ -106,6 +106,8 @@ class EditorInstance { hasBackup: note && !Zotero.Notes.hasSchemaVersion(note) || !!await Zotero.NoteBackups.getNote(this._item.id), localizedStrings: { + // Figure out a better way to pass this + 'zotero.appName': Zotero.appName, ...Zotero.Intl.getPrefixedStrings('general.'), ...Zotero.Intl.getPrefixedStrings('noteEditor.') } diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 4365649e04..8cebfc2d2b 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -1268,7 +1268,7 @@ noteEditor.paste = Paste noteEditor.rightToLeft = Right to Left noteEditor.leftToRight = Left to Right noteEditor.viewNoteBackup = View Note Backup -noteEditor.updateNotice = This note was edited with a newer version of Zotero.\nPlease update Zotero to make changes. +noteEditor.updateNotice = This note was edited with a newer version of %1$S.\nPlease update %1$S to make changes. noteEditor.enterLink = Enter Link noteEditor.heading1 = Heading 1 noteEditor.heading2 = Heading 2 diff --git a/note-editor b/note-editor index 6aa6dd3388..6f4e81b117 160000 --- a/note-editor +++ b/note-editor @@ -1 +1 @@ -Subproject commit 6aa6dd3388b0b9c38778fcbe09245cdbab5d4d40 +Subproject commit 6f4e81b11788a1059ce6c2cb5f70c30d5578d4de