diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-01 20:45:09 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-01 20:45:09 -0300 |
| commit | 4fd3dc59480e313d043acd7b4ba69b7b6f4e392f (patch) | |
| tree | 9e887f6b853ca20dd1cbf986f5031d4b4215013d /android | |
| parent | d375db98b18b25e8002334e6d4783803cd4412df (diff) | |
| parent | 761d5c7c0e1433b5fefa9e3016e13b3f6ac45839 (diff) | |
| download | mullvadvpn-4fd3dc59480e313d043acd7b4ba69b7b6f4e392f.tar.xz mullvadvpn-4fd3dc59480e313d043acd7b4ba69b7b6f4e392f.zip | |
Merge branch 'fix-escaping-in-translations-converter'
Diffstat (limited to 'android')
| -rw-r--r-- | android/translations-converter/src/android.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/translations-converter/src/android.rs b/android/translations-converter/src/android.rs index 9cd634b1b7..cb6bc2de50 100644 --- a/android/translations-converter/src/android.rs +++ b/android/translations-converter/src/android.rs @@ -290,7 +290,7 @@ pub struct StringValue(String); impl From<&str> for StringValue { fn from(string: &str) -> Self { - let value_with_parameters = htmlize::unescape(string) + let value_with_parameters = htmlize::escape_text(string) .replace(r"\", r"\\") .replace("\"", "\\\"") .replace(r"'", r"\'"); @@ -320,7 +320,7 @@ impl StringValue { let value = PARAMETERS.replace_all(&value, "%"); // Unescape XML characters - self.0 = htmlize::escape_text(value.as_bytes()); + self.0 = htmlize::unescape(value.as_bytes()); } /// Clones the internal string value. |