CLDR-17484 Update dayPeriods.xml (#4375)

macchiati · web-flow · commit d0dced69f7a6 · 2025-02-23T20:35:47.000-08:00
diff --git a/common/supplemental/dayPeriods.xml b/common/supplemental/dayPeriods.xml
@@ -7,6 +7,7 @@
  -->
 <supplementalData>
 	<version number="$Revision$"/>
+	<!-- Remember to make parallel changes both dayPeriodRuleSets! -->
 	<dayPeriodRuleSet>
 		<dayPeriodRules locales="root">
 			<dayPeriodRule type="am" from="00:00" before="12:00"/>	<!-- AM -->
@@ -15,10 +16,10 @@
 		<dayPeriodRules locales="en">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- midnight -->
 			<dayPeriodRule type="noon" at="12:00"/>	<!-- noon -->
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morning -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
 			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- night -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="af">
 			<dayPeriodRule type="midnight" at="00:00"/>	<!-- middernag -->
@@ -693,10 +694,10 @@
 			<dayPeriodRule type="pm" from="12:00" before="24:00"/>	<!-- PM -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="en">
-			<dayPeriodRule type="morning1" from="06:00" before="12:00"/>	<!-- morning -->
+			<dayPeriodRule type="morning1" from="00:00" before="12:00"/>	<!-- morning -->
 			<dayPeriodRule type="afternoon1" from="12:00" before="18:00"/>	<!-- afternoon -->
 			<dayPeriodRule type="evening1" from="18:00" before="21:00"/>	<!-- evening -->
-			<dayPeriodRule type="night1" from="21:00" before="06:00"/>	<!-- night -->
+			<dayPeriodRule type="night1" from="21:00" before="24:00"/>	<!-- night -->
 		</dayPeriodRules>
 		<dayPeriodRules locales="af">
 			<dayPeriodRule type="morning1" from="05:00" before="12:00"/>	<!-- oggend -->
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCheckCLDR.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCheckCLDR.java
@@ -865,16 +865,15 @@ public void TestCheckDates() {
                 Subtype.dateSymbolCollision
             },
 
-            // 00-06 night1
-            // 06-12 morning1
+            // 00-12 morning1
             // 12-18 afternoon1
             // 18-21 evening1
             // 21-24 night1
             //
             // So for a 12hour time, we have:
             //
             // 12  1  2  3  4  5  6  7  8  9 10 11
-            //  n  n  n  n  n  n  m  m  m  m  m  m
+            //  m  m  m  m  m  m  m  m  m  m  m  m
             //  a  a  a  a  a  a  e  e  e  n  n  n
 
             // Formatting has looser collision rules, because it is always paired with a time.
@@ -890,15 +889,15 @@ public void TestCheckDates() {
                 DayPeriod.morning1,
                 Subtype.dateSymbolCollision
             },
+            {Type.format, DayPeriod.night1, Type.format, DayPeriod.afternoon1, Subtype.none},
+            {Type.format, DayPeriod.night1, Type.format, DayPeriod.evening1, Subtype.none},
             {
                 Type.format,
-                DayPeriod.night1,
+                DayPeriod.morning1,
                 Type.format,
                 DayPeriod.afternoon1,
                 Subtype.dateSymbolCollision
             },
-            {Type.format, DayPeriod.night1, Type.format, DayPeriod.evening1, Subtype.none},
-            {Type.format, DayPeriod.morning1, Type.format, DayPeriod.afternoon1, Subtype.none},
             {
                 Type.format,
                 DayPeriod.morning1,
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestExampleGenerator.java
@@ -1107,9 +1107,8 @@ public void TestDayPeriods() {
         checkDayPeriod("pl", "format", "morning1", "〖06:00 – 10:00⁻〗〖❬8:00 ❭rano〗");
         checkDayPeriod("pl", "stand-alone", "morning1", "〖06:00 – 10:00⁻〗");
 
-        checkDayPeriod(
-                "en", "format", "night1", "〖00:00 – 06:00⁻; 21:00 – 24:00⁻〗〖❬3:00 ❭at night〗");
-        checkDayPeriod("en", "stand-alone", "night1", "〖00:00 – 06:00⁻; 21:00 – 24:00⁻〗");
+        checkDayPeriod("en", "format", "night1", "〖21:00 – 24:00⁻〗〖❬10:30 ❭at night〗");
+        checkDayPeriod("en", "stand-alone", "night1", "〖21:00 – 24:00⁻〗");
 
         checkDayPeriod("en", "format", "noon", "〖12:00〗〖❬12:00 ❭noon〗");
         checkDayPeriod("en", "format", "midnight", "〖00:00〗〖❬12:00 ❭midnight〗");
@@ -1133,7 +1132,7 @@ public void TestAllDayPeriods() { // excludes midnight, see ICU-12278
         checkDayPeriodsForLocale(
                 "en",
                 "Bhm",
-                "〖3:00 at night〗〖9:00 in the morning〗〖12:00 noon〗〖3:00 in the afternoon〗〖7:30 in the evening〗");
+                "〖6:00 in the morning〗〖12:00 noon〗〖3:00 in the afternoon〗〖7:30 in the evening〗〖10:30 at night〗");
         checkDayPeriodsForLocale(
                 "it",
                 "Bhm",
