Fallback to language only locale + support uppercase locales #1524

codeability-ab · 2021-06-06T16:38:10Z

Fallback to locale xx if xx-yy is provided and does not exist

Also support locales in uppercase such as en-GB

…ot exist

codecov · 2021-06-06T16:39:52Z

Codecov Report

Merging #1524 (816f1e8) into dev (c5688f3) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               dev     #1524   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          176       176           
  Lines         1980      1984    +4     
  Branches       502       503    +1     
=========================================
+ Hits          1980      1984    +4

Impacted Files	Coverage Δ
src/index.js	`100.00% <100.00%> (ø)`

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 c5688f3...816f1e8. Read the comment docs.

codeability-ab · 2021-06-14T14:16:12Z

@iamkun will this pull request be considered for merge?

iamkun · 2021-06-28T06:54:58Z

src/index.js

+      Ls[presetLower] = object
+      l = presetLower
+    }
+    if (!l && preset.split('-').length > 1) {


maybe we can simplify the logic to
const presetSplit = preset.split('-')
if (!l && presetSplit.length) {
return parseLocale(presetSplit[0])
}

Yes. I'll fix it!

iamkun · 2021-06-28T08:41:09Z

test/plugin/localizedFormat.test.js

@@ -96,6 +96,16 @@ it('Uses the localized lowercase formats if defined', () => {
  ['l', 'll', 'lll', 'llll'].forEach(option => expect(znDate.format(option)).toBe(znDate.format(znCn.formats[option])))
 })

+it('Uses fallback to xx if xx-yy not available', () => {
+  expect(dayjs('2019-02-01').locale('es-yy').format('L'))


it will be more clear to use format('MMMM') to test if the locale is correct and not the default English

iamkun · 2021-06-29T07:55:42Z

src/index.js

+      l = presetLower
+    }
+    const presetSplit = preset.split('-')
+    if (!l && presetSplit.length > 1) {


if (!l && presetSplit.length) {

we could just check the length is above 0

That was my first attempt but other unit tests break if I don't check that the split actually splits the preset string (i.e it results in more than one array element).

The test "Not supported locale string fallback to previous one (instance)" in locale.test.js fails with "if (!l && presetSplit.length) {"

The "not_supported_locale_string" is split into one element => recursive call, "not_supported_locale_string" is split into one element again => recursive call ... etc

oh. I see, you can just change the "not_supported_locale_string" test string 😁

You mean like "not-supported-locale-string"?
But that string will never split into something valid.
I still think it's a good idea to only recurse if the preset actually splits into 2 parts.

codeability-ab · 2021-10-26T07:05:06Z

@iamkun is there anything stopping you from merging? Anything I need to do?

hirbod · 2022-02-11T17:34:07Z

I would love to see this PR merged. It is exactly fixing all the issues I've encountered on my React Native App, when trying to load the correct locale based on system preferences

codeability-ab · 2022-02-14T15:48:05Z

@iamkun Can we merge this one please?

iamkun · 2022-02-28T12:31:45Z

THX

# [1.11.0](v1.10.8...v1.11.0) (2022-03-14) ### Bug Fixes * Add Kirundi (rn) locale ([#1793](#1793)) ([74e5247](74e5247)) * add missing date shorthand D type definition ([#1752](#1752)) ([b045baf](b045baf)) * Add relative time to Galician (gl) and fix ordinals ([#1800](#1800)) ([dcbf170](dcbf170)) * update German locales (de-at, de-ch) ([#1775](#1775)) ([f9055a7](f9055a7)) * update Icelandic [is] locale relativeTime config ([#1796](#1796)) ([76f9e17](76f9e17)) * Update index.d.ts note ([#1716](#1716)) ([5a108ff](5a108ff)) * Update locale German [de] monthsShort ([#1746](#1746)) ([4a7b7d0](4a7b7d0)) * update meridiem function to Kurdish (ku) locale ([#1725](#1725)) ([efd3904](efd3904)) * update updateLocal plugin typescript types ([#1692](#1692)) ([c7a3f73](c7a3f73)) ### Features * Fallback to language only locale + support uppercase locales ([#1524](#1524)) ([9138dc2](9138dc2))

iamkun · 2022-03-14T17:02:19Z

🎉 This PR is included in version 1.11.0 🎉

The release is available on:

Your semantic-release bot 📦🚀

# [1.11.0](iamkun/dayjs@v1.10.8...v1.11.0) (2022-03-14) ### Bug Fixes * Add Kirundi (rn) locale ([#1793](iamkun/dayjs#1793)) ([74e5247](iamkun/dayjs@74e5247)) * add missing date shorthand D type definition ([#1752](iamkun/dayjs#1752)) ([b045baf](iamkun/dayjs@b045baf)) * Add relative time to Galician (gl) and fix ordinals ([#1800](iamkun/dayjs#1800)) ([dcbf170](iamkun/dayjs@dcbf170)) * update German locales (de-at, de-ch) ([#1775](iamkun/dayjs#1775)) ([f9055a7](iamkun/dayjs@f9055a7)) * update Icelandic [is] locale relativeTime config ([#1796](iamkun/dayjs#1796)) ([76f9e17](iamkun/dayjs@76f9e17)) * Update index.d.ts note ([#1716](iamkun/dayjs#1716)) ([5a108ff](iamkun/dayjs@5a108ff)) * Update locale German [de] monthsShort ([#1746](iamkun/dayjs#1746)) ([4a7b7d0](iamkun/dayjs@4a7b7d0)) * update meridiem function to Kurdish (ku) locale ([#1725](iamkun/dayjs#1725)) ([efd3904](iamkun/dayjs@efd3904)) * update updateLocal plugin typescript types ([#1692](iamkun/dayjs#1692)) ([c7a3f73](iamkun/dayjs@c7a3f73)) ### Features * Fallback to language only locale + support uppercase locales ([#1524](iamkun/dayjs#1524)) ([9138dc2](iamkun/dayjs@9138dc2))

Support uppercase region as in xx-ZZ + fallback to xx if xx-yy does n…

05f445b

…ot exist

codeability-ab mentioned this pull request Jun 7, 2021

Dayjs should fallback to locale xx if xx-YY is not supported #1523

Open

iamkun reviewed Jun 28, 2021

View reviewed changes

code review fix, split preset just once

0529560

iamkun reviewed Jun 28, 2021

View reviewed changes

review fixes + don't recurse if split length is 1

816f1e8

iamkun reviewed Jun 29, 2021

View reviewed changes

iamkun merged commit 9138dc2 into iamkun:dev Feb 28, 2022

iamkun added the released label Mar 14, 2022

codeability-ab deleted the issue-1523/fallback-to-language-only-locale branch March 20, 2022 18:29

barisbikmaz mentioned this pull request Apr 29, 2022

Handle unsupported locale also change global locale #1875

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fallback to language only locale + support uppercase locales #1524

Fallback to language only locale + support uppercase locales #1524

codeability-ab commented Jun 6, 2021

codecov bot commented Jun 6, 2021 •

edited

codeability-ab commented Jun 14, 2021

iamkun Jun 28, 2021

codeability-ab Jun 28, 2021

iamkun Jun 28, 2021

iamkun Jun 29, 2021

codeability-ab Jun 29, 2021

iamkun Jun 29, 2021

codeability-ab Jun 29, 2021

codeability-ab commented Oct 26, 2021

hirbod commented Feb 11, 2022

codeability-ab commented Feb 14, 2022

iamkun commented Feb 28, 2022

iamkun commented Mar 14, 2022

Fallback to language only locale + support uppercase locales #1524

Fallback to language only locale + support uppercase locales #1524

Conversation

codeability-ab commented Jun 6, 2021

codecov bot commented Jun 6, 2021 • edited

Codecov Report

codeability-ab commented Jun 14, 2021

iamkun Jun 28, 2021

Choose a reason for hiding this comment

codeability-ab Jun 28, 2021

Choose a reason for hiding this comment

iamkun Jun 28, 2021

Choose a reason for hiding this comment

iamkun Jun 29, 2021

Choose a reason for hiding this comment

codeability-ab Jun 29, 2021

Choose a reason for hiding this comment

iamkun Jun 29, 2021

Choose a reason for hiding this comment

codeability-ab Jun 29, 2021

Choose a reason for hiding this comment

codeability-ab commented Oct 26, 2021

hirbod commented Feb 11, 2022

codeability-ab commented Feb 14, 2022

iamkun commented Feb 28, 2022

iamkun commented Mar 14, 2022

codecov bot commented Jun 6, 2021 •

edited