Skip to content

Commit

Permalink
ICU-20536 Japanese era Reiwa support in ICU4C 61
Browse files Browse the repository at this point in the history
  • Loading branch information
@yumaoka
yumaoka committed Apr 11, 2019
1 parent e912610 commit 16e1ef3
Show file tree
Hide file tree
Showing 31 changed files with 99 additions and 18 deletions.
1 change: 1 addition & 0 deletions icu4c/source/data/locales/ar.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1635,6 +1635,7 @@ ar{
"تيشو",
"شووا",
"هيسي",
"ريوا",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/locales/ast.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2304,6 +2304,7 @@ ast{
"Taishō",
"e. Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika",
Expand Down Expand Up @@ -2542,6 +2543,7 @@ ast{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -2780,6 +2782,7 @@ ast{
"Taishō",
"era Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/locales/br.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4105,6 +4105,7 @@ br{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -4343,6 +4344,7 @@ br{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -4581,6 +4583,7 @@ br{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/bs_Cyrl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1035,6 +1035,7 @@ bs_Cyrl{
"Таишо",
"Шова",
"Хаисеи",
"Реива",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/locales/cs.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3697,6 +3697,7 @@ cs{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -3935,6 +3936,7 @@ cs{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -4173,6 +4175,7 @@ cs{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/de.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1601,6 +1601,7 @@ de{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/he.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,7 @@ he{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/hi.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,7 @@ hi{
"ताईशो",
"शोवा",
"हेईसेई",
"रेइवा",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/hr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1577,6 +1577,7 @@ hr{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/id.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2217,6 +2217,7 @@ id{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions icu4c/source/data/locales/ja.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2464,6 +2464,7 @@ ja{
"大正",
"昭和",
"平成",
"令和",
}
narrow{
"大化",
Expand Down Expand Up @@ -2702,6 +2703,7 @@ ja{
"T",
"S",
"H",
"R",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/ko.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1909,6 +1909,7 @@ ko{
"다이쇼",
"쇼와",
"헤이세이",
"레이와",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/lo.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1845,6 +1845,7 @@ lo{
"ໄຕໂຊ",
"ໂຊວາ",
"ຮີຊີ",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/lt.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2466,6 +2466,7 @@ lt{
"Taišo",
"Šova",
"Heisei",
"Reiwa",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/locales/nb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5483,6 +5483,7 @@ nb{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -5721,6 +5722,7 @@ nb{
"T",
"S",
"H",
"R"
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -5959,6 +5961,7 @@ nb{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
intervalFormats{
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/locales/nl.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4894,6 +4894,7 @@ nl{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -5132,6 +5133,7 @@ nl{
"T",
"S",
"H",
"R",
}
wide{
"Taika (645–650)",
Expand Down Expand Up @@ -5370,6 +5372,7 @@ nl{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions icu4c/source/data/locales/root.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,7 @@ root{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
narrow{
"Taika (645–650)",
Expand Down Expand Up @@ -1951,6 +1952,7 @@ root{
"T",
"S",
"H",
"R",
}
wide:alias{"/LOCALE/calendar/japanese/eras/abbreviated"}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/ru.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1837,6 +1837,7 @@ ru{
"Эпоха Тайсьо",
"Сьова",
"Эпоха Хэйсэй",
"Рэйва",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/sr.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ sr{
"Таишо",
"Шова",
"Хаисеи",
"Реива",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/sr_Latn.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1257,6 +1257,7 @@ sr_Latn{
"Taišo",
"Šova",
"Haisei",
"Reiva",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/sv.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1630,6 +1630,7 @@ sv{
"Taishō",
"Shōwa",
"Heisei",
"Reiwa",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/th.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2332,6 +2332,7 @@ th{
"ทะอิโช",
"โชวะ",
"เฮเซ",
"เรวะ",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/yue.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2394,6 +2394,7 @@ yue{
"大正",
"昭和",
"平成",
"令和",
}
}
}
Expand Down
1 change: 1 addition & 0 deletions icu4c/source/data/locales/yue_Hans.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2392,6 +2392,7 @@ yue_Hans{
"大正",
"昭和",
"平成",
"令和",
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions icu4c/source/data/locales/zh.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3403,6 +3403,7 @@ zh{
"大正",
"昭和",
"平成",
"令和",
}
narrow{
"大化(645–650)",
Expand Down Expand Up @@ -3641,6 +3642,7 @@ zh{
"T",
"S",
"H",
"R",
}
wide{
"大化 (645–650)",
Expand Down Expand Up @@ -3879,6 +3881,7 @@ zh{
"大正",
"昭和",
"平成",
"令和",
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion icu4c/source/data/locales/zh_Hant.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5737,6 +5737,7 @@ zh_Hant{
"大正",
"昭和",
"平成",
"令和",
}
narrow{
"大化",
Expand Down Expand Up @@ -5975,6 +5976,7 @@ zh_Hant{
"大正",
"昭和",
"平成",
"令和",
}
wide{
"大化",
Expand Down Expand Up @@ -6213,7 +6215,7 @@ zh_Hant{
"大正",
"昭和",
"平成",
}
"令和", }
}
intervalFormats{
H{
Expand Down
3 changes: 2 additions & 1 deletion icu4c/source/i18n/japancal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading

0 comments on commit 16e1ef3

Please sign in to comment.