diff --git a/js/test/daterange/testdatefmtrange_bg_BG.js b/js/test/daterange/testdatefmtrange_bg_BG.js
index cf2ff00ca9..0db6b9c9f7 100644
--- a/js/test/daterange/testdatefmtrange_bg_BG.js
+++ b/js/test/daterange/testdatefmtrange_bg_BG.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_bg_BG.js - test the date range formatter object in Bulgarian/Bulgaria
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.11 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31.12.11 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31.12.2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31.12.2011 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtBGRangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 ч. – 14:30 ч.');
+        test.equal(fmt.format(start, end), '31 декември 2011 г., 13:45 – 14:30');
         test.done();
     },
-    
+
     testDateRngFmtBGRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.11 г., 13:45 ч. – 31.12.11 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30.12.11 г., 13:45 – 31.12.11 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30.12.2011 г., 13:45 ч. – 31.12.2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30.12.2011 г., 13:45 – 31.12.2011 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 ч. – 31 декември 2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 – 31 декември 2011 г., 14:30');
         test.done();
     },
     testDateRngFmtBGRangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,15 +239,15 @@ module.exports.testdatefmtrange_bg_BG = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 ч. – 31 декември 2011 г., 14:30 ч.');
+        test.equal(fmt.format(start, end), '30 декември 2011 г., 13:45 – 31 декември 2011 г., 14:30');
         test.done();
     },
-    
+
     testDateRngFmtBGRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "20 – 31 декември 2011 г.");
         test.done();
     },
-    
+
     testDateRngFmtBGRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "20 ноември – 31 декември 2011 г.");
         test.done();
     },
-    
+
     testDateRngFmtBGRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "20 ноември 2011 г. – 31 януари 2012 г.");
         test.done();
     },
-    
+
     testDateRngFmtBGRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_bg_BG = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "bg-BG", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_bg_BG = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_es_CO.js b/js/test/daterange/testdatefmtrange_es_CO.js
index 3f2b2a6590..e08be17e6e 100644
--- a/js/test/daterange/testdatefmtrange_es_CO.js
+++ b/js/test/daterange/testdatefmtrange_es_CO.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_es_CO.js - test the date range formatter object in Spanish/Columbia
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31/12/11, 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeinDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31/12/2011, 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeinDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,16 +134,16 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
-    
+
     },
-    
+
     testDateRngFmtCORangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -162,14 +162,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11, 1:45 p. m. – 31/12/11, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30/12/11, 1:45 p. m. – 31/12/11, 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -188,14 +188,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/2011, 1:45 p. m. – 31/12/2011, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30/12/2011, 1:45 p. m. – 31/12/2011, 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -214,14 +214,14 @@ module.exports.testdatefmtrange_es_CO = {
             second: 0,
             millisecond: 0
         })
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
     testDateRngFmtCORangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,16 +239,16 @@ module.exports.testdatefmtrange_es_CO = {
             minute: 30,
             second: 0,
             millisecond: 0
-        });           
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        });
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
-    
+
     testDateRngFmtCORangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -274,7 +274,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -300,7 +300,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -321,13 +321,13 @@ module.exports.testdatefmtrange_es_CO = {
         });
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
-    
+
     },
     testDateRngFmtCORangeMultiDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -349,12 +349,12 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtCORangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -380,7 +380,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -406,7 +406,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -432,7 +432,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -454,12 +454,12 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "20 de noviembre – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtCORangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -485,7 +485,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -511,7 +511,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -537,7 +537,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -559,12 +559,12 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "20 de noviembre de 2011 – 31 de enero de 2012");
         test.done();
     },
-    
+
     testDateRngFmtCORangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -590,7 +590,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -616,7 +616,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -642,7 +642,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -668,7 +668,7 @@ module.exports.testdatefmtrange_es_CO = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-CO", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -690,5 +690,5 @@ module.exports.testdatefmtrange_es_CO = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_es_UY.js b/js/test/daterange/testdatefmtrange_es_UY.js
