Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add some more ordinal formatting for Japanese values #2471

Merged
merged 1 commit into from Jul 23, 2021
Merged

Add some more ordinal formatting for Japanese values #2471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 19 additions & 8 deletions src/locale/ja/_lib/localize/index.js
View file
Open in desktop
Expand Up @@ -132,15 +132,26 @@ function ordinalNumber(dirtyNumber, dirtyOptions) {
var options = dirtyOptions || {}
var unit = String(options.unit)

if (unit === 'date') {
return number + '日'
switch (unit) {
case 'year':
return `${number}年`
case 'quarter':
return `第${number}四半期`
case 'month':
return `${number}月`
case 'week':
return `第${number}週`
case 'date':
return `${number}日`
case 'hour':
return `${number}時`
case 'minute':
return `${number}分`
case 'second':
return `${number}秒`
default:
return `${number}`
}

if (unit === 'year') {
return number + '年'
}

return number
}

var localize = {
Expand Down
2 changes: 1 addition & 1 deletion src/locale/ja/_lib/match/index.js
View file
Open in desktop
@@ -1,7 +1,7 @@
import buildMatchPatternFn from '../../../_lib/buildMatchPatternFn/index'
import buildMatchFn from '../../../_lib/buildMatchFn/index'

var matchOrdinalNumberPattern = /^第?\d+(日)?(年)?/i
var matchOrdinalNumberPattern = /^第?\d+(年|四半期|月|週|日|時|分|秒)?/i
var parseOrdinalNumberPattern = /\d+/i

var matchEraPatterns = {
Expand Down
48 changes: 24 additions & 24 deletions src/locale/ja/snapshot.md
View file
Open in desktop
Expand Up @@ -8,40 +8,40 @@
| | | 0005-01-01T12:13:14.015Z | 5 年 | 0005-01-01T00:00:00.000Z |
| Local week-numbering year | Yo | 1987-02-11T12:13:14.015Z | 1987 年 | 1986-12-28T00:00:00.000Z |
| | | 0005-01-01T12:13:14.015Z | 5 年 | 0004-12-26T00:00:00.000Z |
| Quarter (formatting) | Qo | 2019-01-01T12:13:14.015Z | 1 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 2 | 2019-04-01T00:00:00.000Z |
| Quarter (formatting) | Qo | 2019-01-01T12:13:14.015Z | 第 1 四半期 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 第 2 四半期 | 2019-04-01T00:00:00.000Z |
| | QQQ | 2019-01-01T12:13:14.015Z | Q1 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | Q2 | 2019-04-01T00:00:00.000Z |
| | QQQQ | 2019-01-01T12:13:14.015Z | 第 1 四半期 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 第 2 四半期 | 2019-04-01T00:00:00.000Z |
| | QQQQQ | 2019-01-01T12:13:14.015Z | 1 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 2 | 2019-04-01T00:00:00.000Z |
| Quarter (stand-alone) | qo | 2019-01-01T12:13:14.015Z | 1 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 2 | 2019-04-01T00:00:00.000Z |
| Quarter (stand-alone) | qo | 2019-01-01T12:13:14.015Z | 第 1 四半期 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 第 2 四半期 | 2019-04-01T00:00:00.000Z |
| | qqq | 2019-01-01T12:13:14.015Z | Q1 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | Q2 | 2019-04-01T00:00:00.000Z |
| | qqqq | 2019-01-01T12:13:14.015Z | 第 1 四半期 | 2019-01-01T00:00:00.000Z |
| | | 2019-04-01T12:13:14.015Z | 第 2 四半期 | 2019-04-01T00:00:00.000Z |
| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | 2 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 | 2019-07-01T00:00:00.000Z |
| Month (formatting) | Mo | 2019-02-11T12:13:14.015Z | 2 月 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 月 | 2019-07-01T00:00:00.000Z |
| | MMM | 2019-02-11T12:13:14.015Z | 2 月 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 月 | 2019-07-01T00:00:00.000Z |
| | MMMM | 2019-02-11T12:13:14.015Z | 2 月 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 月 | 2019-07-01T00:00:00.000Z |
| | MMMMM | 2019-02-11T12:13:14.015Z | 2 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 | 2019-07-01T00:00:00.000Z |
| Month (stand-alone) | Lo | 2019-02-11T12:13:14.015Z | 2 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 | 2019-07-01T00:00:00.000Z |
| Month (stand-alone) | Lo | 2019-02-11T12:13:14.015Z | 2 月 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 月 | 2019-07-01T00:00:00.000Z |
| | LLL | 2019-02-11T12:13:14.015Z | 2 月 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 月 | 2019-07-01T00:00:00.000Z |
| | LLLL | 2019-02-11T12:13:14.015Z | 2 月 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 月 | 2019-07-01T00:00:00.000Z |
| | LLLLL | 2019-02-11T12:13:14.015Z | 2 | 2019-02-01T00:00:00.000Z |
| | | 2019-07-10T12:13:14.015Z | 7 | 2019-07-01T00:00:00.000Z |
| Local week of year | wo | 2019-01-01T12:13:14.015Z | 1 | 2018-12-30T00:00:00.000Z |
| | | 2019-12-01T12:13:14.015Z | 49 | 2019-12-01T00:00:00.000Z |
| ISO week of year | Io | 2019-01-01T12:13:14.015Z | 1 | 2018-12-31T00:00:00.000Z |
| | | 2019-12-01T12:13:14.015Z | 48 | 2019-11-25T00:00:00.000Z |
| Local week of year | wo | 2019-01-01T12:13:14.015Z | 第 1 週 | 2018-12-30T00:00:00.000Z |
| | | 2019-12-01T12:13:14.015Z | 第 49 週 | 2019-12-01T00:00:00.000Z |
| ISO week of year | Io | 2019-01-01T12:13:14.015Z | 第 1 週 | 2018-12-31T00:00:00.000Z |
| | | 2019-12-01T12:13:14.015Z | 第 48 週 | 2019-11-25T00:00:00.000Z |
| Day of month | do | 2019-02-11T12:13:14.015Z | 11 日 | 2019-02-11T00:00:00.000Z |
| | | 2019-02-28T12:13:14.015Z | 28 日 | 2019-02-28T00:00:00.000Z |
| Day of year | Do | 2019-02-11T12:13:14.015Z | 42 | 2019-02-11T00:00:00.000Z |
Expand Down Expand Up @@ -148,18 +148,18 @@
| | | 2019-02-11T14:13:14.015Z | 午後 | 2019-02-11T12:00:00.000Z |
| | | 2019-02-11T19:13:14.015Z | 夜 | 2019-02-11T17:00:00.000Z |
| | | 2019-02-11T02:13:14.015Z | 深夜 | 2019-02-11T00:00:00.000Z |
| Hour [1-12] | ho | 2019-02-11T11:13:14.015Z | 11 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 11 | 2019-02-11T23:00:00.000Z |
| Hour [0-23] | Ho | 2019-02-11T11:13:14.015Z | 11 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 23 | 2019-02-11T23:00:00.000Z |
| Hour [0-11] | Ko | 2019-02-11T11:13:14.015Z | 11 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 11 | 2019-02-11T23:00:00.000Z |
| Hour [1-24] | ko | 2019-02-11T11:13:14.015Z | 11 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 23 | 2019-02-11T23:00:00.000Z |
| Minute | mo | 2019-01-01T12:01:14.015Z | 1 | 2019-01-01T12:01:00.000Z |
| | | 2019-04-01T12:55:14.015Z | 55 | 2019-04-01T12:55:00.000Z |
| Second | so | 2019-01-01T12:13:01.015Z | 1 | 2019-01-01T12:13:01.000Z |
| | | 2019-04-01T12:13:55.015Z | 55 | 2019-04-01T12:13:55.000Z |
| Hour [1-12] | ho | 2019-02-11T11:13:14.015Z | 11 時 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 11 時 | 2019-02-11T23:00:00.000Z |
| Hour [0-23] | Ho | 2019-02-11T11:13:14.015Z | 11 時 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 23 時 | 2019-02-11T23:00:00.000Z |
| Hour [0-11] | Ko | 2019-02-11T11:13:14.015Z | 11 時 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 11 時 | 2019-02-11T23:00:00.000Z |
| Hour [1-24] | ko | 2019-02-11T11:13:14.015Z | 11 時 | 2019-02-11T11:00:00.000Z |
| | | 2019-02-11T23:13:14.015Z | 23 時 | 2019-02-11T23:00:00.000Z |
| Minute | mo | 2019-01-01T12:01:14.015Z | 1 分 | 2019-01-01T12:01:00.000Z |
| | | 2019-04-01T12:55:14.015Z | 55 分 | 2019-04-01T12:55:00.000Z |
| Second | so | 2019-01-01T12:13:01.015Z | 1 秒 | 2019-01-01T12:13:01.000Z |
| | | 2019-04-01T12:13:55.015Z | 55 秒 | 2019-04-01T12:13:55.000Z |
| Long localized date | P | 1987-02-11T12:13:14.015Z | 1987/02/11 | 1987-02-11T00:00:00.000Z |
| | | 1453-05-29T23:59:59.999Z | 1453/05/29 | 1453-05-29T00:00:00.000Z |
| | PP | 1987-02-11T12:13:14.015Z | 1987/02/11 | 1987-02-11T00:00:00.000Z |
Expand Down