]> git.ipfire.org Git - thirdparty/moment.git/commitdiff
Merge pull request #331 from baryon/master
authorTim Wood <washwithcare@gmail.com>
Fri, 8 Jun 2012 17:04:37 +0000 (10:04 -0700)
committerTim Wood <washwithcare@gmail.com>
Fri, 8 Jun 2012 17:04:37 +0000 (10:04 -0700)
updated Japanese plugin

1  2 
lang/jp.js
test/lang/jp.js

diff --cc lang/jp.js
index 35c393b047e3d8b5f3165335988cff87a8f457a3,b3bae9a904db2bab0ab4bea4ac40fe3236ede7e6..1fc725134cd6b20dbf139b0423d723e81f7e2d50
@@@ -7,13 -4,12 +7,13 @@@
              monthsShort : "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
              weekdays : "日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),
              weekdaysShort : "日_月_火_水_木_金_土".split("_"),
 +            weekdaysMin : "日_月_火_水_木_金_土".split("_"),
              longDateFormat : {
-                 LT : "Ah:mm",
+                 LT : "Ah時m分",
                  L : "YYYY/MM/DD",
                  LL : "YYYY年M月D日",
-                 LLL : "YYYY年M月D日 LT",
-                 LLLL : "YYYY年M月D日 dddd LT"
+                 LLL : "YYYY年M月D日LT",
+                 LLLL : "YYYY年M月D日LT dddd"
              },
              meridiem : function (hour, minute, isLower) {
                  if (hour < 12) {
diff --cc test/lang/jp.js
Simple merge