Merge pull request #9 from rshev/master

Much type-safer swift .localize implementation
marmelroy · Nov 3, 2015 · 8f7b58f · 8f7b58f
2 parents e968146 + 5d45340
commit 8f7b58f
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/Localize/Localize.swift b/Localize/Localize.swift
@@ -17,19 +17,19 @@ public let LCLLanguageChangeNotification : String = "LCLLanguageChangeNotificati
 
 // Swift 1.x friendly localization syntax, replaces NSLocalizedString
 public func Localized(string: String) -> String {
-    let path = NSBundle.mainBundle().pathForResource(Localize.currentLanguage(), ofType: "lproj")
-    let bundle = NSBundle(path: path!)
-    let string = bundle?.localizedStringForKey(string, value: nil, table: nil)
-    return string!
+    if let path = NSBundle.mainBundle().pathForResource(Localize.currentLanguage(), ofType: "lproj"), bundle = NSBundle(path: path) {
+        return bundle.localizedStringForKey(string, value: nil, table: nil)
+    }
+    return string
 }
 
 // Swift 2 friendly localization syntax, replaces NSLocalizedString
 public extension String {
     func localized() -> String {
-        let path = NSBundle.mainBundle().pathForResource(Localize.currentLanguage(), ofType: "lproj")
-        let bundle = NSBundle(path: path!)
-        let string = bundle?.localizedStringForKey(self, value: nil, table: nil)
-        return string!
+        if let path = NSBundle.mainBundle().pathForResource(Localize.currentLanguage(), ofType: "lproj"), bundle = NSBundle(path: path) {
+            return bundle.localizedStringForKey(self, value: nil, table: nil)
+        }
+        return self
     }
 }