Merge pull request #5 from nextbike/fix/localization-starts-with-key

Fix: Localization starts with placeholder
nextbike · Dec 10, 2020 · d6b85b8 · d6b85b8
2 parents bccef50 + bd15da8
commit d6b85b8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/PhraseSwift.podspec b/PhraseSwift.podspec
@@ -7,7 +7,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'PhraseSwift'
-  s.version          = '0.1.1'
+  s.version          = '0.1.2'
   s.summary          = 'A swift port of Squares Phrase library.'
 
 # This description is used to generate tags and improve search results.

diff --git a/PhraseSwift/PhraseSwift/Phrase.swift b/PhraseSwift/PhraseSwift/Phrase.swift
@@ -62,7 +62,7 @@ public final class Phrase {
 
             // Copy the original pattern to preserve all spans, such as bold, italic, etc.
             let sb = NSMutableAttributedString(string: pattern)
-            while let t = head?.next {
+            while let t = head {
                 t.expand(target: sb, data: keysToValue)
                 head = head!.next
             }

diff --git a/PhraseSwift/PhraseSwiftTests/PhraseSwiftTests.swift b/PhraseSwift/PhraseSwiftTests/PhraseSwiftTests.swift
@@ -89,6 +89,32 @@ class PhraseSwiftTests: XCTestCase {
         XCTAssert(secondOutput == "Hi, Hope you {second} it")
     }
 
+    func testStartsWithKeyLocalization() {
+        let firstOutput = Phrase(pattern: "{key} is awesome!")
+            .put(key: "key", value: "PhraseSwift")
+            .format()
+        XCTAssert(firstOutput == "PhraseSwift is awesome!")
+
+        let secondOutput = Phrase(pattern: "{one} is better than {two}.")
+            .put(key: "one", value: "Two")
+            .put(key: "two", value: "one")
+            .format()
+        XCTAssert(secondOutput == "Two is better than one.")
+    }
+
+    func testEndsWithKeyLocalization() {
+        let firstOutput = Phrase(pattern: "PhraseSwift is {stupid}")
+            .put(key: "stupid", value: "awesome")
+            .format()
+        XCTAssert(firstOutput == "PhraseSwift is awesome")
+
+        let secondOutput = Phrase(pattern: "{one} is better than {two}")
+            .put(key: "one", value: "Two")
+            .put(key: "two", value: "one")
+            .format()
+        XCTAssert(secondOutput == "Two is better than one")
+    }
+
     func testSpacedKeyLocalization() {
         let firstOutput = Phrase(pattern: "Hi, this is a {key one} test with {key two} keys.")
             .put(key: "key two", value: "multiple")