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: change back fa locale to the Gregorian calendar equivalent #2411

Merged
merged 1 commit into from
Sep 19, 2023

Conversation

raminjafary
Copy link
Contributor

@raminjafary raminjafary commented Aug 12, 2023

This PR (#2151) is getting it wrong by simply translating months to Solar Hijri calendar but not taking care of solar calendar's date and time transformations. Dayjs' locale provides literal translations of the Gregory calendar's months which are correct. I believe the referenced PR should be reverted to avoid misunderstanding.

Fixes #2151

@amirhmoradi
Copy link

@iamkun hi,
I agree with this PR by @raminjafary
Imho, it shall probably be in the next release.

Being a farsi (persian) native speaker I confirm the PR as it translates month names, as is the system is intended to do in i18n files.

I created the dayjs calendar systems plugin (https://github.com/calidy-com/dayjs-calendarsystems) to address calendar system conversions between all (gregory and non-gregorian) calendars.

@mokhosh
Copy link

mokhosh commented Aug 14, 2023

This is a must merge, would be great to have this sooner.

@iamkun
Copy link
Owner

iamkun commented Sep 19, 2023

Thanks, and sorry for the inconvenience.

@iamkun iamkun merged commit 95e9458 into iamkun:dev Sep 19, 2023
github-actions bot pushed a commit that referenced this pull request Sep 19, 2023
## [1.11.10](v1.11.9...v1.11.10) (2023-09-19)

### Bug Fixes

* Add Korean Day of Month with ordinal ([#2395](#2395)) ([dd55ee2](dd55ee2))
* change back fa locale to the Gregorian calendar equivalent ([#2411](#2411)) ([95e9458](95e9458))
* duration plugin - MILLISECONDS_A_MONTH const calculation ([#2362](#2362)) ([f0a0b54](f0a0b54))
* duration plugin getter get result  0 instead of undefined ([#2369](#2369)) ([061aa7e](061aa7e))
* fix isDayjs check logic ([#2383](#2383)) ([5f3f878](5f3f878))
* fix timezone plugin to get correct locale setting ([#2420](#2420)) ([4f45012](4f45012))
* **locale:** add meridiem in `ar` locale ([#2418](#2418)) ([361be5c](361be5c))
* round durations to millisecond precision for ISO string ([#2367](#2367)) ([890a17a](890a17a))
* sub-second precisions need to be rounded at the seconds field to avoid adding floats ([#2377](#2377)) ([a9d7d03](a9d7d03))
* update $x logic to avoid plugin error ([#2429](#2429)) ([2254635](2254635))
* Update Slovenian locale for relative time ([#2396](#2396)) ([5470a15](5470a15))
* update uzbek language translation ([#2327](#2327)) ([0a91056](0a91056))
@github-actions
Copy link

🎉 This PR is included in version 1.11.10 🎉

The release is available on:

Your semantic-release bot 📦🚀

@amirhmoradi
Copy link

thanks @iamkun 🙏

BePo65 pushed a commit to BePo65/dayjs that referenced this pull request Sep 20, 2023
## [1.11.10](iamkun/dayjs@v1.11.9...v1.11.10) (2023-09-19)

### Bug Fixes

* Add Korean Day of Month with ordinal ([iamkun#2395](iamkun#2395)) ([dd55ee2](iamkun@dd55ee2))
* change back fa locale to the Gregorian calendar equivalent ([iamkun#2411](iamkun#2411)) ([95e9458](iamkun@95e9458))
* duration plugin - MILLISECONDS_A_MONTH const calculation ([iamkun#2362](iamkun#2362)) ([f0a0b54](iamkun@f0a0b54))
* duration plugin getter get result  0 instead of undefined ([iamkun#2369](iamkun#2369)) ([061aa7e](iamkun@061aa7e))
* fix isDayjs check logic ([iamkun#2383](iamkun#2383)) ([5f3f878](iamkun@5f3f878))
* fix timezone plugin to get correct locale setting ([iamkun#2420](iamkun#2420)) ([4f45012](iamkun@4f45012))
* **locale:** add meridiem in `ar` locale ([iamkun#2418](iamkun#2418)) ([361be5c](iamkun@361be5c))
* round durations to millisecond precision for ISO string ([iamkun#2367](iamkun#2367)) ([890a17a](iamkun@890a17a))
* sub-second precisions need to be rounded at the seconds field to avoid adding floats ([iamkun#2377](iamkun#2377)) ([a9d7d03](iamkun@a9d7d03))
* update $x logic to avoid plugin error ([iamkun#2429](iamkun#2429)) ([2254635](iamkun@2254635))
* Update Slovenian locale for relative time ([iamkun#2396](iamkun#2396)) ([5470a15](iamkun@5470a15))
* update uzbek language translation ([iamkun#2327](iamkun#2327)) ([0a91056](iamkun@0a91056))
BePo65 pushed a commit to BePo65/dayjs that referenced this pull request Sep 23, 2023
## [1.11.10](iamkun/dayjs@v1.11.9...v1.11.10) (2023-09-19)

### Bug Fixes

* Add Korean Day of Month with ordinal ([iamkun#2395](iamkun#2395)) ([dd55ee2](iamkun@dd55ee2))
* change back fa locale to the Gregorian calendar equivalent ([iamkun#2411](iamkun#2411)) ([95e9458](iamkun@95e9458))
* duration plugin - MILLISECONDS_A_MONTH const calculation ([iamkun#2362](iamkun#2362)) ([f0a0b54](iamkun@f0a0b54))
* duration plugin getter get result  0 instead of undefined ([iamkun#2369](iamkun#2369)) ([061aa7e](iamkun@061aa7e))
* fix isDayjs check logic ([iamkun#2383](iamkun#2383)) ([5f3f878](iamkun@5f3f878))
* fix timezone plugin to get correct locale setting ([iamkun#2420](iamkun#2420)) ([4f45012](iamkun@4f45012))
* **locale:** add meridiem in `ar` locale ([iamkun#2418](iamkun#2418)) ([361be5c](iamkun@361be5c))
* round durations to millisecond precision for ISO string ([iamkun#2367](iamkun#2367)) ([890a17a](iamkun@890a17a))
* sub-second precisions need to be rounded at the seconds field to avoid adding floats ([iamkun#2377](iamkun#2377)) ([a9d7d03](iamkun@a9d7d03))
* update $x logic to avoid plugin error ([iamkun#2429](iamkun#2429)) ([2254635](iamkun@2254635))
* Update Slovenian locale for relative time ([iamkun#2396](iamkun#2396)) ([5470a15](iamkun@5470a15))
* update uzbek language translation ([iamkun#2327](iamkun#2327)) ([0a91056](iamkun@0a91056))
splashwizard pushed a commit to splashwizard/tracking-time that referenced this pull request Oct 21, 2024
## [1.11.10](iamkun/dayjs@v1.11.9...v1.11.10) (2023-09-19)

### Bug Fixes

* Add Korean Day of Month with ordinal ([#2395](iamkun/dayjs#2395)) ([dd55ee2](iamkun/dayjs@dd55ee2))
* change back fa locale to the Gregorian calendar equivalent ([#2411](iamkun/dayjs#2411)) ([95e9458](iamkun/dayjs@95e9458))
* duration plugin - MILLISECONDS_A_MONTH const calculation ([#2362](iamkun/dayjs#2362)) ([f0a0b54](iamkun/dayjs@f0a0b54))
* duration plugin getter get result  0 instead of undefined ([#2369](iamkun/dayjs#2369)) ([061aa7e](iamkun/dayjs@061aa7e))
* fix isDayjs check logic ([#2383](iamkun/dayjs#2383)) ([5f3f878](iamkun/dayjs@5f3f878))
* fix timezone plugin to get correct locale setting ([#2420](iamkun/dayjs#2420)) ([4f45012](iamkun/dayjs@4f45012))
* **locale:** add meridiem in `ar` locale ([#2418](iamkun/dayjs#2418)) ([361be5c](iamkun/dayjs@361be5c))
* round durations to millisecond precision for ISO string ([#2367](iamkun/dayjs#2367)) ([890a17a](iamkun/dayjs@890a17a))
* sub-second precisions need to be rounded at the seconds field to avoid adding floats ([#2377](iamkun/dayjs#2377)) ([a9d7d03](iamkun/dayjs@a9d7d03))
* update $x logic to avoid plugin error ([#2429](iamkun/dayjs#2429)) ([2254635](iamkun/dayjs@2254635))
* Update Slovenian locale for relative time ([#2396](iamkun/dayjs#2396)) ([5470a15](iamkun/dayjs@5470a15))
* update uzbek language translation ([#2327](iamkun/dayjs#2327)) ([0a91056](iamkun/dayjs@0a91056))
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.

4 participants