system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-21 10:05:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibLocale: Remove last use of DeprecatedString from LibLocale

Browse source
This commit is contained in:
Timothy Flynn 2023-01-27 16:25:53 -05:00 committed by Linus Groh
parent 9e4dbea0ee
commit a65bf16cd5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibLocale/DateTimeFormat.cpp
View file

@ -265,23 +265,23 @@ static ErrorOr<Optional<String>> format_time_zone_offset(StringView locale, Cale
offset_seconds %= 60;
StringBuilder builder;
builder.append(sign);
TRY(builder.try_append(sign));
switch (style) {
// The long format always uses 2-digit hours field and minutes field, with optional 2-digit seconds field.
case CalendarPatternStyle::LongOffset:
builder.appendff("{:02}{}{:02}", offset_hours, separator, offset_minutes);
TRY(builder.try_appendff("{:02}{}{:02}", offset_hours, separator, offset_minutes));
if (offset_seconds > 0)
builder.appendff("{}{:02}", separator, offset_seconds);
TRY(builder.try_appendff("{}{:02}", separator, offset_seconds));
break;
// The short format is intended for the shortest representation and uses hour fields without leading zero, with optional 2-digit minutes and seconds fields.
case CalendarPatternStyle::ShortOffset:
builder.appendff("{}", offset_hours);
TRY(builder.try_appendff("{}", offset_hours));
if (offset_minutes > 0) {
builder.appendff("{}{:02}", separator, offset_minutes);
TRY(builder.try_appendff("{}{:02}", separator, offset_minutes));
if (offset_seconds > 0)
builder.appendff("{}{:02}", separator, offset_seconds);
TRY(builder.try_appendff("{}{:02}", separator, offset_seconds));
}
break;
@ -290,7 +290,7 @@ static ErrorOr<Optional<String>> format_time_zone_offset(StringView locale, Cale
}
// The digits used for hours, minutes and seconds fields in this format are the locale's default decimal digits.
auto result = TRY(replace_digits_for_number_system(*number_system, builder.to_deprecated_string()));
auto result = TRY(replace_digits_for_number_system(*number_system, TRY(builder.to_string())));
return TRY(String::from_utf8(formats->gmt_format)).replace("{0}"sv, result, ReplaceMode::FirstOnly);
}