Skip to content

Fixed the (re)localization of Date & Int and Added MVVMEnvironment su… #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foscomputerservices merged 2 commits into from
Dec 24, 2025
Merged

Fixed the (re)localization of Date & Int and Added MVVMEnvironment su… #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd340fa
Fixed the (re)localization of Date & Int and Added MVVMEnvironment su…
foscomputerservices Dec 24, 2025
a5af8ff
Cleaned up Linux support
foscomputerservices Dec 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions Sources/FOSMVVM/Localization/LocalizableDate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ public struct LocalizableDate: Codable, Hashable, Comparable, LocalizableValue,
timeStyle: DateFormatter.Style? = nil,
dateFormat: String? = nil
) {
let defaultStyle: DateFormatter.Style? = (dateStyle == nil && timeStyle == nil && dateFormat == nil)
? DateFormatter.Style.medium
: nil

self.init(
value: value,
dateStyle: dateStyle,
dateStyle: dateStyle ?? defaultStyle,
timeStyle: timeStyle,
dateFormat: dateFormat,
localizedString: nil
Expand Down Expand Up @@ -91,9 +95,14 @@ public extension LocalizableDate {
try container.encodeIfPresent(timeStyle?.rawValue, forKey: .timeStyle)
try container.encodeIfPresent(dateFormat, forKey: .dateFormat)

// REVIEWED: DGH - The RHS of this ternary will never be executed, so a block
// will never be covered
try container.encode(encoder.localizeString(self) ?? "", forKey: .localizedString)
// If we've already been localized, just send that
if let _localizedString {
try container.encode(_localizedString, forKey: .localizedString)
} else {
// REVIEWED: DGH - The RHS of this ternary will never be executed, so a block
// will never be covered
try container.encode(encoder.localizeString(self) ?? "", forKey: .localizedString)
}
}

// MARK: Identifiable Protocol
Expand Down
11 changes: 8 additions & 3 deletions Sources/FOSMVVM/Localization/LocalizableInt.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,14 @@ public extension LocalizableInt {
try container.encode(showGroupingSeparator, forKey: .showGroupingSeparator)
try container.encode(groupingSize, forKey: .groupingSize)

// REVIEWED: DGH - The RHS of this ternary will never be executed, so a block
// will never be covered
try container.encode(encoder.localizeString(self) ?? "", forKey: .localizedString)
// If we've already been localized, just send that
if let _localizedString {
try container.encode(_localizedString, forKey: .localizedString)
} else {
// REVIEWED: DGH - The RHS of this ternary will never be executed, so a block
// will never be covered
try container.encode(encoder.localizeString(self) ?? "", forKey: .localizedString)
}
}

// MARK: Identifiable Protocol
Expand Down
Loading