Merge branch '4.0'
This commit is contained in:
commit
505e4a5674
|
@ -364,8 +364,8 @@ Zotero.Cite.getAbbreviation = new function() {
|
|||
*/
|
||||
function normalizeKey(key) {
|
||||
// Strip periods, normalize spacing, and convert to lowercase
|
||||
return key.toString().toLowerCase().
|
||||
replace(/(?:\b|^)(?:and|et|y|und|l[ae]|the|[ld]')(?:\b|$)|[\x21-\x2C.\/\x3A-\x40\x5B-\x60\\\x7B-\x7E]/g, "").
|
||||
return key.toString().
|
||||
replace(/(?:\b|^)(?:and|et|y|und|l[ae]|the|[ld]')(?:\b|$)|[\x21-\x2C.\/\x3A-\x40\x5B-\x60\\\x7B-\x7E]/ig, "").
|
||||
replace(/\s+/g, " ").trim();
|
||||
}
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@
|
|||
<!ENTITY selectAllCmd.label "Select All">
|
||||
<!ENTITY selectAllCmd.key "A">
|
||||
<!ENTITY selectAllCmd.accesskey "A">
|
||||
<!ENTITY preferencesCmd.label "Options…">
|
||||
<!ENTITY preferencesCmd.label "Preferences">
|
||||
<!ENTITY preferencesCmd.accesskey "O">
|
||||
<!ENTITY preferencesCmdUnix.label "Preferences">
|
||||
<!ENTITY preferencesCmdUnix.accesskey "n">
|
||||
|
|
Loading…
Reference in New Issue
Block a user