Fix meridiem parsing for bn,bo,dv,ml,si,tzl

diff --git a/src/locale/bn.js b/src/locale/bn.js
index 3ab629c5189d14a8301ad556a90d5ae2255b12dc..6d2f59d66d61601b9fbb8cb94f39117a01317a68 100644 (file)
--- a/src/locale/bn.js
+++ b/src/locale/bn.js
@@ -77,12 +77,18 @@ export default moment.defineLocale('bn', {
         });
     },
     meridiemParse: /রাত|সকাল|দুপুর|বিকাল|রাত/,
-    isPM: function (input) {
-        return /^(দুপুর|বিকাল|রাত)$/.test(input);
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if ((meridiem === 'রাত' && hour >= 4) ||
+                (meridiem === 'দুপুর' && hour < 5) ||
+                meridiem === 'বিকাল') {
+            return hour + 12;
+        } else {
+            return hour;
+        }
     },
-    //Bengali is a vast language its spoken
-    //in different forms in various parts of the world.
-    //I have just generalized with most common one used
     meridiem : function (hour, minute, isLower) {
         if (hour < 4) {
             return 'রাত';

diff --git a/src/locale/bo.js b/src/locale/bo.js
index 6da128ddeba6cc5c789c0ca04939b086b8872091..05b1fdc529685c8b6663f80a72f9e980cd9887ad 100644 (file)
--- a/src/locale/bo.js
+++ b/src/locale/bo.js
@@ -77,8 +77,17 @@ export default moment.defineLocale('bo', {
         });
     },
     meridiemParse: /མཚན་མོ|ཞོགས་ཀས|ཉིན་གུང|དགོང་དག|མཚན་མོ/,
-    isPM: function (input) {
-        return /^(ཉིན་གུང|དགོང་དག|མཚན་མོ)$/.test(input);
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if ((meridiem === 'མཚན་མོ' && hour >= 4) ||
+                (meridiem === 'ཉིན་གུང' && hour < 5) ||
+                meridiem === 'དགོང་དག') {
+            return hour + 12;
+        } else {
+            return hour;
+        }
     },
     meridiem : function (hour, minute, isLower) {
         if (hour < 4) {

diff --git a/src/locale/dv.js b/src/locale/dv.js
index 481237f8be20a2092aac296624000394359c7e32..6e7a42dd70be485ab2bab2e5ecc26fbe7da875bf 100644 (file)
--- a/src/locale/dv.js
+++ b/src/locale/dv.js
@@ -44,7 +44,7 @@ export default moment.defineLocale('dv', {
     },
     meridiemParse: /މކ|މފ/,
     isPM : function (input) {
-        return '' === input;
+        return 'މފ' === input;
     },
     meridiem : function (hour, minute, isLower) {
         if (hour < 12) {

diff --git a/src/locale/ml.js b/src/locale/ml.js
index 7bafa7a1d27a4be17e5e004b9415d6cf06ff87a8..038725328c740db558480a2dd837696435e054af 100644 (file)
--- a/src/locale/ml.js
+++ b/src/locale/ml.js
@@ -42,8 +42,17 @@ export default moment.defineLocale('ml', {
         yy : '%d വർഷം'
     },
     meridiemParse: /രാത്രി|രാവിലെ|ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി/i,
-    isPM : function (input) {
-        return /^(ഉച്ച കഴിഞ്ഞ്|വൈകുന്നേരം|രാത്രി)$/.test(input);
+    meridiemHour : function (hour, meridiem) {
+        if (hour === 12) {
+            hour = 0;
+        }
+        if ((meridiem === 'രാത്രി' && hour >= 4) ||
+                meridiem === 'ഉച്ച കഴിഞ്ഞ്' ||
+                meridiem === 'വൈകുന്നേരം') {
+            return hour + 12;
+        } else {
+            return hour;
+        }
     },
     meridiem : function (hour, minute, isLower) {
         if (hour < 4) {

diff --git a/src/locale/si.js b/src/locale/si.js
index 15c9f1598a29c7257c69a5ae54d200f81cf2ede9..c2d8a88fa238131018f6476347c23138810cd8c6 100644 (file)
--- a/src/locale/si.js
+++ b/src/locale/si.js
@@ -46,6 +46,10 @@ export default moment.defineLocale('si', {
     ordinal : function (number) {
         return number + ' වැනි';
     },
+    meridiemParse : /පෙර වරු|පස් වරු|පෙ.ව|ප.ව./,
+    isPM : function (input) {
+        return input === 'ප.ව.' || input === 'පස් වරු';
+    },
     meridiem : function (hours, minutes, isLower) {
         if (hours > 11) {
             return isLower ? 'ප.ව.' : 'පස් වරු';

diff --git a/src/locale/tzl.js b/src/locale/tzl.js
index 7c2a77a3431fe9869c82d25dee8cfe9381e22654..9f983f7fd3a6a58042ff58ed97352db763b35320 100644 (file)
--- a/src/locale/tzl.js
+++ b/src/locale/tzl.js
@@ -21,6 +21,10 @@ export default moment.defineLocale('tzl', {
         LLL : 'D. MMMM [dallas] YYYY HH.mm',
         LLLL : 'dddd, [li] D. MMMM [dallas] YYYY HH.mm'
     },
+    meridiemParse: /d\'o|d\'a/i,
+    isPM : function (input) {
+        return 'd\'o' === input.toLowerCase();
+    },
     meridiem : function (hours, minutes, isLower) {
         if (hours > 11) {
             return isLower ? 'd\'o' : 'D\'O';