Fix date/time style bug

catamorphism · catamorphism · commit b12bf3030f01 · 2024-10-15T16:56:02.000-07:00
diff --git a/icu4c/source/i18n/messageformat2_function_registry.cpp b/icu4c/source/i18n/messageformat2_function_registry.cpp
@@ -809,6 +809,9 @@ StandardFunctions::DateTime::call(const FunctionContext& context,
 static DateFormat::EStyle stringToStyle(UnicodeString option, UErrorCode& errorCode) {
     if (U_SUCCESS(errorCode)) {
         UnicodeString upper = option.toUpper();
+        if (upper.isEmpty()) {
+            return DateFormat::EStyle::kShort;
+        }
         if (upper == UnicodeString("FULL")) {
             return DateFormat::EStyle::kFull;
         }
@@ -821,7 +824,7 @@ static DateFormat::EStyle stringToStyle(UnicodeString option, UErrorCode& errorC
         if (upper == UnicodeString("SHORT")) {
             return DateFormat::EStyle::kShort;
         }
-        if (upper.isEmpty() || upper == UnicodeString("DEFAULT")) {
+        if (upper == UnicodeString("DEFAULT")) {
             return DateFormat::EStyle::kDefault;
         }
         errorCode = U_ILLEGAL_ARGUMENT_ERROR;

Original file line number	Diff line number	Diff line change
`@@ -809,6 +809,9 @@ StandardFunctions::DateTime::call(const FunctionContext& context,`
`809`	`809`	`static DateFormat::EStyle stringToStyle(UnicodeString option, UErrorCode& errorCode) {`
`810`	`810`	`if (U_SUCCESS(errorCode)) {`
`811`	`811`	`UnicodeString upper = option.toUpper();`
	`812`	`+ if (upper.isEmpty()) {`
	`813`	`+ return DateFormat::EStyle::kShort;`
	`814`	`+ }`
`812`	`815`	`if (upper == UnicodeString("FULL")) {`
`813`	`816`	`return DateFormat::EStyle::kFull;`
`814`	`817`	`}`
`@@ -821,7 +824,7 @@ static DateFormat::EStyle stringToStyle(UnicodeString option, UErrorCode& errorC`
`821`	`824`	`if (upper == UnicodeString("SHORT")) {`
`822`	`825`	`return DateFormat::EStyle::kShort;`
`823`	`826`	`}`
`824`		`- if (upper.isEmpty() \|\| upper == UnicodeString("DEFAULT")) {`
	`827`	`+ if (upper == UnicodeString("DEFAULT")) {`
`825`	`828`	`return DateFormat::EStyle::kDefault;`
`826`	`829`	`}`
`827`	`830`	`errorCode = U_ILLEGAL_ARGUMENT_ERROR;`