organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-08 06:53:45 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 2

ICU-20511 Merge tag 'release-64-2' into 64-merge-branch

Browse source
This commit is contained in:
Shane Carr 2019-04-17 13:34:41 -07:00
commit 08766f4c02
3 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
icu4c/source/config/mh-darwin
View file

@ -31,7 +31,7 @@ SHLIB.cc= $(CXX) -dynamiclib -dynamic $(CXXFLAGS) $(LDFLAGS) $(LD_SOOPTIONS)
## Compiler switches to embed a library name and version information
ifeq ($(ENABLE_RPATH),YES)
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(libdir)/$(notdir $(MIDDLE_SO_TARGET))
else
LD_SONAME = -Wl,-compatibility_version -Wl,$(SO_TARGET_VERSION_MAJOR) -Wl,-current_version -Wl,$(SO_TARGET_VERSION) -install_name $(notdir $(MIDDLE_SO_TARGET)) $(PKGDATA_TRAILING_SPACE)
endif

70
icu4c/source/test/testdata/format.txt vendored
View file

@ -489,41 +489,41 @@ format:table(nofallback) {
},
// Japanese
{
"en_US@calendar=japanese",
"",
"PATTERN=G y",
"YEAR=8",
"Heisei 8"
},
{
"en_US@calendar=japanese",
"",
"PATTERN=G yy",
"YEAR=8",
"Heisei 08"
},
{
"en_US@calendar=japanese",
"",
"PATTERN=G yyy",
"YEAR=8",
"Heisei 008"
},
{
"en_US@calendar=japanese",
"",
"PATTERN=G yyyy",
"YEAR=8",
"Heisei 0008"
},
{
"en_US@calendar=japanese",
"",
"PATTERN=G yyyyy",
"YEAR=8",
"Heisei 00008"
},
// {
// "en_US@calendar=japanese",
// "",
// "PATTERN=G y",
// "YEAR=8",
// "Heisei 8"
// },
// {
// "en_US@calendar=japanese",
// "",
// "PATTERN=G yy",
// "YEAR=8",
// "Heisei 08"
// },
// {
// "en_US@calendar=japanese",
// "",
// "PATTERN=G yyy",
// "YEAR=8",
// "Heisei 008"
// },
// {
// "en_US@calendar=japanese",
// "",
// "PATTERN=G yyyy",
// "YEAR=8",
// "Heisei 0008"
// },
// {
// "en_US@calendar=japanese",
// "",
// "PATTERN=G yyyyy",
// "YEAR=8",
// "Heisei 00008"
// },
}
}

4
icu4j/main/shared/data/testdata.jar
View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:22228512782eaebd6f7f7fa4187b5c0382829976cec88b94ed5556547f6000af
size 723404
oid sha256:3a09da92d612c34c7f468f073b356c7323e14f0fb53b0eb34483beed0a296ac4
size 723338