-
-
Notifications
You must be signed in to change notification settings - Fork 78
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update localization keys, add validation
- Loading branch information
Showing
40 changed files
with
166 additions
and
169 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // This file is part of Kiwix for iOS & macOS. | ||
| // | ||
| // Kiwix is free software; you can redistribute it and/or modify it | ||
| // under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation; either version 3 of the License, or | ||
| // any later version. | ||
| // | ||
| // Kiwix is distributed in the hope that it will be useful, but | ||
| // WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| // General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with Kiwix; If not, see https://www.gnu.org/licenses/. | ||
|
|
||
| import Foundation | ||
|
|
||
| fileprivate extension String { | ||
|
|
||
| var localized: String { | ||
| localizedWithFallback() | ||
| } | ||
|
|
||
| func localizedWithFormat(withArgs: CVarArg...) -> String { | ||
| let format = localizedWithFallback() | ||
| switch withArgs.count { | ||
| case 1: return String.localizedStringWithFormat(format, withArgs[0]) | ||
| case 2: return String.localizedStringWithFormat(format, withArgs[0], withArgs[1]) | ||
| default: return String.localizedStringWithFormat(format, withArgs) | ||
| } | ||
| } | ||
|
|
||
| private func localizedWithFallback( | ||
| bundle: Bundle = Bundle.main, | ||
| comment: String = "" | ||
| ) -> String { | ||
| let englishValue: String | ||
| if let path = Bundle.main.path(forResource: "en", ofType: "lproj"), | ||
| let bundle = Bundle(path: path) { | ||
| englishValue = NSLocalizedString(self, bundle: bundle, comment: comment) | ||
| if NSLocale.preferredLanguages.first == "en" { | ||
| return englishValue | ||
| } | ||
| } else { | ||
| englishValue = "" | ||
| } | ||
| return NSLocalizedString( | ||
| self, | ||
| tableName: nil, | ||
| bundle: bundle, | ||
| value: englishValue, // fall back to this, if translation not found | ||
| comment: comment | ||
| ) | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.