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-11059 fix cldr-json licensing #972

Merged
merged 1 commit into from Jan 27, 2021

Conversation

srl295
Copy link
Member

@srl295 srl295 commented Jan 26, 2021

CLDR-11059

  • fix to cldr-json licensing (add license key to bower.json)
  • Add compatible MapComparator data for CLDR 38.1 and prior blood glucose units ( CLDR-14232 )

Without the DtdData change, CLDR 39 is unable to read CLDR 38.1 staging data, crashes with "Missing Map Comparator Values … concentr-milligram-per-deciliter…"

@srl295 srl295 self-assigned this Jan 26, 2021
@@ -912,6 +913,7 @@ public void writeBowerJson(String outputDir, String packageName) throws IOExcept
ignorePaths.add(new JsonPrimitive(".gitattributes"));
ignorePaths.add(new JsonPrimitive("README.md"));
obj.add("ignore", ignorePaths);
obj.addProperty("license", CLDRURLS.UNICODE_SPDX);
Copy link
Member Author

Choose a reason for hiding this comment

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

this is the fix for bower

macchiati
macchiati previously approved these changes Jan 27, 2021
@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
  • tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java is now changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@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
  • tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.java is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

@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
  • tools/cldr-code/src/main/java/org/unicode/cldr/json/LdmlConvertRules.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 Jan 27, 2021

@macchiati sorry, i missed your approval! I had another change (to fix the versioning)

@srl295
Copy link
Member Author

srl295 commented Jan 27, 2021

srl295 added a commit to unicode-org/cldr-json that referenced this pull request Jan 27, 2021
CLDR tool source: unicode-org/cldr#972

Note, 'Currie' was dropped somehow with this generation, so I excluded that:
unicode-org/cldr#970 (comment)
macchiati
macchiati previously approved these changes Jan 27, 2021
@srl295
Copy link
Member Author

srl295 commented Jan 27, 2021

The glucose thing causes a test failure.

- Allow JSON cldrVersion to be affected by -V command line option for overriding
@jira-pull-request-webhook
Copy link

Notice: the branch changed across the force-push!

  • tools/cldr-code/src/main/java/org/unicode/cldr/util/DtdData.java is no longer changed in the branch

View Diff Across Force-Push

~ Your Friendly Jira-GitHub PR Checker Bot

srl295 added a commit to unicode-org/cldr-json that referenced this pull request Jan 27, 2021
* cldr 38.1 beta update

v38.1.0-BETA (tagged "beta" in npm)
generated from cldr-staging 1acbe10c8af48794cbe9966cb9a6cea92cee6004
generated from cldr tools f7d6d55ca3073b209d3bf2dd9fcf15d28c259e16

* improve build script cldr-generate-json.sh

* create zipfiles

* generate cldr-segments-full and also annotations

* build scripts WIP (-V temporarily dropped)

* Update reflecting CLDR-14313 fixes

Reflecting commit c0060510ce98a43f1c8c8541afe48f3cbf442632 on CLDR
(see unicode-org/cldr#888 for its destination)

Summary of changes:
    - These items are now arrays instead of strings:
      - supplemental/calendarPreferenceData
      - supplemental/weekData (now grouped by territory)
    - Previously MISSING data now added
      - cldr-core/dayPeriods.json:    dayPeriodRuleSet-type-selection"
      - cldr-core/units.json:         unitConstants, unitQuantities
      - cldr-core/unitsMetadata.json: unit deprecations

* segments packaging missed

* script improvements: MATCH

* warn if you have a local-config.sh

* getting ready to build 38.1.0-BETA4

* update packaging 38.1.0-BETA4

* update license and versioning per CLDR-11059

CLDR tool source: unicode-org/cldr#972

Note, 'Currie' was dropped somehow with this generation, so I excluded that:
unicode-org/cldr#970 (comment)

* bump proposed tag to 38.1.0

* version regen to 38.1.0
@srl295 srl295 requested a review from macchiati January 27, 2021 15:42
@srl295 srl295 changed the title CLDR-11059 fix cldr-json licensing, add compat to MapComparator CLDR-11059 fix cldr-json licensing Jan 27, 2021
@srl295
Copy link
Member Author

srl295 commented Jan 27, 2021

@macchiati one more review? I backed out the MapComparator changes, will do that in a separate PR

@srl295 srl295 merged commit b0c221e into unicode-org:master Jan 27, 2021
@srl295 srl295 deleted the cldr-11059-json branch January 27, 2021 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants