Merge pull request marmelroy#13 from rokoroku/master

Adding localized with format function

Localize/Localize.swift

@@ -31,6 +31,15 @@ public func Localized(string: String) -> String {
     return string
 }
 
+/**
+ Swift 1.x friendly localization syntax with format arguments, replaces String(format:NSLocalizedString)
+ - Parameter string: Key to be localized.
+ - Returns: The formatted localized string with arguments.
+ */
+public func Localized(string: String, arguments args: CVarArgType...) -> String {
+    return String(format: Localized(string), arguments: args)
+}
+
 public extension String {
     /**
      Swift 2 friendly localization syntax, replaces NSLocalizedString
@@ -42,9 +51,18 @@ public extension String {
         }
         return self
     }
+
+    /**
+     Swift 2 friendly localization syntax with format arguments, replaces String(format:NSLocalizedString)
+     - Returns: The formatted localized string with arguments.
+     */
+    func localizedWithFormat(arguments args: CVarArgType...) -> String {
+        return String(format: localized(), arguments: args)
+    }
 }
 
 
+
 // MARK: Language Setting Functions
 
 public class Localize: NSObject {

genstrings.py

@@ -40,8 +40,9 @@ def fetch_files_recursive(directory, extension):
 # prepare regexes
 localizedStringComment = re.compile('NSLocalizedString\("([^"]*)",\s*"([^"]*)"\s*\)', re.DOTALL)
 localizedStringNil = re.compile('NSLocalizedString\("([^"]*)",\s*nil\s*\)', re.DOTALL)
-localized = re.compile('Localized\("([^"]*)"\)', re.DOTALL)
+localized = re.compile('Localized\("([^"]*)"[^\n\r]*\)', re.DOTALL)
 localizedSwift2 = re.compile('"([^"]*)".localized\(\)', re.DOTALL)
+localizedSwift2WithFormat = re.compile('"([^"]*)".localizedWithFormat\([^\n\r]*\)', re.DOTALL)
 
 # get string list
 uid = 0
@@ -61,6 +62,9 @@ def fetch_files_recursive(directory, extension):
         for result in localizedSwift2.finditer(content):
             uid += 1
             strings.append((result.group(1), '', file, uid))
+        for result in localizedSwift2WithFormat.finditer(content):
+            uid += 1
+            strings.append((result.group(1), '', file, uid))
 
 # prepare regexes
 localizedString = re.compile('"[^=]*=\s*"([^"]*)";')
@@ -142,4 +146,4 @@ def fetch_files_recursive(directory, extension):
     else:
         print '/* ' + string[1] + ' */'
         print '"' + string[0] + '" = "' + string[0] + '";'
-        print
+        print