Merge pull request #200 from mac-cain13/bugfix/escape-crlf

Correctly escape CR+LF in R.string

Author: mac-cain13

R.swift/Generators/StringsGenerator.swift

@@ -289,17 +289,17 @@ private struct StringValues {
     let anyNone = values.any { $0.0.isNone }
 
     if let baseValue = baseValue {
-      let str = "Base translation: \(baseValue)".stringByReplacingOccurrencesOfString("\n", withString: " ")
+      let str = "Base translation: \(baseValue)".commentString
       results.append(str)
     }
     else if !containsBase {
       if let (locale, value) = values.first {
         if let localeDescription = locale.localeDescription {
-          let str = "\(localeDescription) translation: \(value)".stringByReplacingOccurrencesOfString("\n", withString: " ")
+          let str = "\(localeDescription) translation: \(value)".commentString
           results.append(str)
         }
         else {
-          let str = "Value: \(value)".stringByReplacingOccurrencesOfString("\n", withString: " ")
+          let str = "Value: \(value)".commentString
           results.append(str)
         }
       }

R.swift/Util/UtilExtensions.swift

@@ -56,8 +56,16 @@ extension String {
       .stringByReplacingOccurrencesOfString("\\", withString: "\\\\")
       .stringByReplacingOccurrencesOfString("\"", withString: "\\\"")
       .stringByReplacingOccurrencesOfString("\t", withString: "\\t")
+      .stringByReplacingOccurrencesOfString("\r", withString: "\\r")
       .stringByReplacingOccurrencesOfString("\n", withString: "\\n")
   }
+
+  var commentString: String {
+    return self
+      .stringByReplacingOccurrencesOfString("\r\n", withString: " ")
+      .stringByReplacingOccurrencesOfString("\r", withString: " ")
+      .stringByReplacingOccurrencesOfString("\n", withString: " ")
+  }
 }
 
 // MARK: NSURL operations 

ResourceApp/ResourceApp/Strings/Base.lproj/Settings.strings

@@ -15,6 +15,7 @@
 \"\\DEF/\"
 GHI Base";
 "Copy.Progress" = "%1$d of %2$i files copied, %3$f.2%% completed.";
+"We need a couple things\r\nbefore you get started." = "We need a couple things\r\nbefore you get started.";
 
 "FormatSpecifiers1" = "number 1: %d, number 2: %i, string 3: %@";
 "FormatSpecifiers2" = "string 3: %3$@, number 2: %2$d, number 1: %1$i";

ResourceApp/ResourceApp/Strings/nl.lproj/Settings.strings

@@ -15,6 +15,7 @@
 \"\\DEF/\"
 GHI Dutch";
 "Copy.Progress" = "Van de %2$d bestanden zijn er %1$d gekopieerd, %3$.2f%% compleet.";
+"We need a couple things\r\nbefore you get started." = "We hebben een aantal dingen nodig\r\nvoordat je begint.";
 
 "FormatSpecifiers1" = "number 1: %d, number 2: %i";
 "FormatSpecifiers2" = "string 3: %3$@, number 1: %1$i";