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.

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

feat: Add locale (zh-tw) meridiem and update format #2149

Merged
merged 3 commits into from
Dec 5, 2022

Conversation

kevin82222
Copy link
Contributor

#171 Make zh-tw locale can display meridiem format

@kevin82222 kevin82222 changed the title feat: Add locale (zh-tw) meridiem feat: Add locale (zh-tw) meridiem and update format Dec 2, 2022
@@ -21,8 +21,8 @@ const locale = {
LTS: 'HH:mm:ss',
L: 'YYYY/MM/DD',
LL: 'YYYY年M月D日',
LLL: 'YYYY年M月D日 HH:mm',
LLLL: 'YYYY年M月D日dddd HH:mm',
LLL: 'YYYY年M月D日Ah點mm分',
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please revert these two lines to make the same with https://github.com/moment/moment/blob/develop/src/locale/zh-tw.js

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, revert it.

@codecov
Copy link

codecov bot commented Dec 4, 2022

Codecov Report

Merging #2149 (a0abee2) into dev (cbe91fd) will decrease coverage by 0.18%.
The diff coverage is 69.23%.

❗ Current head a0abee2 differs from pull request most recent head 2f1db06. Consider uploading reports for the commit 2f1db06 to get more accurate results

@@             Coverage Diff             @@
##               dev    #2149      +/-   ##
===========================================
- Coverage   100.00%   99.81%   -0.19%     
===========================================
  Files          183      183              
  Lines         2096     2109      +13     
  Branches       550      554       +4     
===========================================
+ Hits          2096     2105       +9     
- Misses           0        4       +4     
Impacted Files Coverage Δ
src/locale/zh-tw.js 80.95% <69.23%> (-19.05%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@iamkun
Copy link
Owner

iamkun commented Dec 4, 2022

LGTM, can you please add some tests to make the CI pass?

@kevin82222
Copy link
Contributor Author

test added.

@iamkun iamkun merged commit 1e9ba76 into iamkun:dev Dec 5, 2022
iamkun pushed a commit that referenced this pull request Dec 6, 2022
## [1.11.7](v1.11.6...v1.11.7) (2022-12-06)

### Bug Fixes

* Add locale (zh-tw) meridiem ([#2149](#2149)) ([1e9ba76](1e9ba76))
* update fa locale ([#2151](#2151)) ([1c26732](1c26732))
@iamkun
Copy link
Owner

iamkun commented Dec 6, 2022

🎉 This PR is included in version 1.11.7 🎉

The release is available on:

Your semantic-release bot 📦🚀

@iamkun iamkun added the released label Dec 6, 2022
epszaw pushed a commit to epszaw/dayjs that referenced this pull request Feb 18, 2023
## [1.11.7](iamkun/dayjs@v1.11.6...v1.11.7) (2022-12-06)

### Bug Fixes

* Add locale (zh-tw) meridiem ([iamkun#2149](iamkun#2149)) ([1e9ba76](iamkun@1e9ba76))
* update fa locale ([iamkun#2151](iamkun#2151)) ([1c26732](iamkun@1c26732))
jnorris-cs pushed a commit to catalystio/dayjs that referenced this pull request Mar 29, 2023
## [1.11.7](iamkun/dayjs@v1.11.6...v1.11.7) (2022-12-06)

### Bug Fixes

* Add locale (zh-tw) meridiem ([iamkun#2149](iamkun#2149)) ([1e9ba76](iamkun@1e9ba76))
* update fa locale ([iamkun#2151](iamkun#2151)) ([1c26732](iamkun@1c26732))
ohsory1324 pushed a commit to ohsory1324/dayjs that referenced this pull request Dec 20, 2023
ohsory1324 pushed a commit to ohsory1324/dayjs that referenced this pull request Dec 20, 2023
## [1.11.7](iamkun/dayjs@v1.11.6...v1.11.7) (2022-12-06)

### Bug Fixes

* Add locale (zh-tw) meridiem ([iamkun#2149](iamkun#2149)) ([1e9ba76](iamkun@1e9ba76))
* update fa locale ([iamkun#2151](iamkun#2151)) ([1c26732](iamkun@1c26732))
splashwizard pushed a commit to splashwizard/tracking-time that referenced this pull request Oct 21, 2024
## [1.11.7](iamkun/dayjs@v1.11.6...v1.11.7) (2022-12-06)

### Bug Fixes

* Add locale (zh-tw) meridiem ([#2149](iamkun/dayjs#2149)) ([1e9ba76](iamkun/dayjs@1e9ba76))
* update fa locale ([#2151](iamkun/dayjs#2151)) ([1c26732](iamkun/dayjs@1c26732))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants