From 80d01c9d02ae471516402d8fe22bee28ab47955f Mon Sep 17 00:00:00 2001 From: Martynas Bagdonas Date: Thu, 26 Jun 2025 17:46:52 +0300 Subject: [PATCH] Add note-editor strings to FTL files --- chrome/content/zotero/xpcom/editorInstance.js | 15 +++-- chrome/locale/en-US/zotero/note-editor.ftl | 63 +++++++++++++++++++ chrome/locale/en-US/zotero/zotero.ftl | 8 +++ 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js index 9b3f53a184..b7ba81e4b9 100644 --- a/chrome/content/zotero/xpcom/editorInstance.js +++ b/chrome/content/zotero/xpcom/editorInstance.js @@ -148,7 +148,7 @@ class EditorInstance { } let ext = Zotero.MIME.getPrimaryExtension(mime, ''); let fp = new FilePicker(); - fp.init(this._iframeWindow, Zotero.getString('noteEditor.saveImageAs'), fp.modeSave); + fp.init(this._iframeWindow, Zotero.getString('note-editor-save-image-as'), fp.modeSave); fp.appendFilters(fp.filterImages); fp.defaultString = Zotero.getString('file-type-image').toLowerCase() + '.' + ext; let rv = await fp.show(); @@ -190,12 +190,11 @@ class EditorInstance { font: this._getFont(), style, smartQuotes: Zotero.Prefs.get('note.smartQuotes'), - localizedStrings: { - // Figure out a better way to pass this - 'zotero.appName': Zotero.appName, - ...Zotero.Intl.getPrefixedStrings('general.'), - ...Zotero.Intl.getPrefixedStrings('noteEditor.') - } + ftl: [ + '-app-name = ' + Zotero.appName, + Zotero.File.getContentsFromURL(`chrome://zotero/locale/zotero.ftl`), + Zotero.File.getContentsFromURL(`chrome://zotero/locale/note-editor.ftl`), + ] }); if (!this._item.isAttachment()) { @@ -1352,7 +1351,7 @@ class EditorInstance { } let vars = { - title: Zotero.getString('pdfReader.annotations'), + title: Zotero.getString('reader-annotations'), date: new Date().toLocaleString() }; let html = Zotero.Utilities.Internal.generateHTMLFromTemplate(Zotero.Prefs.get('annotations.noteTemplates.title'), vars); diff --git a/chrome/locale/en-US/zotero/note-editor.ftl b/chrome/locale/en-US/zotero/note-editor.ftl index 62d77ffae7..229adbf094 100644 --- a/chrome/locale/en-US/zotero/note-editor.ftl +++ b/chrome/locale/en-US/zotero/note-editor.ftl @@ -1,2 +1,65 @@ +note-editor-set = Set +note-editor-more = More +note-editor-replace = Replace +note-editor-replace-all = Replace All +note-editor-unlink = Unlink +note-editor-right-to-left = Right to Left +note-editor-left-to-right = Left to Right +note-editor-update-notice = + This note was edited with a newer version of { -app-name }. + Please update { -app-name } to make changes. +note-editor-enter-link = Enter Link +note-editor-heading-1 = Heading 1 +note-editor-heading-2 = Heading 2 +note-editor-heading-3 = Heading 3 +note-editor-paragraph = Paragraph +note-editor-monospaced = Monospaced +note-editor-bullet-list = Bulleted List +note-editor-ordered-list = Numbered List +note-editor-block-quote = Block Quote +note-editor-math-block = Math Block +note-editor-format-text = Format Text +note-editor-highlight-text = Highlight Text +note-editor-text-color = Text Color +note-editor-remove-color = Remove Color +note-editor-bold = Bold +note-editor-italic = Italic +note-editor-underline = Underline +note-editor-strikethrough = Strikethrough +note-editor-subscript = Subscript +note-editor-superscript = Superscript +note-editor-return-to-notes-list = Return to Notes List +note-editor-insert-link = Insert Link +note-editor-clear-formatting = Clear Formatting +note-editor-align = Align +note-editor-align-left = Align Left +note-editor-align-center = Align Center +note-editor-align-right = Align Right +note-editor-insert-citation = Insert Citation +note-editor-go-to-page = Go to Page +note-editor-show-item = Show Item +note-editor-edit-citation = Edit Citation +note-editor-show-on-page = Show on Page +note-editor-add-citation = Add Citation +note-editor-remove-citation = Hide Citation +note-editor-find-and-replace = Find and Replace +note-editor-edit-in-window = Edit in a Separate Window +note-editor-apply-annotation-colors = Show Annotation Colors +note-editor-remove-annotation-colors = Hide Annotation Colors +note-editor-add-citations = Show Annotation Citations +note-editor-remove-citations = Hide Annotation Citations +note-editor-image = Image +note-editor-math = Math +note-editor-table = Table +note-editor-citation = Citation +note-editor-copy-image = Copy Image +note-editor-save-image-as = Save Image As… +note-editor-insert-row-before = Insert Row Above +note-editor-insert-row-after = Insert Row Below +note-editor-insert-column-before = Insert Column Left +note-editor-insert-column-after = Insert Column Right +note-editor-delete-row = Delete Row +note-editor-delete-column = Delete Column +note-editor-delete-table = Delete Table note-editor-link-popup-appeared = Link popup appeared. Use Shift-Tab to navigate it. note-editor-citation-popup-appeared = Citation popup appeared. Use Shift-Tab to navigate it. diff --git a/chrome/locale/en-US/zotero/zotero.ftl b/chrome/locale/en-US/zotero/zotero.ftl index 678c3fa475..7512b988ef 100644 --- a/chrome/locale/en-US/zotero/zotero.ftl +++ b/chrome/locale/en-US/zotero/zotero.ftl @@ -46,8 +46,16 @@ general-clear = Clear general-update = Update general-back = Back general-edit = Edit +general-cut = Cut general-copy = Copy +general-paste = Paste +general-find = Find general-delete = Delete +general-insert = Insert +general-and = and +general-et-al = et al. +general-previous = Previous +general-next = Next general-red = Red general-orange = Orange