Skip to content

Commit e363522

Browse files
iamkuniamkun
authored
Merge branch 'dev' into master
2 parents 55e89bf + a947a51 commit e363522

File tree

11 files changed

+52
-34
lines changed

11 files changed

+52
-34
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ English | [简体中文](./docs/zh-cn/README.zh-CN.md) | [日本語](./docs/ja/R
1010
alt="Gzip Size"></a>
1111
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
1212
alt="NPM Version"></a>
13-
<a href="https://travis-ci.com/iamkun/dayjs"><img
14-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
13+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
14+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1515
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1616
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1717
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎docs/es-es/README-es-es.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Español (España) | [English](../../README.md) | [简体中文](../zh-cn/README.zh-CN.md) | [日本語](../ja/README-ja.md) | [Português Brasileiro](../pt-br/README-pt-br.md) | [한국어](../ko/README-ko.md) | [Русский](../ru/README-ru.md) | [עברית](./docs/he/README-he.md)
1+
Español (España) | [English](../../README.md) | [简体中文](../zh-cn/README.zh-CN.md) | [日本語](../ja/README-ja.md) | [Português Brasileiro](../pt-br/README-pt-br.md) | [한국어](../ko/README-ko.md) | [Русский](../ru/README-ru.md) | [עברית](./docs/he/README-he.md)
22

33
<p align="center"><a href="https://day.js.org/" target="_blank" rel="noopener noreferrer"><img width="550"
44
src="https://user-images.githubusercontent.com/17680888/39081119-3057bbe2-456e-11e8-862c-646133ad4b43.png"
@@ -11,8 +11,8 @@ Español (España) | [English](../../README.md) | [简体中文](../zh-cn/README
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎docs/he/README-he.md

+11-12
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
alt="Gzip Size"></a>
1313
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
1414
alt="NPM Version"></a>
15-
<a href="https://travis-ci.com/iamkun/dayjs"><img
16-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
15+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
16+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1717
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1818
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1919
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img
@@ -24,7 +24,7 @@
2424
</a>
2525
</p>
2626

27-
> Day.js היא ספרייה מינימלסטית לפענוח, אימות, מניפולציה והצגה של תאריכים ושעות לדפדפנים מודרנים עם תאימות גבוהה ל-API של Moment.js. אם השתמשתם ב-Moment.js, אתם כבר יודעים את Day.js
27+
> Day.js היא ספרייה מינימלסטית לפענוח, אימות, מניפולציה והצגה של תאריכים ושעות לדפדפנים מודרנים עם תאימות גבוהה ל-API של Moment.js. אם השתמשתם ב-Moment.js, אתם כבר יודעים את Day.js
2828
2929
<div dir="ltr">
3030

@@ -43,13 +43,13 @@ dayjs().startOf('month').add(1, 'day').set('year', 2018).format('YYYY-MM-DD HH:m
4343

4444
---
4545

46-
## צעדים ראשונים
46+
## צעדים ראשונים
4747

48-
### דוקומנטצייה
48+
### דוקומנטצייה
4949
באתר [day.js.org](https://day.js.org/) ניתן למצוא פרטים נוספים, API, ותיעודים נוספים.
5050

5151

52-
### התקנה
52+
### התקנה
5353

5454
```console
5555
npm install dayjs --save
@@ -58,7 +58,7 @@ npm install dayjs --save
5858
📚[מדריך התקנה](https://day.js.org/docs/en/installation/installation)
5959

6060
### API
61-
מאוד קל להשתמש ב-Day.js לפענוח, אימות, מניפולציה והצגה של תאריכים ושעות.
61+
מאוד קל להשתמש ב-Day.js לפענוח, אימות, מניפולציה והצגה של תאריכים ושעות.
6262

6363
<div dir="ltr">
6464

@@ -126,9 +126,8 @@ dayjs().format('Q Do k kk X x') // כעת יותר אפשרויות זמינות
126126
<img src="https://user-images.githubusercontent.com/3455798/270162667-c7bd2ebe-675e-45c6-a2c9-dc67f3b65d6e.png">
127127
</a>
128128

129-
## ספונסרים
130-
תמכו בפרויקט זה כדי להיות ספונסר. קבלו לוגו עם קישור לאתר שלכם שיופיע כאן.
131-
129+
### ספונסרים
130+
תמכו בפרויקט זה כדי להיות ספונסר. קבלו לוגו עם קישור לאתר שלכם שיופיע כאן.
132131

133132
[[תמיכה דרך Github](https://github.com/sponsors/iamkun/)] [[תמיכה דרך OpenCollective](https://opencollective.com/dayjs#sponsor)]
134133

@@ -156,7 +155,7 @@ dayjs().format('Q Do k kk X x') // כעת יותר אפשרויות זמינות
156155
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
157156
<a href="https://opencollective.com/datawrapper" target="_blank"><img width="70" src="https://images.opencollective.com/datawrapper/c13e229/logo.png"></a>
158157

159-
## תורמים
158+
## תורמים
160159

161160
פרויקט זה קיים הודות לכל האנשים שתמכו בו.
162161

@@ -171,7 +170,7 @@ dayjs().format('Q Do k kk X x') // כעת יותר אפשרויות זמינות
171170
<br />
172171
<a href="https://opencollective.com/dayjs#backers" target="_blank"><img src="https://opencollective.com/dayjs/contributors.svg?width=890" /></a>
173172

174-
## רישיון
173+
## רישיון
175174

176175
Day.js מורשה לשימוש עם [רישיון MIT](./LICENSE).
177176
</div>

‎docs/ja/README-ja.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎docs/ko/README-ko.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎docs/pt-br/README-pt-br.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Português Brasileiro | [English](../../README.md) | [简体中文](../zh-cn/REA
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎docs/ru/README-ru.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img
@@ -78,7 +78,7 @@ Day.js обладает великолепной поддержкой интер
7878
```javascript
7979
import 'dayjs/locale/es' // загрузка по требованию
8080

81-
dayjs.locale('es') // глобальное использование Испанской локали
81+
dayjs.locale('es') // глобальное использование Испанской локали
8282

8383
dayjs('2018-05-05').locale('zh-cn').format() // использование упрощённой Китайской локали в конкретном случае
8484
```

‎docs/si/README-si.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
alt="Gzip Size"></a>
1111
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
1212
alt="NPM Version"></a>
13-
<a href="https://travis-ci.com/iamkun/dayjs"><img
14-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
13+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
14+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1515
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1616
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1717
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img
@@ -106,7 +106,7 @@ dayjs().format('Q Do k kk X x') // more available formats
106106

107107
## අනුග්‍රාහකයින්
108108

109-
අනුග්‍රහය දැක්වීමෙන් මෙම ව්‍යාපෘතියට සහාය වන්න. ඔබගේ අඩවියේ සබැඳියක් සමඟ ඔබගේ ලාංඡනය මෙහි පෙන්වනු ඇත.
109+
අනුග්‍රහය දැක්වීමෙන් මෙම ව්‍යාපෘතියට සහාය වන්න. ඔබගේ අඩවියේ සබැඳියක් සමඟ ඔබගේ ලාංඡනය මෙහි පෙන්වනු ඇත.
110110

111111
[[ගිට්හබ් හරහා අනුග්‍රාහකයෙකු වන්න](https://github.com/sponsors/iamkun/)] [[ඕපන්කලෙක්ටිව් හරහා අනුග්‍රාහකයෙකු වන්න](https://opencollective.com/dayjs#sponsor)]
112112

‎docs/tr/README-tr.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Türkçe | [English](../../README.md) | [简体中文](../zh-cn/README.zh-CN.md)
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square&colorB=51C838"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎docs/zh-cn/README.zh-CN.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
alt="Gzip Size"></a>
1212
<a href="https://www.npmjs.com/package/dayjs"><img src="https://img.shields.io/npm/v/dayjs.svg?style=flat-square"
1313
alt="NPM Version"></a>
14-
<a href="https://travis-ci.org/iamkun/dayjs"><img
15-
src="https://img.shields.io/travis/iamkun/dayjs/master.svg?style=flat-square" alt="Build Status"></a>
14+
<a href="https://github.com/iamkun/dayjs/actions/workflows/check.yml"><img
15+
src="https://img.shields.io/github/actions/workflow/status/iamkun/dayjs/check.yml?style=flat-square" alt="Build Status"></a>
1616
<a href="https://codecov.io/gh/iamkun/dayjs"><img
1717
src="https://img.shields.io/codecov/c/github/iamkun/dayjs/master.svg?style=flat-square" alt="Codecov"></a>
1818
<a href="https://github.com/iamkun/dayjs/blob/master/LICENSE"><img

‎src/locale/zh-hk.js

+20-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ const locale = {
2222
L: 'YYYY/MM/DD',
2323
LL: 'YYYY年M月D日',
2424
LLL: 'YYYY年M月D日 HH:mm',
25-
LLLL: 'YYYY年M月D日dddd HH:mm'
25+
LLLL: 'YYYY年M月D日dddd HH:mm',
26+
l: 'YYYY/M/D',
27+
ll: 'YYYY年M月D日',
28+
lll: 'YYYY年M月D日 HH:mm',
29+
llll: 'YYYY年M月D日dddd HH:mm'
2630
},
2731
relativeTime: {
2832
future: '%s內',
@@ -38,6 +42,21 @@ const locale = {
3842
MM: '%d 個月',
3943
y: '一年',
4044
yy: '%d 年'
45+
},
46+
meridiem: (hour, minute) => {
47+
const hm = (hour * 100) + minute
48+
if (hm < 600) {
49+
return '凌晨'
50+
} else if (hm < 900) {
51+
return '早上'
52+
} else if (hm < 1100) {
53+
return '上午'
54+
} else if (hm < 1300) {
55+
return '中午'
56+
} else if (hm < 1800) {
57+
return '下午'
58+
}
59+
return '晚上'
4160
}
4261
}
4362

0 commit comments

Comments
 (0)