ICU-22357 Rename gb18030.ucm to add -2022, follow-on to PR #2430

unicode-org · May 25, 2023 · 8d2c78d · 8d2c78d
1 parent 7f5d679
commit 8d2c78d
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/icu4c/source/data/mappings/convrtrs.txt b/icu4c/source/data/mappings/convrtrs.txt
@@ -366,7 +366,7 @@ US-ASCII { MIME* IANA JAVA WINDOWS }
  ibm-367 { IBM* } IBM367 { IANA WINDOWS } # This is not truely ibm-367 because it's missing the fallbacks.
 
 # GB 18030 is partly algorithmic, using the MBCS converter
-gb18030 { IANA* } ibm-1392 { IBM* } windows-54936 { WINDOWS* } GB18030 { MIME* }
+gb18030-2022   ibm-1392 { IBM* } windows-54936 { WINDOWS* } GB18030 { MIME* IANA* }
 
 # Table-based interchange codepages
 

diff --git a/icu4c/source/data/mappings/gb18030.ucm → icu4c/source/data/mappings/gb18030-2022.ucm b/icu4c/source/data/mappings/gb18030.ucm → icu4c/source/data/mappings/gb18030-2022.ucm
@@ -5,7 +5,7 @@
 
 # ICU codepage data for GB 18030-2022
 
-<code_set_name> "gb18030"
+<code_set_name> "gb18030-2022"
 <char_name_mask> "AXXXX"
 <mb_cur_max> 4
 <mb_cur_min> 1

diff --git a/icu4c/source/data/mappings/ucmcore.mk b/icu4c/source/data/mappings/ucmcore.mk
@@ -24,7 +24,7 @@ ibm-4909_P100-1999.ucm\
 ibm-5346_P100-1998.ucm ibm-5347_P100-1998.ucm ibm-5348_P100-1997.ucm\
 ibm-5349_P100-1998.ucm ibm-5350_P100-1998.ucm ibm-9447_P100-2002.ucm\
 ibm-5352_P100-1998.ucm ibm-9449_P100-2002.ucm ibm-5354_P100-1998.ucm\
-ibm-1383_P110-1999.ucm ibm-1386_P100-2001.ucm gb18030.ucm\
+ibm-1383_P110-1999.ucm ibm-1386_P100-2001.ucm gb18030-2022.ucm\
 ibm-1373_P100-2002.ucm\
 ibm-943_P15A-2003.ucm ibm-33722_P12A_P12A-2009_U2.ucm\
 ibm-970_P110_P110-2006_U2.ucm ibm-949_P11A-1999.ucm ibm-1363_P11B-1998.ucm
diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c
@@ -1333,7 +1333,7 @@ static const struct {
  /* EUC-TW (3-byte) conversion table file without extension */
  {"ibm-964_P110-1999", "cnv", ucnv_swap},
  /* GB 18030 (4-byte) conversion table file without extension */
- {"gb18030",  "cnv", ucnv_swap},
+ {"gb18030-2022", "cnv", ucnv_swap},
  /* MBCS conversion table file with extension */
  {"*test4x", "cnv", ucnv_swap},
  /*

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar
diff --git a/...uild/maven-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/cnvalias.icu b/...uild/maven-icu4j-datafiles/src/main/resources/com/ibm/icu/impl/data/icudt73b/cnvalias.icu
diff --git a/...om/ibm/icu/impl/data/icudt73b/gb18030.cnv → ...m/icu/impl/data/icudt73b/gb18030-2022.cnv b/...om/ibm/icu/impl/data/icudt73b/gb18030.cnv → ...m/icu/impl/data/icudt73b/gb18030-2022.cnv