Merge pull request #3 from fguchelaar/FixNamePattern

Fixes pattern for Swift and added pattern for Objective-C.
freshOS · Apr 11, 2018 · ade30d7 · ade30d7
2 parents 9dd5c24 + 661d9b3
commit ade30d7
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Classes/main.swift b/Classes/main.swift
@@ -69,11 +69,13 @@ func listAssets() -> [String] {
 
 func localizedStrings(inStringFile: String) -> [String] {
     var localizedStrings = [String]()
+    let namePattern = "([\\w-]+)"
     let patterns = [
-        "#imageLiteral\\(resourceName: \"([\\w-]+)\"\\)", // Image Literal
-        "UIImage\\(named: \"(\\w+)\"\\)", // Default UIImage call
-        "\\<image name=\"([\\w-]+)\".*", // Storyboard resources
-        "R.image.([\\w-]+)\\(\\)" //R.swift support
+        "#imageLiteral\\(resourceName: \"\(namePattern)\"\\)", // Image Literal
+        "UIImage\\(named:\\s*\"\(namePattern)\"\\)", // Default UIImage call (Swift)
+        "UIImage imageNamed:\\s*\\@\"\(namePattern)\"", // Default UIImage call 
+        "\\<image name=\"\(namePattern)\".*", // Storyboard resources
+        "R.image.\(namePattern)\\(\\)" //R.swift support
     ]
     for p in patterns {
         let regex = try? NSRegularExpression(pattern: p, options: [])