-
-
Notifications
You must be signed in to change notification settings - Fork 710
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
ICU-20482 Backport support for Placeholder New Era in Japanese Calendar to ICU 62 #514
Merged
jefgen
merged 17 commits into
unicode-org:maint/maint-62
from
jefgen:maint/maint-62-jaera
Mar 21, 2019
Merged
ICU-20482 Backport support for Placeholder New Era in Japanese Calendar to ICU 62 #514
jefgen
merged 17 commits into
unicode-org:maint/maint-62
from
jefgen:maint/maint-62-jaera
Mar 21, 2019
Conversation
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
… the New Era. Manually cherry-picked from commit: 45cdda6 Original commit message: ICU-12973 CLDR Japanese Era data and tentative Japanese new era support (unicode-org#111) * Updated era data format in supplementalData. * Include tentative era names in data. Implemented Japanese era loaded from CLDR data in ICU4J. * ICU4C implementation, ICU4C refactoring. WIP. * VS project updates and some bug fixes Also added API comments. * Review feedback and bug fixes - NULL to nullptr - use of LocalUResourceBundlePointer - TYPO "name" to "named" - env var checking stricmp() == 0 * API comment correction based on feedback * Duplicate the comment in ucal.h to calendar.h * Fixed spelling errors in API comment
… remove gotos and typos. cherry-picked from: 3ec241f Original commit message: - Enable UWP version of ICU to use Environment variable `ICU_ENABLE_TENTATIVE_ERA` for testing placeholder era names. - Use `LocalArray<int32_t>` for the Era Start Dates to simply memory management, so that `goto` can be removed. - Also fix some minor typos in header file. cherry-picked from 4a8b474.
…ws headers. cherry-picked from: 8a2094d Original commit message: Changes for the Windows system component version.
…era date. cherry-picked from: 1775e4c
…on of new era. cherry-picked from: 78ce120 Original commit message: ICU-20145 Allow passing locale in ICU4C "date" sample program for testing without using the environment variable "LC_ALL". (unicode-org#125) The ICU4C sample "date" program just uses the "default" ICU locale. This change lets you pass in an explicit locale argument for testing on platforms like Windows that don't have/use the environment variable "LC_ALL".
(Using the file @ f0d3f25)
(Using the file @ 2e86b08).
- Regenerate the ICU4J data files (icudata.jar and icutzdata.jar). - Remove unsupported Java Diamond operators in order to unbreak the Java build.
cherry-picked from: 12e2a72 Original commit message: ICU-20062 Set the Python -B flag to inhibit the writing of .pyc files. This will prevent littering the source tree with spurious .pyc files. The potential faster execution when re-running a script that has an up-to-date .pyc file is negligible.
cherry-picked from: cc66247 Original commit message: ICU-20334 Add python3 support to icu4c scripts Test: Execute every python script with python 2 and 3
cherry-picked from: 335abbe Original commit message: ICU-20334 Additional python3 compatibility changes to depstest. Also adds python3 depstest call to .travis.yml.
cherry-picked from: f89a1d9 Original commit message: ICU-20066 add a copyright scan stage (unicode-org#26) - name the travis build steps - copy cpyskip.txt to /.cpyskip.txt - add one named "lint" which runs cpyscan.pl - remove network access from Cpy.pm (requires installation)
jefgen
force-pushed
the
maint/maint-62-jaera
branch
from
March 13, 2019 18:36
c60f0cc
to
0326c18
Compare
Hooray! The files in the branch are the same across the force-push. 😃 ~ Your Friendly Jira-GitHub PR Checker Bot |
yumaoka
approved these changes
Mar 21, 2019
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.
Thanks. I walked through these commits, and all look fine.
@yumaoka Thank you very kindly for taking a look at the changes! |
jefgen
added a commit
to jefgen/electron
that referenced
this pull request
Mar 22, 2019
This change backports changes from the upstream ICU 62.1 maintenance branch into the Chromium copy of ICU, in order to enable the "placeholder era" for the upcoming new Japanese Era. Upstream change: unicode-org/icu#514 Upstream ticket: https://unicode-org.atlassian.net/browse/ICU-20482 With this change you can set/define an Environment Variable `ICU_ENABLE_TENTATIVE_ERA` to `true which will enable the placeholder era name. Note: This change requires re-generating the checked-in Chromium ICU data files (icudtl.dat) in order for them to have the updated data for the placeholder era name. Also included in this change are some minor changes to the scripts used by Chromium for building the data files so that they actually work on Ubuntu.
4 tasks
jkleinsc
pushed a commit
to electron/electron
that referenced
this pull request
Mar 27, 2019
This change backports changes from the upstream ICU 62.1 maintenance branch into the Chromium copy of ICU, in order to enable the "placeholder era" for the upcoming new Japanese Era. Upstream change: unicode-org/icu#514 Upstream ticket: https://unicode-org.atlassian.net/browse/ICU-20482 With this change you can set/define an Environment Variable `ICU_ENABLE_TENTATIVE_ERA` to `true which will enable the placeholder era name. Note: This change requires re-generating the checked-in Chromium ICU data files (icudtl.dat) in order for them to have the updated data for the placeholder era name. Also included in this change are some minor changes to the scripts used by Chromium for building the data files so that they actually work on Ubuntu.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change back ports various changes/commits from newer versions of ICU to ICU 62 so as to enable support for the placeholder new era in the Japanese Calendar in ICU.
Also included in this PR are additional changes to enable the CI build bots to build cleanly, so that we can verify ICU builds and the tests pass with these changes.
I purposely did not use the original commit titles, as I did not want JIRA to become confused about when the original tickets/issues were merged. However, I did include the original commit hash (SHA) and commit message for reference.
Note: This PR does not back port support for the Gannen year formatting.
It only enables the placeholder era. (I don't plan on back-porting the Gannen formatting).
Checklist