www

commit 23e2d1911c9664e5371bae70030508ba36916ab9
parent 349c19fe4d8303d7d762b8d20f1aa4081463d52a
Author: Simon Kornblith <simon@simonster.com>
Date:   Sat, 21 Jul 2012 18:33:53 -0400

Merge branch '3.0'

Diffstat:
M
chrome/content/zotero/xpcom/date.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/date.js b/chrome/content/zotero/xpcom/date.js
@@ -267,7 +267,7 @@ Zotero.Date = new function(){
 			} else {
 				// local style date (middle or little endian)
 				date.year = m[6];
-				var country = Zotero.locale.substr(3);
+				var country = Zotero.locale ? Zotero.locale.substr(3) : "US";
 				if(country == "US" ||	// The United States
 				   country == "FM" ||	// The Federated States of Micronesia
 				   country == "PW" ||	// Palau
@@ -668,7 +668,7 @@ Zotero.Date = new function(){
 	 */
 	function getLocaleDateOrder(){
 		if (!_localeDateOrder) {
-			switch (Zotero.locale.substr(-2)) {
+			switch (Zotero.locale ? Zotero.locale.substr(3) : "US") {
 				// middle-endian
 				case 'US': // The United States
 				case 'BZ': // Belize