Merge pull request #4 from conqueror/master

'characters' is deprecated issue fixed
miroslavkovac · Mar 18, 2018 · f21f388 · f21f388
2 parents 568a03b + c6e70a4
commit f21f388
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Sources/Lingo/StringInterpolator.swift b/Sources/Lingo/StringInterpolator.swift
@@ -8,9 +8,11 @@ class StringInterpolator {
     /// The function finds all placeholders and replaces them with a value specified in interpolations dictionary
     func interpolate(_ rawString: String, with interpolations: [String: Any]) -> String {
         var result = rawString
-
-        let matches = StringInterpolator.regularExpression.matches(in: rawString, options: [], range: NSRange.init(location: 0, length: rawString.characters.count))
-
+        #if swift(>=4)
+            let matches = StringInterpolator.regularExpression.matches(in: rawString, options: [], range: NSRange.init(location: 0, length: rawString.count))
+        #else
+            let matches = StringInterpolator.regularExpression.matches(in: rawString, options: [], range: NSRange.init(location: 0, length: rawString.characters.count)) 
+        #endif
         for match in matches {
             let range: NSRange = match.range