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

CLDR-14954 Add Abkhazian locale to CLDR #1402

Merged
merged 1 commit into from
Aug 16, 2021
Merged

CLDR-14954 Add Abkhazian locale to CLDR #1402

merged 1 commit into from
Aug 16, 2021

Conversation

danielinux7
Copy link
Contributor

@danielinux7 danielinux7 commented Aug 9, 2021

CLDR-14954

  • This PR completes the ticket.
  • Updated PR title and link in previous line to include Issue number.

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295
Copy link
Member

srl295 commented Aug 10, 2021

Followon from #1392

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@danielinux7
Copy link
Contributor Author

danielinux7 commented Aug 11, 2021

Error: (TestBasic.java:815) : likelyMax(locale=ab_JO) == likelyMax(defaultContent=ab): expected "ab_Cyrl_GE", got "ab_Cyrl_JO"

java.lang.InternalError: SupplementalData.defaultContentToChild(): defaultContent list in wrong order? Tried to map ab -> ab_JO, replacing ab_GE
Hello,
@srl295 would you have an idea how to fix these errors?

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@@ -10,7 +10,7 @@
<!-- This list contains ONLY those languages considered to be 'of interest' as part of CLDR, -->
<!-- and is maintained manually by the CLDR TC -->
<variable id='$language' type='choice'>
af agq ak am ar as asa ast az
ab af agq ak am ar as asa ast az
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure this is supposed to move here, this is not 'all locales'.

Copy link
Member

Choose a reason for hiding this comment

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

@macchiati might know. This is all probably too late for cldr v40

Copy link
Member

Choose a reason for hiding this comment

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

@danielinux7 why was ab moved here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@srl295 I looked at what others did to add a new locale and I did the same.
This is one of the files they modified.
https://unicode-org.atlassian.net/browse/CLDR-13901

@@ -1652,7 +1652,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<zoneAlias type="Asia/Kashgar" replacement="Asia/Urumqi" reason="deprecated"/>
</alias>
<defaultContent locales="
aa_ET af_ZA agq_CM ak_GH am_ET an_ES ar_001 arn_CL as_IN asa_TZ ast_ES
aa_ET ab_GE ab_JO ab_RU ab_SY ab_TR af_ZA agq_CM ak_GH am_ET an_ES ar_001 arn_CL as_IN asa_TZ ast_ES
Copy link
Member

Choose a reason for hiding this comment

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

need to choose just one. Maybe just ab_TR if most speakers are there?

@srl295 srl295 requested a review from macchiati August 11, 2021 17:08
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

1 similar comment
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

srl295
srl295 previously approved these changes Aug 11, 2021
Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

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

looking better

Copy link
Member

@srl295 srl295 left a comment

Choose a reason for hiding this comment

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

needs to pass tests

@srl295 srl295 self-requested a review August 11, 2021 18:51
@danielinux7
Copy link
Contributor Author

danielinux7 commented Aug 11, 2021

@srl295 I kept ab_TR but I am still getting these errors:
Error: (TestBasic.java:815) : likelyMax(locale=ab_TR) == likelyMax(defaultContent=ab): expected "ab_Cyrl_GE", got "ab_Cyrl_TR"

Error: (TestInheritance.java:604) likely subtag inconsistent with default contents: ab =>( dc) ab_TR ab => (ls) ab_Cyrl_GE

I think it has to do with this file:
cldr/common/supplemental/likelySubtags.xml

@srl295
Copy link
Member

srl295 commented Aug 11, 2021

@srl295 I kept ab_TR but I am still getting these errors:
Error: (TestBasic.java:815) : likelyMax(locale=ab_TR) == likelyMax(defaultContent=ab): expected "ab_Cyrl_GE", got "ab_Cyrl_TR"

Error: (TestInheritance.java:604) likely subtag inconsistent with default contents: ab =>( dc) ab_TR ab => (ls) ab_Cyrl_GE

I think it has to do with this file:
cldr/common/supplemental/likelySubtags.xml

Probably due to population (?) it may consider GE a more likely defaultContent. Is that possible? should ab_GE be the default content?

@danielinux7
Copy link
Contributor Author

Probably due to population (?) it may consider GE a more likely defaultContent. Is that possible? should ab_GE be the default content?

defaultContent should be ab_AB, Abkhazia which is partially a recognized territory, but not getting into this mess right now, I want to just add the language to v40.
Let defaultContent be just ab without territory.

@srl295
Copy link
Member

srl295 commented Aug 11, 2021

Probably due to population (?) it may consider GE a more likely defaultContent. Is that possible? should ab_GE be the default content?

defaultContent should be ab_AB, Abkhazia which is partially a recognized territory, but not getting into this mess right now, I want to just add the language to v40.
Let defaultContent be just ab without territory.

needs a territory. can you set ab_GE?

and as i said this might not make v40 but perhaps right after

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

1 similar comment
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@danielinux7
Copy link
Contributor Author

needs a territory. can you set ab_GE?

Done.

and as i said this might not make v40 but perhaps right after

Okay, I'll do what I can from my end to update the survey tool with the required data. It would be nice to have it in v40.

The test is passing.

@danielinux7 danielinux7 marked this pull request as draft August 13, 2021 14:10
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

1 similar comment
@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@danielinux7 danielinux7 marked this pull request as ready for review August 13, 2021 17:01
@danielinux7
Copy link
Contributor Author

@srl295
Hello Steven,
I made the changes and the tests are passing.

@srl295
Copy link
Member

srl295 commented Aug 13, 2021

@danielinux7 I'm rerunning tests

@jira-pull-request-webhook
Copy link

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

@danielinux7
Copy link
Contributor Author

@srl295 @pedberg-icu
I removed ab_TR.
Is this looking good?

@srl295
Copy link
Member

srl295 commented Aug 13, 2021

tests are passing. I've asked the CLDR-TC about approving the ticket.

@srl295 srl295 self-assigned this Aug 13, 2021
@srl295
Copy link
Member

srl295 commented Aug 13, 2021

@pedberg-icu look OK to you now?

@srl295 srl295 merged commit 0e1341e into unicode-org:master Aug 16, 2021
@pedberg-icu
Copy link
Contributor

Yes, looks good to me.

saagarjha pushed a commit to ahjragaas/glibc that referenced this pull request Dec 16, 2021
Add the Abkhazian language in the Georgia territory

The ab_GE was just recently added to CLDR, it should be available
in CLDR v41, unicode-org/cldr#1402

The Abkhazian language has been added to Gnome for localization

The locale has been tested on Ubuntu 20.04, Mint 20.2 and Fedora 35 Beta

Signed-off-by: Nart Tlisha <daniel.abzakh@gmail.com>
Reviewed-by: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants