commit 7a8dc01c9042f8d3e78aedec67d8dfc5d571ce07
author Piotr Zalewa <piotr@zalewa.info> Wed Oct 08 18:40:44 2014 +0200
committer Piotr Zalewa <piotr@zalewa.info> Wed Oct 08 18:40:44 2014 +0200
tree 168e32943a9c3a1b6c8e8e8247116bbfe0866688
parent 8bc44ac140b6ca37b833f5b17d205319dbc50a3d
parent e8baaaa8db58973c74ab44397a5c7e85ca8967dc

Merge branch 'fix_dateNames_and_firstDay'

src/firefoxos/GlobalizationProxy.js

diff --git a/src/firefoxos/GlobalizationProxy.js b/src/firefoxos/GlobalizationProxy.js
index 910ef6b..07d92dc 100644
--- a/src/firefoxos/GlobalizationProxy.js
+++ b/src/firefoxos/GlobalizationProxy.js
@@ -109,17 +109,17 @@
     function _getStringFromDate(f, date, options) {
         var format = navigator.mozL10n.get('shortDateTimeFormat');
         if (options) {
-          if (options.selector == 'date') {
+          if (options.selector === 'date') {
             return f.localeDateString(date);
           }
-          if (options.selector == 'time') {
+          if (options.selector === 'time') {
             return f.localeTimeString(date);
           }
-          if (options.formatLength != 'short') {
+          if (options.formatLength !== 'short') {
             format = navigator.mozL10n.get('dateTimeFormat');
             return f.localeString(date, format);
           }
-          if (options.selector == 'time') {
+          if (options.selector === 'time') {
             return f.localeTimeString(date, format);
           }
         }
@@ -137,12 +137,12 @@
       date = new Date(dateString);
     } catch(e) {  
       console.log("Cordova, stringToDate, An error occurred " + e.message);
-      return errorCB(GlobalizationError(
+      return errorCB(new GlobalizationError(
             GlobalizationError.PARSING_ERROR, e.message));
     } 
-    if (!date || date == 'Invalid Date') {
+    if (!date || date === 'Invalid Date') {
       console.log("Cordova, stringToDate, Invalid Date: " + dateString);
-      return errorCB(GlobalizationError(
+      return errorCB(new GlobalizationError(
             GlobalizationError.PARSING_ERROR, 'Invalid Date (' + dateString + ')'));
     }
 
@@ -158,10 +158,10 @@
       'millisecond': date.getMilliseconds() 
     };
     if (options) {
-      if (options.selector == 'date') {
+      if (options.selector === 'date') {
         return successCB(dateObj);
       }
-      if (options.selector == 'time') {
+      if (options.selector === 'time') {
         return successCB(timeObj);
       }
     }
@@ -181,24 +181,22 @@
   callIfL10nReady(function() {
     var version = 'long';
     var item = 'month';
-    var first = 0;
     var options = params[0].options;
     if (options) {
-      if (options.type == 'narrow') {
+      if (options.type === 'narrow') {
         version = 'short';
-      } else if (options.type == 'genitive' && options.item == 'months') {
+      } else if (options.type === 'genitive' && options.item === 'months') {
         version = options.type;
       } 
-      if (options.item == 'days') {
+      if (options.item === 'days') {
         item = 'weekday';
-        first = parseInt(navigator.mozL10n.get('weekStartsOnMonday'));
       }
     }
-    var limit = (item == 'month') ? 11 : 6;
+    var limit = (item === 'month') ? 11 : 6;
 
     var arr = [];
-    for (var i = first; i <= first + limit; i++) {
-        arr.push(navigator.mozL10n.get(item + '-' + i % (limit + 1) + '-' + version));
+    for (var i = 0; i <= limit; i++) {
+        arr.push(navigator.mozL10n.get(item + '-' + i + '-' + version));
     }
     successCB({'value': arr});
   });
@@ -223,7 +221,9 @@
 function getFirstDayOfWeek(successCB, failureCB) {
   callIfL10nReady(function() {
     var firstDay = navigator.mozL10n.get('weekStartsOnMonday');
-    successCB({'value': parseInt(firstDay)});
+    // Sunday: 1
+    // Monday: 2
+    successCB({'value': 1 + parseInt(firstDay)});
   });
 }