Skip to content

Commit ee79bdb

Browse files
committed
Address feedback
1 parent 5bc5933 commit ee79bdb

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

Sources/FoundationEssentials/Locale/Locale_Preferences.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -453,13 +453,9 @@ extension LocalePreferences: Codable {
453453
}
454454
return result as CFDictionary
455455
}
456-
var icuSymbolsAndStrings = try container.decodeIfPresent(ICUSymbolsAndStrings.self, forKey: .icuSymbolsAndStrings)
457-
if (icuDateFormats != nil || icuNumberSymbols != nil) && icuSymbolsAndStrings == nil {
458-
// Ensure that we have a value to store these in even if the archive didn't contain any serialized info
459-
icuSymbolsAndStrings = ICUSymbolsAndStrings()
460-
}
461-
icuSymbolsAndStrings?.icuDateFormatStrings = icuDateFormats
462-
icuSymbolsAndStrings?.icuNumberSymbols = icuNumberSymbols
456+
var icuSymbolsAndStrings = try container.decodeIfPresent(ICUSymbolsAndStrings.self, forKey: .icuSymbolsAndStrings) ?? ICUSymbolsAndStrings()
457+
icuSymbolsAndStrings.icuDateFormatStrings = icuDateFormats
458+
icuSymbolsAndStrings.icuNumberSymbols = icuNumberSymbols
463459

464460
self.init(
465461
metricUnits: metricUnits,
@@ -475,7 +471,7 @@ extension LocalePreferences: Codable {
475471
force12Hour: force12Hour,
476472
numberSymbols: numberSymbols,
477473
dateFormats: dateFormats,
478-
icuSymbolsAndStrings: icuSymbolsAndStrings ?? .init()
474+
icuSymbolsAndStrings: icuSymbolsAndStrings
479475
)
480476
#else
481477
self.init(

0 commit comments

Comments
 (0)