index 6eeaca2c84..c4d5f28652 100644
--- a/js/test/daterange/testdatefmtrange_es_UY.js
+++ b/js/test/daterange/testdatefmtrange_es_UY.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_es_UY.js - test the date range formatter object in French/France
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtUYRangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 13:45 – 14:30");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_es_UY = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 13:45 – 31 de diciembre de 2011, 14:30");
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 13:45 – 31 de diciembre de 2011 a las 14:30");
         test.done();
     },
     testDateRngFmtUYRangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -238,16 +238,16 @@ module.exports.testdatefmtrange_es_UY = {
             minute: 30,
             second: 0,
             millisecond: 0
-        });           
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 13:45 – 31 de diciembre de 2011, 14:30");
+        });
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 13:45 – 31 de diciembre de 2011 a las 14:30");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "20 de noviembre – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "20 de noviembre de 2011 – 31 de enero de 2012");
         test.done();
     },
-    
+
     testDateRngFmtUYRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_es_UY = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-UY", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_es_UY = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_es_VE.js b/js/test/daterange/testdatefmtrange_es_VE.js
index d6c75448e2..161c007670 100644
--- a/js/test/daterange/testdatefmtrange_es_VE.js
+++ b/js/test/daterange/testdatefmtrange_es_VE.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_es_VE.js - test the date range formatter object in French/France
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31/12/11 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeinDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 dic. 2011 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 dic. 2011 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeinDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de diciembre de 2011, 1:45 p. m. – 2:30 p. m.");
+        test.equal(fmt.format(start, end), "31 de diciembre de 2011 a las 1:45 p. m. – 2:30 p. m.");
         test.done();
     },
-    
+
     testDateRngFmtVERangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11 1:45 p. m. – 31/12/11 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30/12/11 1:45 p. m. – 31/12/11 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 dic. 2011 1:45 p. m. – 31 dic. 2011 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30 dic. 2011 1:45 p. m. – 31 dic. 2011 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_es_VE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
     testDateRngFmtVERangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -238,16 +238,16 @@ module.exports.testdatefmtrange_es_VE = {
             minute: 30,
             second: 0,
             millisecond: 0
-        });      
-        test.equal(fmt.format(start, end), "30 de diciembre de 2011, 1:45 p. m. – 31 de diciembre de 2011, 2:30 p. m.");
+        });
+        test.equal(fmt.format(start, end), "30 de diciembre de 2011 a las 1:45 p. m. – 31 de diciembre de 2011 a las 2:30 p. m.");
         test.done();
     },
-    
+
     testDateRngFmtVERangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "20 – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtVERangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "20 de noviembre – 31 de diciembre de 2011");
         test.done();
     },
-    
+
     testDateRngFmtVERangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "20 de noviembre de 2011 – 31 de enero de 2012");
         test.done();
     },
-    
+
     testDateRngFmtVERangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_es_VE = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "es-VE", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_es_VE = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_fmttemplate.js b/js/test/daterange/testdatefmtrange_fmttemplate.js
