Fixed wrong Chinese meridiem time

Better implementation for #865

diff --git a/lang/zh-cn.js b/lang/zh-cn.js
index fa6fe6b01b2867edd4a902e759768b5231f36fd3..7e5680661828902d8279bbb66628385589fb3b6d 100644 (file)
--- a/lang/zh-cn.js
+++ b/lang/zh-cn.js
@@ -29,13 +29,14 @@
             llll : "YYYY年MMMD日ddddLT"
         },
         meridiem : function (hour, minute, isLower) {
-            if (hour < 9) {
+            var hm = hour * 100 + minute;
+            if (hm < 900) {
                 return "早上";
-            } else if (hour < 11 && minute < 30) {
+            } else if (hm < 1130) {
                 return "上午";
-            } else if (hour < 13 && minute < 30) {
+            } else if (hm < 1330) {
                 return "中午";
-            } else if (hour < 18) {
+            } else if (hm < 1800) {
                 return "下午";
             } else {
                 return "晚上";

diff --git a/lang/zh-tw.js b/lang/zh-tw.js
index 7a1767b7554977b4cafa0bbadcd7598eecbbcf11..7a11a59c0023d57d1f9f7039525f3a2909192f76 100644 (file)
--- a/lang/zh-tw.js
+++ b/lang/zh-tw.js
@@ -29,13 +29,14 @@
             llll : "YYYY年MMMD日ddddLT"
         },
         meridiem : function (hour, minute, isLower) {
-            if (hour < 9) {
+            var hm = hour * 100 + minute;
+            if (hm < 900) {
                 return "早上";
-            } else if (hour < 11 && minute < 30) {
+            } else if (hm < 1130) {
                 return "上午";
-            } else if (hour < 13 && minute < 30) {
+            } else if (hm < 1330) {
                 return "中午";
-            } else if (hour < 18) {
+            } else if (hm < 1800) {
                 return "下午";
             } else {
                 return "晚上";