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-14717 json: fix repeat keys #1551

Merged
merged 1 commit into from
Oct 25, 2021

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Oct 20, 2021

Rewrite output section completely to avoid dups

  • use JsonObject instead of JsonWriter, using pseudo-jsonpath
  • exclude <language type="root"/> explicitly from bcp47-strict output
  • remove grammaticalGenderFeatures.json
    it's now folded (back) into grammaticalFeatures.json (where it belongs)

CLDR-14717

  • This PR completes the ticket.

@srl295 srl295 self-assigned this Oct 20, 2021
@srl295
Copy link
Member Author

srl295 commented Oct 20, 2021

            "dateFormats": {
              "full": "EEEE, MMMM d, y G",
              "full-datetimeSkeleton": "GyMMMMEEEEd",
              "long": "MMMM d, y G",
              "long-datetimeSkeleton": "GyMMMMd",
              "medium": "MMM d, y G",
              "medium-datetimeSkeleton": "GyMMMd",
              "short": "M/d/y GGGGG",
              "short-datetimeSkeleton": "GGGGGyMd"
            },

Not a great solution, but avoids having to rewrite the output format.

@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295
Copy link
Member Author

srl295 commented Oct 20, 2021

this draft PR now depends on #1552

@srl295 srl295 force-pushed the cldr-14717/repeatkeys branch from d7287a9 to f851145 Compare October 20, 2021 22:07
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • tools/cldr-code/src/main/resources/org/unicode/cldr/json/pathTransforms.txt is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295 srl295 force-pushed the cldr-14717/repeatkeys branch from 63fc6ee to 5c69562 Compare October 22, 2021 22:39
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295 srl295 requested review from macchiati and sffc October 22, 2021 22:39
@srl295
Copy link
Member Author

srl295 commented Oct 22, 2021

@srl295 srl295 marked this pull request as ready for review October 22, 2021 22:40
@srl295
Copy link
Member Author

srl295 commented Oct 22, 2021

This commit shows the effect of the change:

- use JsonObject instead of JsonWriter, using pseudo-jsonpath
- exclude <language type="root"/> explicitly from bcp47-strict output
- remove grammaticalGenderFeatures.json
  it's now folded (back) into grammaticalFeatures.json (where it belongs)
@srl295 srl295 force-pushed the cldr-14717/repeatkeys branch from 5c69562 to 86d5d20 Compare October 22, 2021 22:52
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • tools/cldr-code/src/main/java/org/unicode/cldr/json/Ldml2JsonConverter.java is different

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@srl295 srl295 merged commit 694af8a into unicode-org:maint/maint-40 Oct 25, 2021
@srl295 srl295 deleted the cldr-14717/repeatkeys branch October 25, 2021 18:46
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.

2 participants