www

commit f3137099bc25ad1406817ebb0ee7772df607d868
parent 723e8a4e3063819ab268c43176b8b08a7fb14afa
Author: gracile-fr <gracile@gmx.com>
Date:   Thu, 15 Aug 2013 23:15:02 +0200

Localize et al. in the middle pane
(Heromyth's PR #358, #360, #361)

Diffstat:
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
 | 
1
+

3 files changed, 6 insertions(+), 4 deletions(-)
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