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-16534 rename-islamic-to-hijri #2954

Merged
merged 1 commit into from
May 25, 2023

Conversation

stenshamn
Copy link
Contributor

CLDR-16534

  • This PR completes the ticket.

Note I also checked root.xml but it had no instances of this string, so it's English only.

ALLOW_MANY_COMMITS=true

macchiati
macchiati previously approved these changes May 24, 2023
@pedberg-icu
Copy link
Contributor

pedberg-icu commented May 24, 2023

@stenshamn Need to update the expected results in common/testData/localeIdentifiers/localeDisplayName.txt (search for Islamic...)

Copy link
Contributor

@pedberg-icu pedberg-icu left a comment

Choose a reason for hiding this comment

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

Need to update the expected results in common/testData/localeIdentifiers/localeDisplayName.txt (search for Islamic...) so tests pass.

It would also be good to update the descriptions for the islamic calendars in common/bcp47/calendar.xml

Copy link
Contributor Author

Choose a reason for hiding this comment

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

BTW, is the misspelling "islamicc" on line 32 intentional or should we fix that too?

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that is intentional, it is an (old) identifier not a name

@stenshamn
Copy link
Contributor Author

Also noting that I will hold off on merging this until #2951 is approved and merged, since we need both for the ticket.

@pedberg-icu pedberg-icu force-pushed the CLDR-16534-rename-islamic-to-hijri branch from 11f275e to aa36fcc Compare May 25, 2023 17:22
@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

Copy link
Contributor

@pedberg-icu pedberg-icu left a comment

Choose a reason for hiding this comment

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

Looks good now, thanks!

And no reason to hold off merging this until #2951 is merged, they do not conflict and do not need to be merged in a particular order.

@pedberg-icu
Copy link
Contributor

I will go ahead and merge....

@pedberg-icu pedberg-icu merged commit c024980 into main May 25, 2023
@macchiati
Copy link
Member

macchiati commented May 25, 2023 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants