Skip to content

Make StringEntry.localizations optional and improve decoding error reporting. #64

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

Open
maciej-bevel-health wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make StringEntry.localizations optional and improve decoding error reporting. #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Sources/LocheckLogic/Types/StringCatalog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ struct StringCatalog: Codable {
*/
struct StringEntry: Codable {
let extractionState: String?
let localizations: [String: Localization]
let localizations: [String: Localization]?
let comment: String?
}

Expand Down Expand Up @@ -74,7 +74,7 @@ extension StringCatalog {
self = try decoder.decode(StringCatalog.self, from: data)
} catch {
problemReporter.report(
InvalidFile(details: "Failed to parse string catalog: \(error.localizedDescription)"),
InvalidFile(details: "Failed to parse string catalog: \(error)"),
path: path,
lineNumber: 0)
return nil
Expand All @@ -93,13 +93,13 @@ extension StringEntry {
) -> [LocalizedStringPair] {
var pairs: [LocalizedStringPair] = []

guard let sourceLocalization = localizations[sourceLanguage] else {
guard let sourceLocalization = localizations?[sourceLanguage] else {
return pairs
}

let sourceString = sourceLocalization.stringUnit?.value ?? key

for (language, localization) in localizations {
for (language, localization) in localizations ?? [:] {
if language == sourceLanguage {
continue // Skip source language for validation
}
Expand Down
6 changes: 3 additions & 3 deletions Sources/LocheckLogic/Validators/parseAndValidateStringCatalog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ private func validateStringCatalogStructure(

// Check that source language exists in all entries
for (key, entry) in stringCatalog.strings {
if entry.localizations[sourceLanguage] == nil {
if entry.localizations?[sourceLanguage] == nil {
problemReporter.report(
KeyMissingFromTranslation(
key: key,
Expand All @@ -149,8 +149,8 @@ private func validateStringCatalogStructure(
}

// Check for incomplete translations
let sourceLocalization = entry.localizations[sourceLanguage]
for (language, localization) in entry.localizations {
let sourceLocalization = entry.localizations?[sourceLanguage]
for (language, localization) in entry.localizations ?? [:] {
if language == sourceLanguage {
continue
}
Expand Down
2 changes: 2 additions & 0 deletions Tests/LocheckCommandTests/StringCatalogCommandTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ final class StringCatalogCommandTests: XCTestCase {
}
}
}
},
"empty_key" : {
}
},
"version" : "1.0"
Expand Down
10 changes: 5 additions & 5 deletions Tests/LocheckLogicTests/StringCatalogTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ final class StringCatalogTests: XCTestCase {
XCTAssertEqual(catalog.strings.count, 1)

let helloWorldEntry = catalog.strings["hello_world"]!
XCTAssertEqual(helloWorldEntry.localizations.count, 2)
XCTAssertEqual(helloWorldEntry.localizations["en"]?.stringUnit?.value, "Hello, World!")
XCTAssertEqual(helloWorldEntry.localizations["de"]?.stringUnit?.value, "Hallo, Welt!")
XCTAssertEqual(helloWorldEntry.localizations?.count, 2)
XCTAssertEqual(helloWorldEntry.localizations?["en"]?.stringUnit?.value, "Hello, World!")
XCTAssertEqual(helloWorldEntry.localizations?["de"]?.stringUnit?.value, "Hallo, Welt!")
}

func testStringCatalogWithPluralForms() {
Expand Down Expand Up @@ -104,8 +104,8 @@ final class StringCatalogTests: XCTestCase {
let catalog = try! JSONDecoder().decode(StringCatalog.self, from: data)

let itemCountEntry = catalog.strings["item_count"]!
let enPlurals = itemCountEntry.localizations["en"]?.variations?.plural
let dePlurals = itemCountEntry.localizations["de"]?.variations?.plural
let enPlurals = itemCountEntry.localizations?["en"]?.variations?.plural
let dePlurals = itemCountEntry.localizations?["de"]?.variations?.plural

XCTAssertNotNil(enPlurals)
XCTAssertNotNil(dePlurals)
Expand Down