From: Iskren Chernev <iskren.chernev@gmail.com>
Date: Sun, 8 Sep 2013 23:27:40 +0000 (-0700)
Subject: Fixed wrong Chinese meridiem time
X-Git-Tag: 2.3.0~37^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57065f39eef0cac784d9acc56fb3f849a8cd5218;p=thirdparty%2Fmoment.git

Fixed wrong Chinese meridiem time

Better implementation for #865
---

diff --git a/lang/zh-cn.js b/lang/zh-cn.js
index fa6fe6b01..7e5680661 100644
--- 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 7a1767b75..7a11a59c0 100644
--- 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 "晚上";