DemoApp/DemoApp/Multilingual.swift in xcmultilingual-0.1.7 vs DemoApp/DemoApp/Multilingual.swift in xcmultilingual-0.2.0
- old
+ new
@@ -26,16 +26,17 @@
func string() -> String {
return NSLocalizedString(rawValue, tableName: "Animal", bundle: NSBundle.mainBundle(), value: "\(rawValue)", comment: "")
}
- static func keys() -> [String] {
+ static let name = "Animal"
+
+ static var keys: [String] {
return ["CAT", "DOG", "BEAR", "DEER", "SQUIRREL", "ELEPHANT", "GIRAFFE", "TIGER", "LION", "RABBIT", "RHINOCEROS", "GORILLA", "MONKEY"]
}
-
- static func localizations() -> [String] {
- return Animal.keys().map { Animal(rawValue: $0)!.string() }
+ static var localizations: [String] {
+ return Animal.keys.map { Animal(rawValue: $0)!.string() }
}
}
enum Localizable: String {
case HELLO = "HELLO"
@@ -44,47 +45,50 @@
func string() -> String {
return NSLocalizedString(rawValue, tableName: "Localizable", bundle: NSBundle.mainBundle(), value: "\(rawValue)", comment: "")
}
- static func keys() -> [String] {
+ static let name = "Localizable"
+
+ static var keys: [String] {
return ["HELLO", "GOODMORNING", "GOODEVENING"]
}
-
- static func localizations() -> [String] {
- return Localizable.keys().map { Localizable(rawValue: $0)!.string() }
+ static var localizations: [String] {
+ return Localizable.keys.map { Localizable(rawValue: $0)!.string() }
}
}
enum Sample2Sample_Localization: String {
case SAMPLE_2 = "SAMPLE 2"
func string() -> String {
return NSLocalizedString(rawValue, tableName: "Sample Localization", bundle: Multilingual.bundle("Loalizations/sample2.bundle"), value: "\(rawValue)", comment: "")
}
- static func keys() -> [String] {
+ static let name = "Sample Localization"
+
+ static var keys: [String] {
return ["SAMPLE 2"]
}
-
- static func localizations() -> [String] {
- return Sample2Sample_Localization.keys().map { Sample2Sample_Localization(rawValue: $0)!.string() }
+ static var localizations: [String] {
+ return Sample2Sample_Localization.keys.map { Sample2Sample_Localization(rawValue: $0)!.string() }
}
}
enum SampleSample: String {
case SAMPLE = "SAMPLE"
func string() -> String {
return NSLocalizedString(rawValue, tableName: "Sample", bundle: Multilingual.bundle("sample.bundle"), value: "\(rawValue)", comment: "")
}
- static func keys() -> [String] {
+ static let name = "Sample"
+
+ static var keys: [String] {
return ["SAMPLE"]
}
-
- static func localizations() -> [String] {
- return SampleSample.keys().map { SampleSample(rawValue: $0)!.string() }
+ static var localizations: [String] {
+ return SampleSample.keys.map { SampleSample(rawValue: $0)!.string() }
}
}
private static func bundle(relativePath: String) -> NSBundle {