index ab831b9c7c..05cf803d08 100644
--- a/js/test/daterange/testdatefmtrange_fmttemplate.js
+++ b/js/test/daterange/testdatefmtrange_fmttemplate.js
@@ -1,7 +1,7 @@
  /*
  * testWeekdayTranslation.js
  *
- * Copyright © 2019, JEDLSoft
+ * Copyright © 2019-2020, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -3051,23 +3051,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3122,23 +3122,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} de {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} de {sy} {st} – {ed} {em} de {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3193,23 +3193,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd}-{sm}-{sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}-{sm}-{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
         test.equal(templatec01[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
         test.equal(templatec02[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
         test.equal(templatec03[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
 
@@ -3264,23 +3264,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd}/{sm}/{sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
@@ -3334,23 +3334,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3405,23 +3405,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3547,23 +3547,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd}/{sm}/{sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3618,23 +3618,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3690,23 +3690,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}'); // CLDR 34 change
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}'); // CLDR 34 change
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}'); // CLDR 34 change
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3735,6 +3735,7 @@ module.exports.testdaterangefmt = {
         test.equal(templatec30[2], "{sy} – {ey}");
         test.equal(templatec30[3], "{sy} – {ey}");
 
+
         test.done();
     },
     testDateRngFmt_es_NI: function(test) {
@@ -3761,23 +3762,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3833,23 +3834,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sm}/{sd}/{sy} {st} – {et}');
         test.equal(templatec00[3], '{sm}/{sd}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec01[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec02[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec03[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
@@ -3904,23 +3905,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -3977,23 +3978,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sm}/{sd}/{sy} {st} – {et}');
         test.equal(templatec00[3], '{sm}/{sd}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec01[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec02[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
         test.equal(templatec03[3], '{sm}/{sd}/{sy} {st} – {em}/{ed}/{ey} {et}');
 
@@ -4048,23 +4049,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4119,23 +4120,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4190,23 +4191,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4261,23 +4262,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -4332,23 +4333,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
@@ -8053,42 +8054,42 @@ module.exports.testdaterangefmt = {
         test.equal(templatec00[0], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[1], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
-        test.equal(templatec00[3], '{sd}-{sm}-{sy} {st} – {et}');
+        test.equal(templatec00[3], '{sy}-{sm}-{sd} {st} – {et}');
 
         test.equal(templatec01[0], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[1], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec01[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec01[3], '{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}');
 
         test.equal(templatec02[1], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[0], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec02[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec02[3], '{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}');
 
         test.equal(templatec03[0], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[1], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
-        test.equal(templatec03[3], '{sd}-{sm}-{sy} {st} – {ed}-{em}-{ey} {et}');
+        test.equal(templatec03[3], '{sy}-{sm}-{sd} {st} – {ey}-{em}-{ed} {et}');
 
         test.equal(templatec10[0], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[1], '{sd} – {ed} {em} {ey}');
         test.equal(templatec10[2], '{sd} – {ed} {em} {ey}');
-        test.equal(templatec10[3], '{sd} – {ed}-{em}-{ey}');
+        test.equal(templatec10[3], '{sy}-{sm}-{sd} – {ed}');
 
         test.equal(templatec11[0], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[1], '{sd} {sm} – {ed} {em} {ey}');
         test.equal(templatec11[2], '{sd} {sm} – {ed} {em} {ey}');
-        test.equal(templatec11[3], '{sd}-{sm} – {ed}-{em}-{ey}');
+        test.equal(templatec11[3], '{sy}-{sm}-{sd} – {ey}-{em}-{ed}');
 
         test.equal(templatec12[0], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[1], '{sd} {sm} {sy} – {ed} {em} {ey}');
         test.equal(templatec12[2], '{sd} {sm} {sy} – {ed} {em} {ey}');
-        test.equal(templatec12[3], '{sd}-{sm}-{sy} – {ed}-{em}-{ey}');
+        test.equal(templatec12[3], '{sy}-{sm}-{sd} – {ey}-{em}-{ed}');
 
         test.equal(templatec20[0], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[1], '{sm} {sy} – {em} {ey}');
         test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[3], '{sm}-{sy} – {em}-{ey}');
+        test.equal(templatec20[3], '{sy}-{sm} – {ey}-{em}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
         test.equal(templatec30[1], "{sy} – {ey}");
@@ -8195,7 +8196,6 @@ module.exports.testdaterangefmt = {
         }
 
         test.equal(templatec00[0], '{sd} {sm}, {sy} அன்று {st} – {et}');
-                                   '{sd} {sm}, {sy} ’அன்று’ {st} – {et}'
         test.equal(templatec00[1], '{sd} {sm}, {sy} அன்று {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm}, {sy}, {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy}, {st} – {et}');
@@ -8212,7 +8212,6 @@ module.exports.testdaterangefmt = {
 
         test.equal(templatec03[0], '{sd} {sm}, {sy} அன்று {st} – {ed} {em}, {ey} அன்று {et}');
         test.equal(templatec03[1], '{sd} {sm}, {sy} அன்று {st} – {ed} {em}, {ey} அன்று {et}');
-                                   '{sd} {sm}, {sy} ’அன்று’ {st} – {ed} {em}, {ey} ’அன்று’ {et}'
         test.equal(templatec03[2], '{sd} {sm}, {sy}, {st} – {ed} {em}, {ey}, {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy}, {st} – {ed}/{em}/{ey}, {et}');
 
@@ -8267,7 +8266,7 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd}, {sm} {sy} {st}కి – {et}కి'); // CLDR 34 change
+        test.equal(templatec00[0], '{sd}, {sm} {sy} {st}కి – {et}కి');
         test.equal(templatec00[1], '{sd} {sm}, {sy} {st}కి – {et}కి');
 
         test.equal(templatec00[2], '{sd} {sm}, {sy} {st} – {et}');
@@ -9485,45 +9484,44 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sy}.{sm}.{sd} {st} – {et}');
-        test.equal(templatec00[1], '{sy}.{sm}.{sd} {st} – {et}');
+        test.equal(templatec00[0], '{sy} оны {sm}ын {sd} {st} – {et}');
+        test.equal(templatec00[1], '{sy} оны {sm}ын {sd} {st} – {et}');
         test.equal(templatec00[2], '{sy} оны {sm}ын {sd} {st} – {et}');
         test.equal(templatec00[3], '{sy}.{sm}.{sd} {st} – {et}');
 
-        test.equal(templatec01[0], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
-        test.equal(templatec01[1], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
+        test.equal(templatec01[0], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
+        test.equal(templatec01[1], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec01[2], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec01[3], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
 
-        test.equal(templatec02[1], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
-        test.equal(templatec02[0], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
+        test.equal(templatec02[1], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
+        test.equal(templatec02[0], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec02[2], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec02[3], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
 
-        test.equal(templatec03[0], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
-        test.equal(templatec03[1], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
+        test.equal(templatec03[0], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
+        test.equal(templatec03[1], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec03[2], '{sy} оны {sm}ын {sd} {st} – {ey} оны {em}ын {ed} {et}');
         test.equal(templatec03[3], '{sy}.{sm}.{sd} {st} – {ey}.{em}.{ed} {et}');
 
-        test.equal(templatec10[0], '{sy}.{sm}.{sd} – {ed}');
-        test.equal(templatec10[1], '{sy}.{sm}.{sd} – {ed}');
+        test.equal(templatec10[0], '{sy} оны {sm}ын {sd} – {ed}' );
+        test.equal(templatec10[1], '{sy} оны {sm}ын {sd} – {ed}');
         test.equal(templatec10[2], '{sy} оны {sm}ын {sd} – {ed}');
         test.equal(templatec10[3], '{sy}.{sm}.{sd} – {ed}');
 
-        test.equal(templatec11[0], '{sy}.{sm}.{sd} – {em}.{ed}');
-        test.equal(templatec11[1], '{sy}.{sm}.{sd} – {em}.{ed}');
+        test.equal(templatec11[0], '{sy} оны {sm}ын {sd} – {em}ын {ed}');
+        test.equal(templatec11[1], '{sy} оны {sm}ын {sd} – {em}ын {ed}');
         test.equal(templatec11[2], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
         test.equal(templatec11[3], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
 
-        test.equal(templatec12[0], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
-        test.equal(templatec12[1], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
+        test.equal(templatec12[0], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
+        test.equal(templatec12[1], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
         test.equal(templatec12[2], '{sy} оны {sm}ын {sd} – {ey} оны {em}ын {ed}');
         test.equal(templatec12[3], '{sy}.{sm}.{sd} – {ey}.{em}.{ed}');
 
-        test.equal(templatec20[0], '{sy}.{sm} – {ey}.{em}');
-        test.equal(templatec20[1], '{sy}.{sm} – {ey}.{em}');
-        test.equal(templatec20[2], '{sy} оны {sm}ын – {ey} оны {em}ын');
-                                   '{sy} оны {sm} – {ey} оны {em}'
+        test.equal(templatec20[0], '{sy} оны {sm} – {ey} оны {em}');
+        test.equal(templatec20[1], '{sy} оны {sm} – {ey} оны {em}');
+        test.equal(templatec20[2], '{sy} оны {sm} – {ey} оны {em}');
         test.equal(templatec20[3], '{sy}.{sm} – {ey}.{em}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
@@ -9843,7 +9841,7 @@ module.exports.testdaterangefmt = {
             templatec20.push(fmt.dateFmt.formats.range["c20"][abbrLength[i]]);
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
-        //// CLDR 34 change ////
+
         test.equal(templatec00[0], '{st} – {et} ଠାରେ {sm} {sd}, {sy}');
         test.equal(templatec00[1], '{st} – {et} ଠାରେ {sm} {sd}, {sy}');
         test.equal(templatec00[2], '{sm} {sd}, {sy}, {st} – {et}');
@@ -9879,9 +9877,9 @@ module.exports.testdaterangefmt = {
         test.equal(templatec12[2], '{sm} {sd}, {sy} – {em} {ed}, {ey}');
         test.equal(templatec12[3], '{sm}/{sd}/{sy} – {em}/{ed}/{ey}');
 
-        test.equal(templatec20[0], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[1], '{sm} {sy} – {em} {ey}');
-        test.equal(templatec20[2], '{sm} {sy} – {em} {ey}');
+        test.equal(templatec20[0], '{sm}, {sy} – {em}, {ey}');
+        test.equal(templatec20[1], '{sm}, {sy} – {em}, {ey}');
+        test.equal(templatec20[2], '{sm}, {sy} – {em}, {ey}');
         test.equal(templatec20[3], '{sm}/{sy} – {em}/{ey}');
 
         test.equal(templatec30[0], "{sy} – {ey}");
@@ -11831,23 +11829,23 @@ module.exports.testdaterangefmt = {
             templatec30.push(fmt.dateFmt.formats.range["c30"][abbrLength[i]]);
         }
 
-        test.equal(templatec00[0], '{sd} de {sm} de {sy}, {st} – {et}');
-        test.equal(templatec00[1], '{sd} de {sm} de {sy}, {st} – {et}');
+        test.equal(templatec00[0], '{sd} de {sm} de {sy} a las {st} – {et}');
+        test.equal(templatec00[1], '{sd} de {sm} de {sy} a las {st} – {et}');
         test.equal(templatec00[2], '{sd} {sm} {sy} {st} – {et}');
         test.equal(templatec00[3], '{sd}/{sm}/{sy} {st} – {et}');
 
-        test.equal(templatec01[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec01[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec01[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec01[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec01[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec01[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec02[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec02[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec02[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec02[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec02[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec02[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
-        test.equal(templatec03[0], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
-        test.equal(templatec03[1], '{sd} de {sm} de {sy}, {st} – {ed} de {em} de {ey}, {et}');
+        test.equal(templatec03[0], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
+        test.equal(templatec03[1], '{sd} de {sm} de {sy} a las {st} – {ed} de {em} de {ey} a las {et}');
         test.equal(templatec03[2], '{sd} {sm} {sy} {st} – {ed} {em} {ey} {et}');
         test.equal(templatec03[3], '{sd}/{sm}/{sy} {st} – {ed}/{em}/{ey} {et}');
 
diff --git a/js/test/daterange/testdatefmtrange_fr_CA.js b/js/test/daterange/testdatefmtrange_fr_CA.js
index 6b8bee7a1f..5e2f44d768 100644
--- a/js/test/daterange/testdatefmtrange_fr_CA.js
+++ b/js/test/daterange/testdatefmtrange_fr_CA.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_fr_CA.js - test the date range formatter object in French/Canada
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-12-31 13 h 45 – 14 h 30");
+        test.equal(fmt.format(start, end), "2011-12-31 13 h 45 – 14 h 30");
         test.done();
     },
     testDateRngFmtCARangeInDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -115,7 +115,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -137,12 +137,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), '31 décembre 2011 à 13 h 45 – 14 h 30');
         test.done();
     },
-    
+
     testDateRngFmtCARangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-12-30 13 h 45 – 11-12-31 14 h 30");
+        test.equal(fmt.format(start, end), "2011-12-30 13 h 45 – 2011-12-31 14 h 30");
         test.done();
     },
     testDateRngFmtCARangeNextDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -220,7 +220,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -242,12 +242,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "30 décembre 2011 à 13 h 45 – 31 décembre 2011 à 14 h 30");
         test.done();
     },
-    
+
     testDateRngFmtCARangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -266,14 +266,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-12-20 – 31");
+        test.equal(fmt.format(start, end), "2011-12-20 – 31");
         test.done();
     },
     testDateRngFmtCARangeMultiDayMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "20 – 31 décembre 2011");
         test.done();
     },
-    
+
     testDateRngFmtCARangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -371,14 +371,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-11-20 – 11-12-31");
+        test.equal(fmt.format(start, end), "2011-11-20 – 2011-12-31");
         test.done();
     },
     testDateRngFmtCARangeNextMonthMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "20 novembre – 31 décembre 2011");
         test.done();
     },
-    
+
     testDateRngFmtCARangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -476,14 +476,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-11-20 – 12-01-31");
+        test.equal(fmt.format(start, end), "2011-11-20 – 2012-01-31");
         test.done();
     },
     testDateRngFmtCARangeNextYearMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "20 novembre 2011 – 31 janvier 2012");
         test.done();
     },
-    
+
     testDateRngFmtCARangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -581,14 +581,14 @@ module.exports.testdatefmtrange_fr_CA = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "11-11 – 14-01");
+        test.equal(fmt.format(start, end), "2011-11 – 2014-01");
         test.done();
     },
     testDateRngFmtCARangeMultiYearMedium: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_fr_CA = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "fr-CA", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_fr_CA = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_hi_IN.js b/js/test/daterange/testdatefmtrange_hi_IN.js
index ae27705038..1994ae0b76 100644
--- a/js/test/daterange/testdatefmtrange_hi_IN.js
+++ b/js/test/daterange/testdatefmtrange_hi_IN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_hi_IN.js - test the date range formatter object in Hindi/India
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -56,14 +56,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/11, 1:45 अपराह्न – 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "31/12/11, 1:45 pm – 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeinDayMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '31 दिस॰ 2011, 1:45 अपराह्न – 2:30 अपराह्न');
+        test.equal(fmt.format(start, end), '31 दिस॰ 2011, 1:45 pm – 2:30 pm');
         test.done();
     },
     testDateRngFmtRangeinDayLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 अपराह्न – 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 pm – 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeinDayFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 अपराह्न – 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "31 दिसंबर 2011 को 1:45 pm – 2:30 pm");
         test.done();
     },
-    
+
     testDateRngFmtRangeNextDayShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -161,14 +161,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/11, 1:45 अपराह्न – 31/12/11, 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "30/12/11, 1:45 pm – 31/12/11, 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeNextDayMedium_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '30 दिस॰ 2011, 1:45 अपराह्न – 31 दिस॰ 2011, 2:30 अपराह्न');
+        test.equal(fmt.format(start, end), '30 दिस॰ 2011, 1:45 pm – 31 दिस॰ 2011, 2:30 pm');
         test.done();
     },
     testDateRngFmtRangeNextDayLong_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 अपराह्न – 31 दिसंबर 2011 को 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 pm – 31 दिसंबर 2011 को 2:30 pm");
         test.done();
     },
     testDateRngFmtRangeNextDayFull_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,15 +239,15 @@ module.exports.testdatefmtrange_hi_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 अपराह्न – 31 दिसंबर 2011 को 2:30 अपराह्न");
+        test.equal(fmt.format(start, end), "30 दिसंबर 2011 को 1:45 pm – 31 दिसंबर 2011 को 2:30 pm");
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiDayShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "20 – 31 दिसंबर 2011");
         test.done();
     },
-    
+
     testDateRngFmtRangeNextMonthShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "20 नवंबर – 31 दिसंबर 2011");
         test.done();
     },
-    
+
     testDateRngFmtRangeNextYearShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "20 नवंबर 2011 – 31 जनवरी 2012");
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiYearShort_hi_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -614,7 +614,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_hi_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "hi-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_hi_IN = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js b/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js
index 4e35cd5be8..2acf37fc27 100644
--- a/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js
+++ b/js/test/daterange/testdatefmtrange_mn_Cyrl_MN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_mn-Cyrl_MN.js - test the date range formatter object in Mongolian/Mongolia for Cyrillic script.
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -108,14 +108,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.31 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 31 13:45 – 14:30');
         test.done();
     },
     testDateRngFmtMNRangeinDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -134,15 +134,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.31 13:45 – 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 31 13:45 – 14:30');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -213,14 +213,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.30 13:45 – 2011.12.31 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 30 13:45 – 2011 оны арван хоёрдугаар сарын 31 14:30');
         test.done();
     },
     testDateRngFmtMNRangeNextDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -239,15 +239,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.30 13:45 – 2011.12.31 14:30');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 30 13:45 – 2011 оны арван хоёрдугаар сарын 31 14:30');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -318,14 +318,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.20 – 31');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 20 – 31');
         test.done();
     },
     testDateRngFmtMNRangeMultiDayFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -344,15 +344,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.12.20 – 31');
+        test.equal(fmt.format(start, end), '2011 оны арван хоёрдугаар сарын 20 – 31');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -423,14 +423,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 12.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – арван хоёрдугаар сарын 31');
         test.done();
     },
     testDateRngFmtMNRangeNextMonthFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -449,15 +449,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 12.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – арван хоёрдугаар сарын 31');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -528,14 +528,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 2012.01.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – 2012 оны нэгдүгээр сарын 31');
         test.done();
     },
     testDateRngFmtMNRangeNextYearFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -554,15 +554,15 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11.20 – 2012.01.31');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сарын 20 – 2012 оны нэгдүгээр сарын 31');
         test.done();
     },
-    
+
     testDateRngFmtMNRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -607,14 +607,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011 оны 11-р сарын – 2014 оны 1-р сарын');
+        test.equal(fmt.format(start, end), '2011 оны 11-р сар – 2014 оны 1-р сар');
         test.done();
     },
     testDateRngFmtMNRangeMultiYearLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -633,14 +633,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11 – 2014.01');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сар – 2014 оны нэгдүгээр сар');
         test.done();
     },
     testDateRngFmtMNRangeMultiYearFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -659,14 +659,14 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), '2011.11 – 2014.01');
+        test.equal(fmt.format(start, end), '2011 оны арван нэгдүгээр сар – 2014 оны нэгдүгээр сар');
         test.done();
     },
     testDateRngFmtMNManyYearsFull: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "mn-Cyrl-MN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_mn_Cyrl_MN = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_or_IN.js b/js/test/daterange/testdatefmtrange_or_IN.js
index 2969e1e516..2806fb5d19 100644
--- a/js/test/daterange/testdatefmtrange_or_IN.js
+++ b/js/test/daterange/testdatefmtrange_or_IN.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_or_IN.js - test the date range formatter object in Oriya/India
- * 
+ *
  * Copyright © 2015-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -89,7 +89,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -115,7 +115,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -137,12 +137,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), '1:45 PM – 2:30 PM ଠାରେ ଡିସେମ୍ବର 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeNextDayShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -194,7 +194,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -220,7 +220,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -242,12 +242,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), '1:45 PM ଠାରେ ଡିସେମ୍ବର 30, 2011 – 2:30 PM ଠାରେ ଡିସେମ୍ବର 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiDayShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -299,7 +299,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), 'ଡିସେମ୍ବର 20 – 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeNextMonthShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -404,7 +404,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), 'ନଭେମ୍ବର 20 – ଡିସେମ୍ବର 31, 2011');
         test.done();
     },
-    
+
     testDateRngFmtRangeNextYearShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -509,7 +509,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), 'ନଭେମ୍ବର 20, 2011 – ଜାନୁଆରୀ 31, 2012');
         test.done();
     },
-    
+
     testDateRngFmtRangeMultiYearShort_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_or_IN = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -607,14 +607,14 @@ module.exports.testdatefmtrange_or_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "ନଭେମ୍ବର 2011 – ଜାନୁଆରୀ 2014");
+        test.equal(fmt.format(start, end), "ନଭେମ୍ବର, 2011 – ଜାନୁଆରୀ, 2014");
         test.done();
     },
     testDateRngFmtRangeMultiYearLong_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -633,14 +633,14 @@ module.exports.testdatefmtrange_or_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "ନଭେମ୍ବର 2011 – ଜାନୁଆରୀ 2014");
+        test.equal(fmt.format(start, end), "ନଭେମ୍ବର, 2011 – ଜାନୁଆରୀ, 2014");
         test.done();
     },
     testDateRngFmtRangeMultiYearFull_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -659,14 +659,14 @@ module.exports.testdatefmtrange_or_IN = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "ନଭେମ୍ବର 2011 – ଜାନୁଆରୀ 2014");
+        test.equal(fmt.format(start, end), "ନଭେମ୍ବର, 2011 – ଜାନୁଆରୀ, 2014");
         test.done();
     },
     testDateRngFmtManyYearsFull_or_IN: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "or-IN", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_or_IN = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_pt_BR.js b/js/test/daterange/testdatefmtrange_pt_BR.js
index 73b1a67d35..447c82e519 100644
--- a/js/test/daterange/testdatefmtrange_pt_BR.js
+++ b/js/test/daterange/testdatefmtrange_pt_BR.js
@@ -1,6 +1,6 @@
 /*
  * testdatefmtrange_pt_BR.js - test the date range formatter object in portuguese/Brazil
- * 
+ *
  * Copyright © 2012-2017, JEDLSoft
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +37,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -63,7 +63,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -82,14 +82,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 de dez de 2011 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 de dez. de 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtBRRangeInDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -115,7 +115,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -137,12 +137,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "31 de dezembro de 2011 13:45 – 14:30");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeNextDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -168,7 +168,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -187,14 +187,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 de dez de 2011 13:45 – 31 de dez de 2011 14:30");
+        test.equal(fmt.format(start, end), "30 de dez. de 2011 13:45 – 31 de dez. de 2011 14:30");
         test.done();
     },
     testDateRngFmtBRRangeNextDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -220,7 +220,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -242,12 +242,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "30 de dezembro de 2011 13:45 – 31 de dezembro de 2011 14:30");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeMultiDayShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -273,7 +273,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -292,14 +292,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 – 31 de dez de 2011");
+        test.equal(fmt.format(start, end), "20 – 31 de dez. de 2011");
         test.done();
     },
     testDateRngFmtBRRangeMultiDayLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -325,7 +325,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 12,
@@ -347,12 +347,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "20 – 31 de dezembro de 2011");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeNextMonthShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -378,7 +378,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -397,14 +397,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de nov – 31 de dez de 2011");
+        test.equal(fmt.format(start, end), "20 de nov. – 31 de dez. de 2011");
         test.done();
     },
     testDateRngFmtBRRangeNextMonthLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -430,7 +430,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -452,12 +452,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "20 de novembro – 31 de dezembro de 2011");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeNextYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -483,7 +483,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -502,14 +502,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "20 de nov de 2011 – 31 de jan de 2012");
+        test.equal(fmt.format(start, end), "20 de nov. de 2011 – 31 de jan. de 2012");
         test.done();
     },
     testDateRngFmtBRRangeNextYearLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -535,7 +535,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -557,12 +557,12 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "20 de novembro de 2011 – 31 de janeiro de 2012");
         test.done();
     },
-    
+
     testDateRngFmtBRRangeMultiYearShort: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "short"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -588,7 +588,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "medium"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -607,14 +607,14 @@ module.exports.testdatefmtrange_pt_BR = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "nov de 2011 – jan de 2014");
+        test.equal(fmt.format(start, end), "nov. de 2011 – jan. de 2014");
         test.done();
     },
     testDateRngFmtBRRangeMultiYearLong: function(test) {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "long"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -640,7 +640,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -666,7 +666,7 @@ module.exports.testdatefmtrange_pt_BR = {
         test.expect(2);
         var fmt = new DateRngFmt({locale: "pt-BR", length: "full"});
         test.ok(fmt !== null);
-        
+
         var start = new GregorianDate({
             year: 2011,
             month: 11,
@@ -688,5 +688,5 @@ module.exports.testdatefmtrange_pt_BR = {
         test.equal(fmt.format(start, end), "2011 – 2064");
         test.done();
     }
-    
+
 };
diff --git a/js/test/daterange/testdatefmtrange_sw_KE.js b/js/test/daterange/testdatefmtrange_sw_KE.js
index c42cf5e3f1..3131e5d4a5 100644
--- a/js/test/daterange/testdatefmtrange_sw_KE.js
+++ b/js/test/daterange/testdatefmtrange_sw_KE.js
@@ -56,7 +56,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31/12/2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31/12/2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeInDayMedium: function(test) {
@@ -82,7 +82,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 Des 2011, 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 Des 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeInDayLong: function(test) {
@@ -108,7 +108,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 Desemba 2011 saa 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 Desemba 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeInDayFull: function(test) {
@@ -134,7 +134,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "31 Desemba 2011 saa 13:45 – 14:30");
+        test.equal(fmt.format(start, end), "31 Desemba 2011 13:45 – 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayShort: function(test) {
@@ -160,7 +160,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30/12/2011, 13:45 – 31/12/2011, 14:30");
+        test.equal(fmt.format(start, end), "30/12/2011 13:45 – 31/12/2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayMedium: function(test) {
@@ -186,7 +186,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 Des 2011, 13:45 – 31 Des 2011, 14:30");
+        test.equal(fmt.format(start, end), "30 Des 2011 13:45 – 31 Des 2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayLong: function(test) {
@@ -212,7 +212,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 Desemba 2011 saa 13:45 – 31 Desemba 2011 saa 14:30");
+        test.equal(fmt.format(start, end), "30 Desemba 2011 13:45 – 31 Desemba 2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeNextDayFull: function(test) {
@@ -238,7 +238,7 @@ module.exports.testdatefmtrange_sw_KE = {
             second: 0,
             millisecond: 0
         });
-        test.equal(fmt.format(start, end), "30 Desemba 2011 saa 13:45 – 31 Desemba 2011 saa 14:30");
+        test.equal(fmt.format(start, end), "30 Desemba 2011 13:45 – 31 Desemba 2011 14:30");
         test.done();
     },
     testDateRngFmtKERangeMultiDayShort: function(test) {