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-6746 TestPaths to include seed and exemplars #604

Merged
merged 1 commit into from
Aug 18, 2020

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Aug 1, 2020

CLDR-6746

  • TestPaths needed to include seed and exemplars
  • two files had deprecate formats, fixed.

I moved the normalization mode out of the deprecated options, and removed the deprecated draftiness on RBNF.

  • Open Q for @macchiati in Jira, should the test enforce deprecation on the deprecated postalcode elements? (could be a separate PR)

seed/rbnf/nci.xml Outdated Show resolved Hide resolved
Copy link
Member

@macchiati macchiati left a comment

Choose a reason for hiding this comment

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

Forgot comment.

seed/rbnf/nci.xml Outdated Show resolved Hide resolved
@macchiati
Copy link
Member

macchiati commented Aug 2, 2020 via email

@srl295
Copy link
Member Author

srl295 commented Aug 3, 2020

@macchiati new error message (will be fixed by updating DtdData):

Error: (TestPaths.java:446) Deprecated attribute in data: ldml:rulesetGrouping:draft ;/Users/srl/src/cldr/seed/rbnf/nci.xml - consider adding to DtdData.DRAFT_ON_NON_LEAF_ALLOWED if you are sure this is ok.

But, 3e1fdaa in CLDR-9228 explicitly set deprecated draft status on rulesetGrouping.

unless this change to the dtd was an error, I've changed this to respect DRAFT_ON_NON_LEAF_ALLOWED in the DTD comment handling, so that rulesetGrouping's draft attribute is deprecated if there are no child elements.

@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • seed/rbnf/nci.xml is no longer changed in the branch
  • tools/cldr-unittest/src/org/unicode/cldr/unittest/TestPaths.java is different
  • tools/java/org/unicode/cldr/util/DtdData.java is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295 srl295 requested a review from macchiati August 3, 2020 18:18
Copy link
Member

@macchiati macchiati left a comment

Choose a reason for hiding this comment

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

Looks ok except for needing a different change than adding a test in case "@deprecated".

@@ -224,7 +224,10 @@ public void addComment(String commentIn) {
attributeStatus = AttributeStatus.value;
break;
case "@DEPRECATED":
isDeprecatedAttribute = true;
if (!name.equals("draft")
Copy link
Member

Choose a reason for hiding this comment

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

For the others ("collation", "transform", "unitPreferenceData") I think we explicitly removed the @deprecated on the element, which is cleaner than having this special test.

(There is no particular value to distinguishing the "with-children" case from the "without children" case.)

@srl295
Copy link
Member Author

srl295 commented Aug 4, 2020 via email

DTD/Tools
- fix the DTD to not deprecate draft= on rulesetGrouping
- fix DtdData to include rulesetGrouping in DRAFT_ON_NON_LEAF_ALLOWED

Test changes:
- TestPaths needed to include seed and exemplars
- update TestPaths to print a more helpful message

Data changes: (seed)
- update sa collation to not use a deprecated attribute
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • common/dtd/ldml.dtd is now changed in the branch
  • tools/java/org/unicode/cldr/util/DtdData.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295 srl295 merged commit 90a4ab3 into unicode-org:master Aug 18, 2020
@srl295 srl295 deleted the deprecate-6746 branch August 18, 2020 21:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants