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

fix: Allow customizing "am" / "pm" strings with locale meridiem function #580

Merged
merged 3 commits into from
Apr 26, 2019

Conversation

iamkun
Copy link
Owner

@iamkun iamkun commented Apr 25, 2019

fix #578


IssueHunt Summary

Referenced issues

This pull request has been submitted to:


IssueHunt has been backed by the following sponsors. Become a sponsor

@codecov-io
Copy link

codecov-io commented Apr 25, 2019

Codecov Report

Merging #580 into dev will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@         Coverage Diff         @@
##            dev   #580   +/-   ##
===================================
  Coverage   100%   100%           
===================================
  Files       154    154           
  Lines       966    970    +4     
  Branches    131    135    +4     
===================================
+ Hits        966    970    +4
Impacted Files Coverage Δ
src/locale/ja.js 100% <100%> (ø) ⬆️
src/index.js 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0aa7143...cd4e31f. Read the comment docs.

@@ -19,6 +19,7 @@ const locale = {
lll: 'YYYY年M月D日 HH:mm',
llll: 'YYYY年M月D日(ddd) HH:mm'
},
Copy link
Contributor

Choose a reason for hiding this comment

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

is it evey locale have this method ?

Copy link

Choose a reason for hiding this comment

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

if locale need other than am/pm might need this. moment.js'locale file is a good reference

Copy link
Contributor

Choose a reason for hiding this comment

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

lgtm, if we have updated documentation too 👍

