Merge pull request #218 from mac-cain13/feature/localization-fixed

Feature/localization fixed

Author: mac-cain13

R.swift/Generators/ResourceGenerator.swift

@@ -53,7 +53,8 @@ func generateResourceStructsWithResources(resources: Resources, bundleIdentifier
       implements: [],
       typealiasses: [],
       properties: [
-        Let(isStatic: true, name: "hostingBundle", typeDefinition: .Inferred(Type._NSBundle), value: "NSBundle(identifier: \"\(bundleIdentifier)\") ?? NSBundle.mainBundle()")
+        Let(isStatic: true, name: "hostingBundle", typeDefinition: .Inferred(Type._NSBundle), value: "NSBundle(identifier: \"\(bundleIdentifier)\") ?? NSBundle.mainBundle()"),
+        Let(isStatic: true, name: "applicationLocale", typeDefinition: .Inferred(Type._NSLocale), value: "hostingBundle.preferredLocalizations.first.flatMap(NSLocale.init) ?? NSLocale.currentLocale()")
       ],
       functions: [],
       structs: generatorResults.internalStructs

R.swift/Generators/StringsGenerator.swift

@@ -245,7 +245,7 @@ struct StringsGenerator: Generator {
       parameters: params,
       doesThrow: false,
       returnType: Type._String,
-      body: "return String(format: \(values.localizedString), locale: NSLocale.currentLocale(), \(args))"
+      body: "return String(format: \(values.localizedString), locale: _R.applicationLocale, \(args))"
     )
   }
 

R.swift/SwiftTypes/Type.swift

@@ -32,6 +32,7 @@ struct Type: UsedTypesProvider, CustomStringConvertible, Hashable {
   static let _UIView = Type(module: "UIKit", name: "UIView")
   static let _UIImage = Type(module: "UIKit", name: "UIImage")
   static let _NSBundle = Type(module: "Foundation", name: "NSBundle")
+  static let _NSLocale = Type(module: "Foundation", name: "NSLocale")
   static let _UIStoryboard = Type(module: "UIKit", name: "UIStoryboard")
   static let _UITableViewCell = Type(module: "UIKit", name: "UITableViewCell")
   static let _UICollectionViewCell = Type(module: "UIKit", name: "UICollectionViewCell")