Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "icu70"

Browse Source 
* changes:
  Update DateIntervalFormatTest due to ICU 70 data change
  Regenerate LocaleDataTables.cpp due to ICU 70 upgrade
This commit is contained in:
Victor Chang
2021-12-09 10:03:02 +00:00
committed by Gerrit Code Review
parent 1a0f225c83 93ae9cd316
commit da0880a0fe
2 changed files with 1203 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/tests/coretests/src/android/text/format/DateIntervalFormatTest.java
View File

@@ -251,10 +251,10 @@ public class DateIntervalFormatTest {
assertEquals("19–22 de enero de 2009", assertEquals("19–22 de enero de 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, 0)); formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, 0));
assertEquals("19–22 de ene. de 2009", assertEquals("19–22 de ene de 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY,
FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
assertEquals("lun, 19 de ene. – jue, 22 de ene. de 2009", assertEquals("lun, 19 de ene – jue, 22 de ene de 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY,
FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));
assertEquals("lunes, 19 de enero – jueves, 22 de enero de 2009", assertEquals("lunes, 19 de enero – jueves, 22 de enero de 2009",
@@ -262,19 +262,19 @@ public class DateIntervalFormatTest {
assertEquals("19 de enero – 22 de abril de 2009", assertEquals("19 de enero – 22 de abril de 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, 0)); formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, 0));
assertEquals("19 de ene. – 22 de abr. 2009", assertEquals("19 de ene – 22 de abr 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH,
FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
assertEquals("lun, 19 de ene. – mié, 22 de abr. de 2009", assertEquals("lun, 19 de ene – mié, 22 de abr de 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH,
FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL)); FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));
assertEquals("enero–abril de 2009", assertEquals("enero–abril de 2009",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY)); formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY));
assertEquals("19 de ene. de 2009 – 9 de feb. de 2012", assertEquals("19 de ene de 2009 – 9 de feb de 2012",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR,
FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL)); FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
assertEquals("ene. de 2009 – feb. de 2012", assertEquals("ene de 2009 – feb de 2012",
formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR, formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * YEAR,
FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL)); FORMAT_NO_MONTH_DAY | FORMAT_ABBREV_ALL));
assertEquals("19 de enero de 2009 – 9 de febrero de 2012", assertEquals("19 de enero de 2009 – 9 de febrero de 2012",

2362
libs/androidfw/LocaleDataTables.cpp
View File

File diff suppressed because it is too large Load Diff