Backing out merged pull requests in master

Backed out PRs: #1308 #1312 #1333

diff --git a/lang/it.js b/lang/it.js
index 84b7698be5b43b2648199c9ca093600a030028e8..5b8a99fb14109558028c5eddcad7f708131d07a5 100644 (file)
--- a/lang/it.js
+++ b/lang/it.js
@@ -38,7 +38,7 @@
                 return ((/^[0-9].+$/).test(s) ? "tra" : "in") + " " + s;
             },
             past : "%s fa",
-            s : "alcuni secondi",
+            s : "secondi",
             m : "un minuto",
             mm : "%d minuti",
             h : "un'ora",

diff --git a/package.json b/package.json
index 8ac497d09d64045b4a7516462196392198b9959f..f584bf3fe11298c436ae322da2f571268a3f4603 100644 (file)
--- a/package.json
+++ b/package.json
@@ -52,14 +52,5 @@
         "test": "grunt"
     },
     "ender": "./ender.js",
-    "dojoBuild": "package.js",
-    "jspm": {
-        "files": ["moment.js", "lang"],
-        "map": {
-            "moment": "./moment"
-        },
-        "buildConfig": {
-            "uglify": true
-        }
-    }
+    "dojoBuild": "package.js"
 }

diff --git a/test/lang/it.js b/test/lang/it.js
index 321a5805edd55c368f113796d9ee3cc5d90d9cab..8495b96eb24297ecf8e74a43a2c4f1eb3d94b547 100644 (file)
--- a/test/lang/it.js
+++ b/test/lang/it.js
@@ -136,7 +136,7 @@ exports["lang:it"] = {
         test.expect(30);
 
         var start = moment([2007, 1, 28]);
-        test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  "alcuni secondi",    "44 seconds = seconds");
+        test.equal(start.from(moment([2007, 1, 28]).add({s: 44}), true),  "secondi",    "44 seconds = seconds");
         test.equal(start.from(moment([2007, 1, 28]).add({s: 45}), true),  "un minuto",   "45 seconds = a minute");
         test.equal(start.from(moment([2007, 1, 28]).add({s: 89}), true),  "un minuto",   "89 seconds = a minute");
         test.equal(start.from(moment([2007, 1, 28]).add({s: 90}), true),  "2 minuti",  "90 seconds = 2 minutes");
@@ -172,15 +172,15 @@ exports["lang:it"] = {
     "suffix" : function (test) {
         test.expect(2);
 
-        test.equal(moment(30000).from(0), "in alcuni secondi", "prefix");
-        test.equal(moment(0).from(30000), "alcuni secondi fa", "suffix");
+        test.equal(moment(30000).from(0), "in secondi", "prefix");
+        test.equal(moment(0).from(30000), "secondi fa", "suffix");
         test.done();
     },
 
     "fromNow" : function (test) {
         test.expect(2);
 
-        test.equal(moment().add({s: 30}).fromNow(), "in alcuni secondi", "in seconds");
+        test.equal(moment().add({s: 30}).fromNow(), "in secondi", "in seconds");
         test.equal(moment().add({d: 5}).fromNow(), "tra 5 giorni", "in 5 days");
         test.done();
     },