www

commit 1be8cf743efd0822fb11b297d1810d74da4c311d
parent 0c431e07ef3b4fb003dbbdcfc25f5561b0c278f0
Author: Dan Stillman <dstillman@gmail.com>
Date:   Sun, 18 Aug 2013 00:54:52 -0700

Merge pull request #375 from gracile-fr/4.0

4.0 - Localization
Diffstat:
M
chrome/content/zotero/preferences/preferences_export.js
 | 
2
+-
M
chrome/content/zotero/preferences/preferences_keys.js
 | 
2
+-
M
chrome/content/zotero/xpcom/data/item.js
 | 
2
+-
M
chrome/content/zotero/xpcom/data/items.js
 | 
7
++++---
M
chrome/locale/en-US/zotero/zotero.properties
 | 
3
+++

5 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/preferences/preferences_export.js b/chrome/content/zotero/preferences/preferences_export.js
@@ -225,7 +225,7 @@ Zotero_Preferences.Export = {
 	
 	
 	updateQuickCopyInstructions: function () {
-		var prefix = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Alt+';
+		var prefix = Zotero.isMac ? Zotero.getString('general.keys.cmdShift') : Zotero.getString('general.keys.ctrlShift');
 		
 		var key = Zotero.Prefs.get('keys.copySelectedItemsToClipboard');
 		var str = Zotero.getString('zotero.preferences.export.quickCopy.instructions', prefix + key);
diff --git a/chrome/content/zotero/preferences/preferences_keys.js b/chrome/content/zotero/preferences/preferences_keys.js
@@ -30,7 +30,7 @@ Zotero_Preferences.Keys = {
 		var rows = document.getElementById('zotero-prefpane-keys').getElementsByTagName('row');
 		for (var i=0; i<rows.length; i++) {
 			// Display the appropriate modifier keys for the platform
-			rows[i].firstChild.nextSibling.value = Zotero.isMac ? 'Cmd+Shift+' : 'Ctrl+Shift+';
+			rows[i].firstChild.nextSibling.value = Zotero.isMac ? Zotero.getString('general.keys.cmdShift') : Zotero.getString('general.keys.ctrlShift');
 		}
 	}
 };
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
@@ -204,7 +204,7 @@ Zotero.Item.prototype.getField = function(field, unformatted, includeBaseMapped)
 		} else if(creators.length === 2) {
 			return creators[0].ref.lastName+" "+Zotero.getString('general.and')+" "+creators[1].ref.lastName;
 		} else if(creators.length > 3) {
-			return creators[0].ref.lastName+" et al."
+			return creators[0].ref.lastName+" "+Zotero.getString('general.etAl');
 		}
 	} else if (field === 'id' || Zotero.Items.isPrimaryField(field)) {
 		var privField = '_' + field;
diff --git a/chrome/content/zotero/xpcom/data/items.js b/chrome/content/zotero/xpcom/data/items.js
@@ -628,6 +628,7 @@ Zotero.Items = new function() {
 		
 		/* This whole block is to get the firstCreator */
 		var localizedAnd = Zotero.getString('general.and');
+		var localizedEtAl = Zotero.getString('general.etAl'); 
 		var sql = "COALESCE(" +
 			// First try for primary creator types
 			"CASE (" +
@@ -665,7 +666,7 @@ Zotero.Items = new function() {
 				"LEFT JOIN itemTypeCreatorTypes ITCT " +
 				"ON (IC.creatorTypeID=ITCT.creatorTypeID AND ITCT.itemTypeID=I.itemTypeID) " +
 				"WHERE itemID=I.itemID AND primaryField=1 ORDER BY orderIndex LIMIT 1)" +
-				" || ' et al.' " +
+				" || ' " + localizedEtAl + "' " + 
 			") " +
 			"END, " +
 			
@@ -691,7 +692,7 @@ Zotero.Items = new function() {
 				"SELECT " +
 				"(SELECT lastName FROM itemCreators NATURAL JOIN creators NATURAL JOIN creatorData " +
 				"WHERE itemID=I.itemID AND creatorTypeID IN (3) ORDER BY orderIndex LIMIT 1)" +
-				" || ' et al.' " +
+				" || ' " + localizedEtAl + "' " +
 			") " +
 			"END, " +
 			
@@ -717,7 +718,7 @@ Zotero.Items = new function() {
 				"SELECT " +
 				"(SELECT lastName FROM itemCreators NATURAL JOIN creators NATURAL JOIN creatorData " +
 				"WHERE itemID=I.itemID AND creatorTypeID IN (2) ORDER BY orderIndex LIMIT 1)" +
-				" || ' et al.' " +
+				" || ' " + localizedEtAl + "' " + 
 			") " +
 			"END" +
 		") AS firstCreator";
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
@@ -30,6 +30,7 @@ general.no							= No
 general.passed						= Passed
 general.failed						= Failed
 general.and							= and
+general.etAl              			= et al.
 general.accessDenied				= Access Denied
 general.permissionDenied			= Permission Denied
 general.character.singular			= character
@@ -48,6 +49,8 @@ general.useDefault					= Use Default
 general.openDocumentation			= Open Documentation
 general.numMore                    = %S more…
 general.openPreferences				= Open Preferences
+general.keys.ctrlShift				= Ctrl+Shift+
+general.keys.cmdShift				= Cmd+Shift+
 
 general.operationInProgress = A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished = Please wait until it has finished.