diff --git a/Sources/Localize.swift b/Sources/Localize.swift index 4f4b27d..7d4b73f 100644 --- a/Sources/Localize.swift +++ b/Sources/Localize.swift @@ -58,7 +58,7 @@ public extension String { Swift 2 friendly localization syntax, replaces NSLocalizedString - Returns: The localized string. */ - func localized() -> String { + func localized(comment: String = "") -> String { if let path = NSBundle.mainBundle().pathForResource(Localize.currentLanguage(), ofType: "lproj"), bundle = NSBundle(path: path) { return bundle.localizedStringForKey(self, value: nil, table: nil) } diff --git a/genstrings.py b/genstrings.py index 3083aa5..d9bad26 100644 --- a/genstrings.py +++ b/genstrings.py @@ -42,6 +42,7 @@ def fetch_files_recursive(directory, extension): localizedStringNil = re.compile('NSLocalizedString\("([^"]*)",\s*nil\s*\)', re.DOTALL) localized = re.compile('Localized\("([^"]*)"[^\n\r]*\)', re.DOTALL) localizedSwift2 = re.compile('"([^"]*)".localized\(\)', re.DOTALL) +localizedSwift2Comment = re.compile('"([^"]*)".localized\(\s*"([^"]*)"\s*\)', re.DOTALL) localizedSwift2WithFormat = re.compile('"([^"]*)".localizedFormat\([^\n\r]*\)', re.DOTALL) # get string list @@ -62,6 +63,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 localizedSwift2Comment.finditer(content): + uid += 1 + strings.append((result.group(1), result.group(2), file, uid)) for result in localizedSwift2WithFormat.finditer(content): uid += 1 strings.append((result.group(1), '', file, uid))