summaryrefslogtreecommitdiffstats
path: root/intl/icu/source/i18n
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-06-15 20:39:39 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-06-15 20:39:39 +0200
commit76c640c28a161ff725b2a1607a01f59157f627b1 (patch)
tree77f23343c7dfc409094ce719679126aab5054531 /intl/icu/source/i18n
parentc9edf588ed6d9b53038125c6d79c466b398e2da4 (diff)
downloadUXP-76c640c28a161ff725b2a1607a01f59157f627b1.tar
UXP-76c640c28a161ff725b2a1607a01f59157f627b1.tar.gz
UXP-76c640c28a161ff725b2a1607a01f59157f627b1.tar.lz
UXP-76c640c28a161ff725b2a1607a01f59157f627b1.tar.xz
UXP-76c640c28a161ff725b2a1607a01f59157f627b1.zip
Update ICU to 58.3
- This adds the new Japanese ascension era (Reiwa) - This updates timezone data to 2019a - Updated script for git instead of SVN - Regenerated locale data
Diffstat (limited to 'intl/icu/source/i18n')
-rw-r--r--intl/icu/source/i18n/i18n.vcxproj2
-rw-r--r--intl/icu/source/i18n/i18n.vcxproj.filters2
-rw-r--r--intl/icu/source/i18n/japancal.cpp3
-rw-r--r--intl/icu/source/i18n/zonemeta.cpp1
4 files changed, 4 insertions, 4 deletions
diff --git a/intl/icu/source/i18n/i18n.vcxproj b/intl/icu/source/i18n/i18n.vcxproj
index 869d3a951..eecf1ab12 100644
--- a/intl/icu/source/i18n/i18n.vcxproj
+++ b/intl/icu/source/i18n/i18n.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
diff --git a/intl/icu/source/i18n/i18n.vcxproj.filters b/intl/icu/source/i18n/i18n.vcxproj.filters
index 57bf52f28..af1511ecb 100644
--- a/intl/icu/source/i18n/i18n.vcxproj.filters
+++ b/intl/icu/source/i18n/i18n.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="collation">
diff --git a/intl/icu/source/i18n/japancal.cpp b/intl/icu/source/i18n/japancal.cpp
index 93ab8008b..e49e20b94 100644
--- a/intl/icu/source/i18n/japancal.cpp
+++ b/intl/icu/source/i18n/japancal.cpp
@@ -276,7 +276,8 @@ static const struct {
{ 1868, 9, 8 }, // Meiji 232
{ 1912, 7, 30 }, // Taisho 233
{ 1926, 12, 25 }, // Showa 234
- { 1989, 1, 8 } // Heisei 235
+ { 1989, 1, 8 }, // Heisei 235
+ { 2019, 5, 1 } // Reiwa 236
};
#define kEraCount UPRV_LENGTHOF(kEraInfo)
diff --git a/intl/icu/source/i18n/zonemeta.cpp b/intl/icu/source/i18n/zonemeta.cpp
index fdf333c37..dd3bf202f 100644
--- a/intl/icu/source/i18n/zonemeta.cpp
+++ b/intl/icu/source/i18n/zonemeta.cpp
@@ -683,7 +683,6 @@ ZoneMeta::createMetazoneMappings(const UnicodeString &tzid) {
mzMappings = new UVector(deleteOlsonToMetaMappingEntry, NULL, status);
if (U_FAILURE(status)) {
delete mzMappings;
- deleteOlsonToMetaMappingEntry(entry);
uprv_free(entry);
break;
}