Merge pull request #238 from mac-cain13/string-bundle

mac-cain13 · web-flow · commit 0060fe0b8c5f · 2016-08-24T09:37:16.000+02:00
Add hosting bundle to string resource, and NSLocalizedString
diff --git a/R.swift.Library b/R.swift.Library
@@ -1 +1 @@
-Subproject commit 326e89b5b60a866b5a32de0bc1ee8630c7cdf71a
+Subproject commit 05d89474908450ddcd3f330c8126d19f89312dc8
diff --git a/R.swift/Generators/StringsGenerator.swift b/R.swift/Generators/StringsGenerator.swift
@@ -188,7 +188,7 @@ struct StringsGenerator: Generator {
       isStatic: true,
       name: values.key,
       typeDefinition: .Inferred(Type.StringResource),
-      value: "StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", locales: [\(locales)])"
+      value: "StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", bundle: _R.hostingBundle, locales: [\(locales)])"
     )
   }
 
@@ -274,10 +274,10 @@ private struct StringValues {
     let escapedKey = key.escapedStringLiteral
 
     if tableName == "Localizable" {
-      return "NSLocalizedString(\"\(escapedKey)\", comment: \"\")"
+      return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, comment: \"\")"
     }
     else {
-      return "NSLocalizedString(\"\(escapedKey)\", tableName: \"\(tableName)\", comment: \"\")"
+      return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, tableName: \"\(tableName)\", comment: \"\")"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ struct StringsGenerator: Generator {`
`188`	`188`	`isStatic: true,`
`189`	`189`	`name: values.key,`
`190`	`190`	`typeDefinition: .Inferred(Type.StringResource),`
`191`		`- value: "StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", locales: [\(locales)])"`
	`191`	`+ value: "StringResource(key: \"\(escapedKey)\", tableName: \"\(values.tableName)\", bundle: _R.hostingBundle, locales: [\(locales)])"`
`192`	`192`	`)`
`193`	`193`	`}`
`194`	`194`
`@@ -274,10 +274,10 @@ private struct StringValues {`
`274`	`274`	`let escapedKey = key.escapedStringLiteral`
`275`	`275`
`276`	`276`	`if tableName == "Localizable" {`
`277`		`- return "NSLocalizedString(\"\(escapedKey)\", comment: \"\")"`
	`277`	`+ return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, comment: \"\")"`
`278`	`278`	`}`
`279`	`279`	`else {`
`280`		`- return "NSLocalizedString(\"\(escapedKey)\", tableName: \"\(tableName)\", comment: \"\")"`
	`280`	`+ return "NSLocalizedString(\"\(escapedKey)\", bundle: _R.hostingBundle, tableName: \"\(tableName)\", comment: \"\")"`
`281`	`281`	`}`
`282`	`282`	`}`
`283`	`283`