diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-20 21:04:59 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-22 12:15:32 +0000 |
| commit | 59c8a3a59000cc40e93ea861885fd4cac6506e10 (patch) | |
| tree | 0cba970e1f93828222a757fd0dd85d8387b9ca34 | |
| parent | e7007a6065ac874c7a6055d43ac951e7a1e603fd (diff) | |
| download | mullvadvpn-59c8a3a59000cc40e93ea861885fd4cac6506e10.tar.xz mullvadvpn-59c8a3a59000cc40e93ea861885fd4cac6506e10.zip | |
Properly escape double quotes on Android strings
| -rw-r--r-- | android/translations-converter/src/android.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android/translations-converter/src/android.rs b/android/translations-converter/src/android.rs index cb6bc2de50..f49f50025c 100644 --- a/android/translations-converter/src/android.rs +++ b/android/translations-converter/src/android.rs @@ -9,6 +9,7 @@ use std::{ lazy_static! { static ref LINE_BREAKS: Regex = Regex::new(r"\s*\n\s*").unwrap(); static ref APOSTROPHES: Regex = Regex::new(r"\\'").unwrap(); + static ref DOUBLE_QUOTES: Regex = Regex::new(r#"\\""#).unwrap(); static ref PARAMETERS: Regex = Regex::new(r"%[0-9]*\$").unwrap(); } @@ -316,6 +317,8 @@ impl StringValue { let value = LINE_BREAKS.replace_all(&self.0, " "); // Unescape apostrophes let value = APOSTROPHES.replace_all(&value, "'"); + // Unescape double quotes + let value = DOUBLE_QUOTES.replace_all(&value, r#"""#); // Mark where parameters are positioned, removing the parameter index let value = PARAMETERS.replace_all(&value, "%"); |