CLDR-8823 Don't use Jan, Feb, for non-gregorian calendar systems #3861
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.unicode.cldr.util.*; | ||
|
|
||
| public class TestPathHeader { | ||
| static final String GREGORIAN = "gregorian"; | ||
|
|
||
| @Test | ||
| public void TestNonGregorianMonths() { | ||
| CLDRFile english = CLDRConfig.getInstance().getCldrFactory().make("en", true); | ||
| PathHeader.Factory phf = PathHeader.getFactory(null); | ||
| for (final String xpath : english.fullIterable()) { | ||
| // skip unless a month name | ||
| if (!xpath.startsWith("//ldml/dates/calendars/calendar")) continue; | ||
| if (!xpath.contains("/month[")) continue; | ||
| final PathHeader ph = phf.fromPath(xpath); | ||
| final String value = english.getStringValue(xpath); | ||
| // skip any null values. | ||
| if (value == null) continue; | ||
| // skip any hidden items | ||
| final XPathParts xpp = XPathParts.getFrozenInstance(xpath); | ||
| final String calType = xpp.getAttributes(3).get("type"); | ||
| // we skip Gregorian itself. | ||
| if (calType.equals(GREGORIAN)) continue; | ||
| // now, we need Gregorian for comparison. | ||
| final String gregopath = | ||
| xpp.cloneAsThawed().setAttribute("calendar", "type", GREGORIAN).toString(); | ||
| final String gregovalue = english.getStringValue(gregopath); | ||
| final PathHeader gph = phf.fromPath(gregopath); | ||
| if (gph.shouldHide()) continue; // hide if the *gregorian* is hidden. | ||
|
|
||
| if (gregovalue != null && value.equals(gregovalue)) { | ||
| // The month name is the same as the Gregorian. So we assume the codes will be the | ||
| // same. | ||
| if (!ph.shouldHide()) | ||
| assertEquals( | ||
| ph.getCode(), | ||
| gph.getCode(), | ||
| () -> | ||
| "Expected the same PathHeader code" | ||
| + ph | ||
| + " as Gregorian " | ||
| + gph | ||
| + " for xpath " | ||
| + xpath | ||
| + " because the month " | ||
| + value | ||
| + " was the same as gregorian " | ||
| + gregopath); | ||
| assertTrue( | ||
| ph.shouldHide(), | ||
| () -> | ||
| "Should be hidden. To fix: remove " | ||
| + calType | ||
| + " from the %G line of PathHeader.txt."); | ||
| } else { | ||
| assertNotEquals( | ||
| ph.getCode(), | ||
| gph.getCode(), | ||
| () -> | ||
| "Expected a different PathHeader code from Gregorian for xpath " | ||
| + xpath | ||
| + " because the month " | ||
| + value | ||
| + " was the differnet from gregorian " | ||
| + gregovalue | ||
| + "."); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should support not only gregorian, but also gregorian-based calendars. (Those that use the same 12 month solar calendar: Thai Buddhist, Julian, etc.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here are the calendars. Unfortunately, we don't have data here as to which is gregorian-based.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I ran a quick check, and it appears that the following are gregorian-based:
[gregoriy, iso8601, buddhist, japanese, roc]
Also filed a ticket to add metadata to cldr, so that this can be unhardcoded
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So actually it seems the pre existing "intent" was to hide those so that you don't have a Japanese month January with a different translation than Gregorian January. That mystified me too but I think that's why %G is just one and not the others
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@pedberg-icu should also weigh in on this.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it's here, then it's visible for editing. Do we want users giving a different translation for January in 8601 than for gregorian?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@macchiati Specifically, this PR does not make any changes to the visibility (HIDE) or textual content for these calendars:
iso8601, buddhist, japanese, roc.All that it does is change the following calendars to no longer have month codes based on Gregorian:
chinese|coptic|dangi|ethiopic|hebrew|indian|islamic|persian