diff options
| author | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
|---|---|---|
| committer | Florian Dold <florian.dold@gmail.com> | 2018-09-20 02:56:13 +0200 |
| commit | bbff7403fbf46f9ad92240ac213df8d30ef31b64 (patch) | |
| tree | c58400ec5124da1c7d56b01aea83309f80a56c3b /node_modules/moment/src/locale/ja.js | |
| parent | 003fb34971cf63466184351b4db5f7c67df4f444 (diff) | |
update packages
Diffstat (limited to 'node_modules/moment/src/locale/ja.js')
| -rw-r--r-- | node_modules/moment/src/locale/ja.js | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/node_modules/moment/src/locale/ja.js b/node_modules/moment/src/locale/ja.js index 5fffc83e0..9812a7363 100644 --- a/node_modules/moment/src/locale/ja.js +++ b/node_modules/moment/src/locale/ja.js @@ -16,11 +16,11 @@ export default moment.defineLocale('ja', { L : 'YYYY/MM/DD', LL : 'YYYY年M月D日', LLL : 'YYYY年M月D日 HH:mm', - LLLL : 'YYYY年M月D日 HH:mm dddd', + LLLL : 'YYYY年M月D日 dddd HH:mm', l : 'YYYY/MM/DD', ll : 'YYYY年M月D日', lll : 'YYYY年M月D日 HH:mm', - llll : 'YYYY年M月D日 HH:mm dddd' + llll : 'YYYY年M月D日(ddd) HH:mm' }, meridiemParse: /午前|午後/i, isPM : function (input) { @@ -36,9 +36,21 @@ export default moment.defineLocale('ja', { calendar : { sameDay : '[今日] LT', nextDay : '[明日] LT', - nextWeek : '[来週]dddd LT', + nextWeek : function (now) { + if (now.week() < this.week()) { + return '[来週]dddd LT'; + } else { + return 'dddd LT'; + } + }, lastDay : '[昨日] LT', - lastWeek : '[前週]dddd LT', + lastWeek : function (now) { + if (this.week() < now.week()) { + return '[先週]dddd LT'; + } else { + return 'dddd LT'; + } + }, sameElse : 'L' }, dayOfMonthOrdinalParse : /\d{1,2}日/, @@ -56,6 +68,7 @@ export default moment.defineLocale('ja', { future : '%s後', past : '%s前', s : '数秒', + ss : '%d秒', m : '1分', mm : '%d分', h : '1時間', |