@@ -305,8 +310,8 @@ class Dayjs {
HH: Utils.s(this.$H, 2, '0'),
h: get$H(1),
hh: get$H(2),
a: this.$H < 12 ? 'am' : 'pm',
A: this.$H < 12 ? 'AM' : 'PM',
a: meridiemFunc(this.$H, this.$m, true),
Copy link
Contributor

Choose a reason for hiding this comment

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

what if you change the name a into am thats readable object or key, wdyt ?

Copy link

Choose a reason for hiding this comment

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

I think no. This lib is designed to keep the same with moment.js

Copy link
Contributor

Choose a reason for hiding this comment

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

got it

@iamkun iamkun merged commit 576e93e into dev Apr 26, 2019
@iamkun iamkun deleted the fix/am_pm branch April 26, 2019 06:46
iamkun pushed a commit that referenced this pull request Apr 26, 2019
## [1.8.13](v1.8.12...v1.8.13) (2019-04-26)

### Bug Fixes

* Add missing relativeTime and formats for some locales ([#560](#560)) ([96b917e](96b917e))
* Add weekday (locale aware day of the week) plugin ([#569](#569)) ([9007cc5](9007cc5)), closes [#559](#559)
* Allow customizing "am" / "pm" strings with locale meridiem function ([#580](#580)) ([576e93e](576e93e)), closes [#578](#578)
* Fix `.add` day/week decimal rouding bug ([800f6c9](800f6c9))
* Fix `.diff` type definition error ([#565](#565)) ([c4921ae](c4921ae)), closes [#561](#561)
* Fix CustomParseFormat plugin bug ([#568](#568)) ([1f5a9db](1f5a9db)), closes [#555](#555)
* Fix relativeTime plugin Math.round bug ([40bea40](40bea40))
* skip square brackets in  buddhistEra, advancedFormat plugins ([#556](#556)) ([9279718](9279718)), closes [#554](#554)
* Update Indonesian locale([#574](#574)) ([0aa7143](0aa7143))
* Update locale month to support both array and function ([#581](#581)) ([b6599d3](b6599d3))
* Update LocalizedFormat plugin lowercase formats logic ([#557](#557)) ([d409304](d409304))
@iamkun
Copy link
Owner Author

iamkun commented Apr 26, 2019

🎉 This PR is included in version 1.8.13 🎉

The release is available on:

Your semantic-release bot 📦🚀

@gka
Copy link

gka commented Apr 30, 2019

yay, thanks!

andrewhood125ruhuc added a commit to andrewhood125ruhuc/SidRH2 that referenced this pull request May 10, 2022
## [1.8.13](iamkun/dayjs@v1.8.12...v1.8.13) (2019-04-26)

### Bug Fixes

* Add missing relativeTime and formats for some locales ([#560](iamkun/dayjs#560)) ([96b917e](iamkun/dayjs@96b917e))
* Add weekday (locale aware day of the week) plugin ([#569](iamkun/dayjs#569)) ([9007cc5](iamkun/dayjs@9007cc5)), closes [#559](iamkun/dayjs#559)
* Allow customizing "am" / "pm" strings with locale meridiem function ([#580](iamkun/dayjs#580)) ([576e93e](iamkun/dayjs@576e93e)), closes [#578](iamkun/dayjs#578)
* Fix `.add` day/week decimal rouding bug ([800f6c9](iamkun/dayjs@800f6c9))
* Fix `.diff` type definition error ([#565](iamkun/dayjs#565)) ([c4921ae](iamkun/dayjs@c4921ae)), closes [#561](iamkun/dayjs#561)
* Fix CustomParseFormat plugin bug ([#568](iamkun/dayjs#568)) ([1f5a9db](iamkun/dayjs@1f5a9db)), closes [#555](iamkun/dayjs#555)
* Fix relativeTime plugin Math.round bug ([40bea40](iamkun/dayjs@40bea40))
* skip square brackets in  buddhistEra, advancedFormat plugins ([#556](iamkun/dayjs#556)) ([9279718](iamkun/dayjs@9279718)), closes [#554](iamkun/dayjs#554)
* Update Indonesian locale([#574](iamkun/dayjs#574)) ([0aa7143](iamkun/dayjs@0aa7143))
* Update locale month to support both array and function ([#581](iamkun/dayjs#581)) ([b6599d3](iamkun/dayjs@b6599d3))
* Update LocalizedFormat plugin lowercase formats logic ([#557](iamkun/dayjs#557)) ([d409304](iamkun/dayjs@d409304))
andrewhood125ruhuc added a commit to andrewhood125ruhuc/SidRH2 that referenced this pull request May 10, 2022
## [1.8.13](iamkun/dayjs@v1.8.12...v1.8.13) (2019-04-26)

### Bug Fixes

* Add missing relativeTime and formats for some locales ([#560](iamkun/dayjs#560)) ([96b917e](iamkun/dayjs@96b917e))
* Add weekday (locale aware day of the week) plugin ([#569](iamkun/dayjs#569)) ([9007cc5](iamkun/dayjs@9007cc5)), closes [#559](iamkun/dayjs#559)
* Allow customizing "am" / "pm" strings with locale meridiem function ([#580](iamkun/dayjs#580)) ([576e93e](iamkun/dayjs@576e93e)), closes [#578](iamkun/dayjs#578)
* Fix `.add` day/week decimal rouding bug ([800f6c9](iamkun/dayjs@800f6c9))
* Fix `.diff` type definition error ([#565](iamkun/dayjs#565)) ([c4921ae](iamkun/dayjs@c4921ae)), closes [#561](iamkun/dayjs#561)
* Fix CustomParseFormat plugin bug ([#568](iamkun/dayjs#568)) ([1f5a9db](iamkun/dayjs@1f5a9db)), closes [#555](iamkun/dayjs#555)
* Fix relativeTime plugin Math.round bug ([40bea40](iamkun/dayjs@40bea40))
* skip square brackets in  buddhistEra, advancedFormat plugins ([#556](iamkun/dayjs#556)) ([9279718](iamkun/dayjs@9279718)), closes [#554](iamkun/dayjs#554)
* Update Indonesian locale([#574](iamkun/dayjs#574)) ([0aa7143](iamkun/dayjs@0aa7143))
* Update locale month to support both array and function ([#581](iamkun/dayjs#581)) ([b6599d3](iamkun/dayjs@b6599d3))
* Update LocalizedFormat plugin lowercase formats logic ([#557](iamkun/dayjs#557)) ([d409304](iamkun/dayjs@d409304))
splashwizard pushed a commit to splashwizard/tracking-time that referenced this pull request Oct 21, 2024
## [1.8.13](iamkun/dayjs@v1.8.12...v1.8.13) (2019-04-26)

### Bug Fixes

* Add missing relativeTime and formats for some locales ([#560](iamkun/dayjs#560)) ([96b917e](iamkun/dayjs@96b917e))
* Add weekday (locale aware day of the week) plugin ([#569](iamkun/dayjs#569)) ([9007cc5](iamkun/dayjs@9007cc5)), closes [#559](iamkun/dayjs#559)
* Allow customizing "am" / "pm" strings with locale meridiem function ([#580](iamkun/dayjs#580)) ([576e93e](iamkun/dayjs@576e93e)), closes [#578](iamkun/dayjs#578)
* Fix `.add` day/week decimal rouding bug ([800f6c9](iamkun/dayjs@800f6c9))
* Fix `.diff` type definition error ([#565](iamkun/dayjs#565)) ([c4921ae](iamkun/dayjs@c4921ae)), closes [#561](iamkun/dayjs#561)
* Fix CustomParseFormat plugin bug ([#568](iamkun/dayjs#568)) ([1f5a9db](iamkun/dayjs@1f5a9db)), closes [#555](iamkun/dayjs#555)
* Fix relativeTime plugin Math.round bug ([40bea40](iamkun/dayjs@40bea40))
* skip square brackets in  buddhistEra, advancedFormat plugins ([#556](iamkun/dayjs#556)) ([9279718](iamkun/dayjs@9279718)), closes [#554](iamkun/dayjs#554)
* Update Indonesian locale([#574](iamkun/dayjs#574)) ([0aa7143](iamkun/dayjs@0aa7143))
* Update locale month to support both array and function ([#581](iamkun/dayjs#581)) ([b6599d3](iamkun/dayjs@b6599d3))
* Update LocalizedFormat plugin lowercase formats logic ([#557](iamkun/dayjs#557)) ([d409304](iamkun/dayjs@d409304))
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.

Allow customizing "am" / "pm" strings with locale
4 participants