mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Localize formatted citations in notes

Browse source 
Fixes #2040
This commit is contained in:
Martynas Bagdonas 2021-05-25 13:07:24 +03:00
parent faec1f1dee
commit bb40928720
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
chrome/content/zotero/xpcom/editorInstance.js
View file

@ -105,7 +105,10 @@ class EditorInstance {
font: this._getFont(), font: this._getFont(),
hasBackup: note && !Zotero.Notes.hasSchemaVersion(note) hasBackup: note && !Zotero.Notes.hasSchemaVersion(note)
|| !!await Zotero.NoteBackups.getNote(this._item.id), || !!await Zotero.NoteBackups.getNote(this._item.id),
localizedStrings: Zotero.Intl.getPrefixedStrings('noteEditor') localizedStrings: {
...Zotero.Intl.getPrefixedStrings('general.'),
...Zotero.Intl.getPrefixedStrings('noteEditor.')
}
}); });
} }
@ -850,6 +853,7 @@ class EditorInstance {
/** /**
* Build citation item preview string (based on _buildBubbleString in quickFormat.js) * Build citation item preview string (based on _buildBubbleString in quickFormat.js)
* TODO: Try to avoid duplicating this code here and inside note-editor
*/ */
_formatCitationItemPreview(citationItem) { _formatCitationItemPreview(citationItem) {
const STARTSWITH_ROMANESQUE_REGEXP = /^[&a-zA-Z\u0e01-\u0e5b\u00c0-\u017f\u0370-\u03ff\u0400-\u052f\u0590-\u05d4\u05d6-\u05ff\u1f00-\u1fff\u0600-\u06ff\u200c\u200d\u200e\u0218\u0219\u021a\u021b\u202a-\u202e]/; const STARTSWITH_ROMANESQUE_REGEXP = /^[&a-zA-Z\u0e01-\u0e5b\u00c0-\u017f\u0370-\u03ff\u0400-\u052f\u0590-\u05d4\u05d6-\u05ff\u1f00-\u1fff\u0600-\u06ff\u200c\u200d\u200e\u0218\u0219\u021a\u021b\u202a-\u202e]/;
@ -867,10 +871,10 @@ class EditorInstance {
else if (authors.length === 2) { else if (authors.length === 2) {
let a = authors[0].family || authors[0].literal; let a = authors[0].family || authors[0].literal;
let b = authors[1].family || authors[1].literal; let b = authors[1].family || authors[1].literal;
str = a + ' and ' + b; str = a + ' ' + Zotero.getString('general.and') + ' ' + b;
} }
else if (authors.length >= 3) { else if (authors.length >= 3) {
str = (authors[0].family || authors[0].literal) + ' et al.'; str = (authors[0].family || authors[0].literal) + ' ' + Zotero.getString('general.etAl');
} }
} }

2
note-editor

@ -1 +1 @@
Subproject commit 2401d208e00f330c994bfe975b2c15e781a09e82 Subproject commit 6aa6dd3388b0b9c38778fcbe09245cdbab5d4d40

2
pdf-reader

@ -1 +1 @@
Subproject commit dc81445206934f78c98a6d27e09fcd631d559988 Subproject commit 3252bf82e265baeb37f7344a7f8b853490823333