From: Tim Wood <washwithcare@gmail.com>
Date: Thu, 13 Oct 2011 17:07:38 +0000 (-0700)
Subject: Changing _date.lang to require lang file if in node and lang not already loaded
X-Git-Tag: 1.0.1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3041a51dc2424f084ef33adcf3529561373ab9;p=thirdparty%2Fmoment.git

Changing _date.lang to require lang file if in node and lang not already loaded

Moving lang files to `./lang/` instead of `/underscore.date.lang/`
---

diff --git a/underscore.date.lang/fr.js b/lang/fr.js
similarity index 88%
rename from underscore.date.lang/fr.js
rename to lang/fr.js
index 2a5b7f276..00c591971 100644
--- a/underscore.date.lang/fr.js
+++ b/lang/fr.js
@@ -20,18 +20,16 @@
                 yy : "%d années"
             },
             ordinal : function(number) {
-                var b = num % 10;
                 return (~~ (number % 100 / 10) === 1) ? 'er' : 'ème';
             }
-        },
-        abbr = 'fr';
+        };
 
     // Node
     if (typeof module !== 'undefined') {
-        module.exports = {lang : lang, abbr : abbr};
+        module.exports = lang;
     }
     // Browser
     if (typeof window !== 'undefined' && this._date && this._date.lang) {
-        this._date.lang(abbr, lang);
+        this._date.lang('fr', lang);
     }
 }());
\ No newline at end of file
diff --git a/underscore.date.lang/it.js b/lang/it.js
similarity index 90%
rename from underscore.date.lang/it.js
rename to lang/it.js
index ad60e5fb8..8d040bbda 100644
--- a/underscore.date.lang/it.js
+++ b/lang/it.js
@@ -22,15 +22,14 @@
             ordinal: function () {
                 return 'º';
             }
-        },
-        abbr = 'it';
+        };
 
     // Node
     if (typeof module !== 'undefined') {
-        module.exports = {lang : lang, abbr : abbr};
+        module.exports = lang;
     }
     // Browser
     if (typeof window !== 'undefined' && this._date && this._date.lang) {
-        this._date.lang(abbr, lang);
+        this._date.lang('it', lang);
     }
 }());
\ No newline at end of file
diff --git a/underscore.date.lang/pt.js b/lang/pt.js
similarity index 90%
rename from underscore.date.lang/pt.js
rename to lang/pt.js
index e25e4d7bd..006180bd5 100644
--- a/underscore.date.lang/pt.js
+++ b/lang/pt.js
@@ -22,15 +22,14 @@
             ordinal : function (number) {
                 return 'º';
             }
-        },
-        abbr = 'pt';
+        };
 
     // Node
     if (typeof module !== 'undefined') {
-        module.exports = {lang : lang, abbr : abbr};
+        module.exports = lang;
     }
     // Browser
     if (typeof window !== 'undefined' && this._date && this._date.lang) {
-        this._date.lang(abbr, lang);
+        this._date.lang('pt', lang);
     }
 }());
\ No newline at end of file
diff --git a/underscore.date.lang/test.js b/lang/test.js
similarity index 89%
rename from underscore.date.lang/test.js
rename to lang/test.js
index 9f23f81d2..fc4210716 100644
--- a/underscore.date.lang/test.js
+++ b/lang/test.js
@@ -21,16 +21,15 @@
             },
             ordinal : function (number) {
                 return 'ordinal';
-            },
-        },
-        key = 'test';
+            }
+        };
 
     // Node
     if (typeof module !== 'undefined') {
-        module.exports = {data : data, key : key};
+        module.exports = data;
     }
     // Browser
     if (typeof window !== 'undefined' && this._date && this._date.lang) {
-        this._date.lang(key, data);
+        this._date.lang('test', data);
     }
 }());
\ No newline at end of file
diff --git a/test/date.js b/test/date.js
index 673c53c83..fb8c4ecc1 100755
--- a/test/date.js
+++ b/test/date.js
@@ -40,8 +40,6 @@ test("date", 1, function() {
     ok(_date(new Date())._d instanceof Date, "new Date()");
 });
 
-console.log(_date(1000).valueOf())
-
 test("_date", 2, function() {
     ok(_date(_date())._d instanceof Date, "_date(_date())");
     ok(_date(_date(_date()))._d instanceof Date, "_date(_date(_date()))");
@@ -307,7 +305,7 @@ test("format", 9, function() {
     _date.weekdaysShort = ["dom", "lun", "mar", "mié", "jue", "vie", "sáb"];
     _date.ordinal = function() {
         return 'o';
-    }
+    };
     
     for (i = 0; i < a.length; i++) {
         equal(b.format(a[i][0]), a[i][1], a[i][0] + ' ---> ' + a[i][1]);
@@ -495,16 +493,6 @@ test("format", 48, function() {
     _date.lang('en');
 });
 
-function nodeLangSetup() {
-    var testLang = require('../underscore.date.lang/test.js');
-    _date.lang(testLang.key, testLang.data);
-    _date.lang('en');
-}
-
-if (typeof window === 'undefined') {
-    nodeLangSetup();
-}
-
 test("loaded module", 16, function() {
     var date = _date(new Date(2010, 1, 14, 15, 25, 50, 125)),
         test = [
diff --git a/test/index.html b/test/index.html
index b21bc2f20..69e725756 100755
--- a/test/index.html
+++ b/test/index.html
@@ -7,7 +7,7 @@
         <script src="vendor/jquery.js"></script>
         <script src="vendor/underscore.js"></script>
         <script src="../underscore.date.js"></script>
-        <script src="../underscore.date.lang/test.js"></script>
+        <script src="../lang/test.js"></script>
         <script>
             // reset default to english
             _date.lang('en');
diff --git a/underscore.date.js b/underscore.date.js
index aeace760b..7a738a7a5 100644
--- a/underscore.date.js
+++ b/underscore.date.js
@@ -10,6 +10,7 @@
     var _date,
         round = Math.round,
         languages = {},
+        isNode = (typeof window === 'undefined' && typeof module !== 'undefined'),
         paramsToParse = 'months|monthsShort|weekdays|weekdaysShort|relativeTime|ordinal'.split('|'),
         i,
         shortcuts = 'Month|Date|Hours|Minutes|Seconds'.split('|');
@@ -310,7 +311,7 @@
 
     // language switching and caching
     _date.lang = function (key, values) {
-        var i, param;
+        var i, param, req;
         if (values) {
             languages[key] = values;
         }
@@ -319,6 +320,11 @@
                 param = paramsToParse[i];
                 _date[param] = languages[key][param] || _date[param];
             }
+        } else {
+            if (isNode) {
+                req = require('./lang/' + key);
+                _date.lang(key, req);
+            }
         }
     };
 
@@ -444,11 +450,10 @@
     };
 
     // CommonJS module is defined
-    if (typeof window === 'undefined' && typeof module !== 'undefined') {
-        // Export module
+    if (isNode) {
         module.exports = _date;
-    // Integrate with Underscore.js
     } else {
+        // Integrate with Underscore.js if it exists
         if (this._ !== undefined && this._.mixin !== undefined) {
             this._.mixin({date : _date});
         }