From: Tim Wood <washwithcare@gmail.com>
Date: Fri, 8 Jun 2012 17:04:37 +0000 (-0700)
Subject: Merge pull request #331 from baryon/master
X-Git-Tag: 1.7.0~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4069225ed371823a85b0e749b9e4ff8d9dc13a91;p=thirdparty%2Fmoment.git

Merge pull request #331 from baryon/master

updated Japanese plugin
---

4069225ed371823a85b0e749b9e4ff8d9dc13a91
diff --cc lang/jp.js
index 35c393b04,b3bae9a90..1fc725134
--- a/lang/jp.js
+++ b/lang/jp.js
@@@ -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) {