Release/0.2.6 (#151)

Example-App/Android/app/src/main/res/values-de/Lingua-General.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--This file was generated with Lingua command line tool. Please do not change it!-->
-<!--Source: https://github.com/poviolabs/Lingua-->
+<!-- This file was generated with Lingua command line tool. Please do not change it! -->
+<!-- Source: https://github.com/poviolabs/Lingua -->
 <resources>
 	<string name="general_success">Erfolg</string>
+	<string name="general_save">Speichern</string>
 </resources>

Example-App/Android/app/src/main/res/values/Lingua-General.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--This file was generated with Lingua command line tool. Please do not change it!-->
-<!--Source: https://github.com/poviolabs/Lingua-->
+<!-- This file was generated with Lingua command line tool. Please do not change it! -->
+<!-- Source: https://github.com/poviolabs/Lingua -->
 <resources>
 	<string name="general_success">Success</string>
+	<string name="general_save">Save</string>
 </resources>

Example-App/iOS/Example-App/Example-App/Resources/Localization/Lingua.swift

@@ -1,12 +1,13 @@
+// swiftlint:disable all
 // This file was generated with Lingua command line tool. Please do not change it!
 // Source: https://github.com/poviolabs/Lingua
 
-// swiftlint:disable all
 import Foundation
 
 enum Lingua {
 	enum General {
-
+		/// Save
+		static let save = tr("General", "save")
 		/// Success
 		static let success = tr("General", "success")
 	}

Example-App/iOS/Example-App/Example-App/Resources/Localization/de.lproj/General.strings

@@ -2,3 +2,4 @@
 // Source: https://github.com/poviolabs/Lingua
 
 "success" = "Erfolg";
+"save" = "Speichern";

Example-App/iOS/Example-App/Example-App/Resources/Localization/en.lproj/General.strings

@@ -2,3 +2,4 @@
 // Source: https://github.com/poviolabs/Lingua
 
 "success" = "Success";
+"save" = "Save";

Sources/Lingua/Common/Extensions/String+Extension.swift

@@ -2,7 +2,7 @@ import Foundation
 
 extension String {
   static let packageName = "Lingua"
-  static let version = "0.2.4"
+  static let version = "0.2.6"
   static let swiftLocalizedName = "\(String.packageName).swift"
   static let fileHeader = """
   This file was generated with Lingua command line tool. Please do not change it!

Sources/Lingua/Infrastructure/LocalizationGenerator/Output/Android/AndroidStringEscaper.swift

@@ -9,8 +9,6 @@ struct AndroidStringEscaper: StringEscaping {
     escapedString = escapedString.replacingOccurrences(of: "\"", with: "\\"")
     escapedString = escapedString.replacingOccurrences(of: "'", with: "\\'")
 
-    debugPrint(string)
-    debugPrint(escapedString)
     return escapedString
   }
 }

Sources/Lingua/Infrastructure/LocalizationGenerator/Output/iOS/IOSNonPluralFormatter.swift

@@ -8,6 +8,6 @@ struct IOSNonPluralFormatter: LocalizedContentFormatting {
   }
 
   func wrapContent(_ content: String) -> String {
-    [String.fileHeader.commentOut(for: .ios), content].joined(separator: "\n")
+    String.fileHeader.commentOut(for: .ios) + "\n\n" + content
   }
 }

Sources/Lingua/Infrastructure/LocalizationGenerator/Output/iOS/IOSStringEscaper.swift

@@ -2,10 +2,6 @@ import Foundation
 
 struct IOSStringEscaper: StringEscaping {
   func escapeSpecialCharacters(in string: String) -> String {
-    var escapedString = string
-    escapedString = escapedString.replacingOccurrences(of: "\\", with: "\\\\")
-    escapedString = escapedString.replacingOccurrences(of: "\"", with: "\\\"")
-    escapedString = escapedString.replacingOccurrences(of: "@", with: "\\@")
-    return escapedString
+    string.replacingOccurrences(of: "\"", with: "\\\"")
   }
 }

Sources/Lingua/Infrastructure/SwiftLocalizeGenerator/Builder/DefaultLocalizedSwiftCodeOutputStringBuilder.swift

@@ -11,9 +11,9 @@ struct DefaultLocalizedSwiftCodeOutputStringBuilder: LocalizedSwiftCodeOutputStr
     let sectionsOutput = buildSectionsOutput(sections: sections, translations: translations)
 
     let output = """
+           // swiftlint:disable all
            \(String.fileHeader.commentOut(for: .ios))
            
-           // swiftlint:disable all
            import Foundation
            
            enum \(String.packageName) {

Sources/Lingua/Infrastructure/SwiftLocalizeGenerator/Generator/LocalizedSwiftCodeGenerator.swift

@@ -47,7 +47,7 @@ private extension LocalizedSwiftCodeGenerator {
 private extension String {
   func commented() -> String {
     components(separatedBy: "\n")
-      .map { "\n\t\t/// \($0)" }
-      .joined()
+      .map { "/// \($0)" }
+      .joined(separator: "\n\t\t")
   }
 }

Tests/LinguaTests/Infrastructure/LocalizationGenerator/Output/iOS/IOSNonPluralFormatterTests.swift

@@ -26,7 +26,7 @@ final class IOSNonPluralFormatterTests: XCTestCase {
     let content = "content"
     let sut = makeSUT()
     let wrappedContent = sut.wrapContent(content)
-    let expectedContent = [String.fileHeader.commentOut(for: .ios), content].joined(separator: "\n")
+    let expectedContent = String.fileHeader.commentOut(for: .ios) + "\n\n" + content
 
     XCTAssertEqual(expectedContent, wrappedContent)
   }

Tests/LinguaTests/Infrastructure/LocalizationGenerator/Output/iOS/IOSStringEscaperTests.swift

@@ -3,19 +3,16 @@ import XCTest
 
 final class IOSStringEscaperTests: XCTestCase {
   func test_escapeSpecialCharacters_backslash() {
-    expect(original: "This is a test\\", expected: "This is a test\\\\")
+    expect(original: "This is a test\\", expected: "This is a test\\")
   }
 
   func test_escapeSpecialCharacters_quotes() {
     expect(original: "This is a \"test\"", expected: "This is a \\\"test\\\"")
   }
 
-  func test_escapeSpecialCharacters_atSymbol() {
-    expect(original: "This is a @test", expected: "This is a \\@test")
-  }
-
   func test_escapeSpecialCharacters_multipleCharacters() {
-    expect(original: "This \\ is a \"test\" @ multiple characters", expected: "This \\\\ is a \\\"test\\\" \\@ multiple characters")
+    expect(original: "This is a \"test\" @ multiple \n characters",
+           expected: "This is a \\\"test\\\" @ multiple \n characters")
   }
 }
 

Tests/LinguaTests/Infrastructure/SwiftLocalizeGenerator/Builder/DefaultLocalizedSwiftCodeOutputStringBuilderTests.swift

@@ -23,10 +23,10 @@ final class DefaultLocalizedSwiftCodeOutputStringBuilderTests: XCTestCase {
     let output = sut.buildOutput(sections: sections, translations: translations)
 
     let expectedOutput = """
+    // swiftlint:disable all
     // This file was generated with Lingua command line tool. Please do not change it!
     // Source: https://github.com/poviolabs/Lingua
     
-    // swiftlint:disable all
     import Foundation
     
     enum Lingua {

Tests/LinguaTests/Infrastructure/SwiftLocalizeGenerator/Generator/LocalizedSwiftCodeGeneratorTests.swift

@@ -6,7 +6,7 @@ final class LocalizedSwiftCodeGeneratorTests: XCTestCase {
     let sut = makeSUT()
     let code = sut.generateCode(section: "section", key: "key", translation: "translation %d %@")
     let expectedCode = """
-         \n\t\t/// translation %d %@
+         /// translation %d %@
          \t\tstatic func key(_ param1: Int, _ param2: String) -> String {
          \t\t\treturn tr("section", "key", param1, param2)
          \t\t}
@@ -17,7 +17,7 @@ final class LocalizedSwiftCodeGeneratorTests: XCTestCase {
   func test_generateCode_createsStaticPropertyCode_forNoStringFormatSpecifiers() {
     let sut = makeSUT()
     let code = sut.generateCode(section: "section", key: "key", translation: "translation")
-    XCTAssertEqual(code, "\n\t\t/// translation\n\t\tstatic let key = tr(\"section\", \"key\")")
+    XCTAssertEqual(code, "/// translation\n\t\tstatic let key = tr(\"section\", \"key\")")
   }
 }