Ticket #1278: 05-day-suffixes.patch

chrome/content/zotero/xpcom/csl.js

@@ -48 +48 @@
         Zotero.debug("CSL: style class is "+this.class);
         
         this.hasBibliography = (this._csl.bibliography.length() ? 1 : 0);
+        this.daySuffixes = Zotero.getString("date.daySuffixes").replace(/, ?/g, "|").split("|");
+        for each (i in [0,1,2,3]) {
+                if (suffix = this._getTerm("ordinal-0"+(i+1), false, false, false, true)) {
+                    this.daySuffixes[i] = suffix;
+                }
+            }
+
 }
 
 /*
@@ -491 +498 @@
 /*
  * gets a term, in singular or plural form
  */
-Zotero.CSL.prototype._getTerm = function(term, plural, form, includePeriod) {
+Zotero.CSL.prototype._getTerm = function(term, plural, form, includePeriod, quiet) {
         if(!form) {
                 form = "long";
         }
@@ -504 +511 @@
                 } else if(form != "long") {
                         return this._getTerm(term, plural, "long");
                 } else {
+                    if (!quiet) {
                         Zotero.debug("CSL: WARNING: could not find term \""+term+'"');
+                    }
                         return "";
                 }
         }
@@ -809 +818 @@
                                 for(var j=0; j<variables.length; j++) {
                                         if(ignore[0][variables[j]]) continue;
                                         
-                                        var text = item.getNumericVariable(variables[j], form);
+                                        var text = item.getNumericVariable(variables[j], citationItem, form, this.daySuffixes);
                                         if(text) {
                                                 newString.append(text);
                                                 success = true;
@@ -925 +934 @@
                         for(var j=0; j<variables.length; j++) {
                                 if(ignore[0][variables[j]]) continue;
                                 
-                                var date = item.getDate(variables[j]);
+                                var date = item.getDate(variables[j], citationItem);
                                 if(!date) continue;
                                 
                                 var variableString = formattedString.clone();
@@ -1057 +1066 @@
                                                                         }
                                                                         else if(Zotero.CSL._dateVariables[variables[j]]) {
                                                                                 // getDate not false/undefined
-                                                                                exists = !!item.getDate(variables[j]);
+                                                                                exists = !!item.getDate(variables[j], citationItem);
                                                                         } else if(Zotero.CSL._namesVariables[variables[j]]) {
                                                                                 // getNames not false/undefined, not empty
                                                                                 exists = item.getNames(variables[j]);
@@ -1067 +1076 @@
                                                                                 if (exists) exists = !!exists.length;
                                                                         }
                                                                 } else if (attribute == "is-numeric") {
-                                                                        exists = item.getNumericVariable(variables[j]);
+                                                                    exists = item.getNumericVariable(variables[j], citationItem);
                                                                 } else if (attribute == "is-date") { // XXX - this needs improving
                                                                         if (Zotero.CSL._dateVariables[variables[j]]) {
-                                                                                exists = !!item.getDate(variables[j]);
+                                                                            exists = !!item.getDate(variables[j], citationItem);
                                                                         }
                                                                 } else if(attribute == "is-plural") {
                                                                         if(Zotero.CSL._namesVariables[variables[j]]) {
@@ -1757 +1766 @@
 /*
  * Gets an Item.Date object for a specific type.
  */
-Zotero.CSL.Item.prototype.getDate = function(variable) {
+Zotero.CSL.Item.prototype.getDate = function(variable, citationItem) {
         // ignore accessed date
         if(this._ignoreURL && variable == "accessed") return false;
         
         // load date variable if possible
         this._refreshItem();
-        if(this._dates[variable] == undefined) {
-                this._createDate(variable);
+        if(this._dates[variable] == undefined || citationItem) {
+                this._createDate(variable, citationItem);
         }
         
         if(this._dates[variable]) return this._dates[variable];
@@ -1855 +1864 @@
 /*
  * convert a number into a ordinal number 1st, 2nd, 3rd etc.
  */
-Zotero.CSL.Item.prototype.makeOrdinal = function(value) {
+Zotero.CSL.Item.prototype.makeOrdinal = function(value, daySuffixes) {
         var ind = parseInt(value);
-        var daySuffixes = Zotero.getString("date.daySuffixes").replace(/, ?/g, "|").split("|");
         value += (parseInt(ind/10)%10) == 1 ? daySuffixes[3] : (ind % 10 == 1) ? daySuffixes[0] : (ind % 10 == 2) ? daySuffixes[1] : (ind % 10 == 3) ? daySuffixes[2] : daySuffixes[3];
         return value;
 }
@@ -1917 +1925 @@
  * Gets a numeric object for a specific type. <number variable="edition" form="roman"/>
  */
 // citationItem argument to function gets access to locator field
-Zotero.CSL.Item.prototype.getNumericVariable = function(variable, citationItem, form) {
+// daySuffixes argument provides array for building localized ordinals
+Zotero.CSL.Item.prototype.getNumericVariable = function(variable, citationItem, form, daySuffixes) {
 
         if(!Zotero.CSL.Item._zoteroNumberFieldMap[variable]) return "";
         
@@ -1944 +1953 @@
                 if(value != "" && (matches = value.match(Zotero.CSL._numberRegexp)) ) {
                         value = matches[0];
                         if (form == "ordinal") {
-                                return this.makeOrdinal(value);
+                            return this.makeOrdinal(value, daySuffixes);
                         }
                         else if (form == "roman") { 
                                 return this.makeRoman(value);
@@ -2080 +2089 @@
  * Generates an date object for a given variable (currently supported: issued
  * and accessed)
  */
-Zotero.CSL.Item.prototype._createDate = function(variable) {
+Zotero.CSL.Item.prototype._createDate = function(variable, citationItem) {
         // first, figure out what date variable to use.
         if(variable == "issued") {
+            if (citationItem && citationItem.issued) {
+                var date = citationItem.issued
+            } else {
                 var date = this.zoteroItem.getField("date", false, true);
-                var sort = this.zoteroItem.getField("date", true, true);
+            }
+            var sort = this.zoteroItem.getField("date", true, true);
         } else if(variable == "accessed") {
                 var date = this.zoteroItem.getField("accessDate", false, true);
                 var sort = this.zoteroItem.getField("accessDate", true, true);