Skip to content

Add developmentRegion after Base as default language #550

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
tomlokhorst merged 4 commits into from
Aug 27, 2019
Merged

Add developmentRegion after Base as default language #550

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5feef67
Use developmentLanguage from xcode project file, instead of hardcoded…
tomlokhorst Aug 26, 2019
0993e69
Generate warnings for extra translations
tomlokhorst Aug 26, 2019
8a70800
First try Base, then fallback to development language
tomlokhorst Aug 26, 2019
f03dd6e
Sort structs in toplevel R struct
tomlokhorst Aug 26, 2019
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
Prev Previous commit
Next Next commit
Generate warnings for extra translations
  • Loading branch information
@tomlokhorst
tomlokhorst committed Aug 26, 2019
commit 0993e693d8e2f5ad04a80a29156c6df75a651875
18 changes: 18 additions & 0 deletions Sources/RswiftCore/Generators/StringsStructGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,24 @@ struct StringsStructGenerator: ExternalOnlyStructGenerator {
warn("Strings file \(filenameLocale) is missing translations for keys: \(paddedKeysString)")
}

// Warnings about extra translations
for (locale, lss) in strings.grouped(by: { $0.locale }) {
let filenameLocale = locale.withFilename(filename)
let sourceKeys = developmentKeys ?? Set(allParams.keys)

let usedKeys = Set(lss.flatMap { $0.dictionary.keys })
let extra = usedKeys.subtracting(sourceKeys)

if extra.isEmpty {
continue
}

let paddedKeys = extra.sorted().map { "'\($0)'" }
let paddedKeysString = paddedKeys.joined(separator: ", ")

warn("Strings file \(filenameLocale) has extra translations (not in \(developmentLanguage)) for keys: \(paddedKeysString)")
}

// Only include translation if it exists in the development language
func includeTranslation(_ key: String) -> Bool {
if let developmentKeys = developmentKeys {
Expand Down