diff --git a/ecmascript/js_date_time_format.cpp b/ecmascript/js_date_time_format.cpp index 15a861bdcfea43d03ebd96c6db8cc20e41205f6a..a70ed8702897116033a8f8bbf7f18e80d85e49c8 100644 --- a/ecmascript/js_date_time_format.cpp +++ b/ecmascript/js_date_time_format.cpp @@ -46,7 +46,7 @@ struct CommonDateFormatPart { }; namespace { -const std::vector ICU_LONG_SHORT = {"long", "short"}; +const std::vector ICU_LONG_SHORT = {"long", "short", "longOffset", "shortOffset", "longGeneric", "shortGeneric"}; const std::vector ICU_NARROW_LONG_SHORT = {"narrow", "long", "short"}; const std::vector ICU2_DIGIT_NUMERIC = {"2-digit", "numeric"}; const std::vector ICU_NARROW_LONG_SHORT2_DIGIT_NUMERIC = {"narrow", "long", "short", "2-digit", "numeric"}; @@ -71,7 +71,11 @@ const std::vector ICU_HOUR_PE = { }; const std::vector ICU_MINUTE_PE = {{"mm", "2-digit"}, {"m", "numeric"}}; const std::vector ICU_SECOND_PE = {{"ss", "2-digit"}, {"s", "numeric"}}; -const std::vector ICU_YIME_ZONE_NAME_PE = {{"zzzz", "long"}, {"z", "short"}}; +const std::vector ICU_YIME_ZONE_NAME_PE = { + {"zzzz", "long"}, {"z", "short"}, + {"OOOO", "longOffset"}, {"O", "shortOffset"}, + {"vvvv", "longGeneric"}, {"v", "shortGeneric"} +}; const std::map HOUR_CYCLE_MAP = { {'K', HourCycleOption::H11},