Merge branch 'change-apostrophes'

2 files changed, 5 insertions, 8 deletions

diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 85305809d3..1611bc56b4 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -21,13 +21,13 @@
     <string name="logged_in_description">Valid account number</string>
     <string name="login_fail_title">Login failed</string>
     <string name="login_fail_description">Invalid account number</string>
-    <string name="dont_have_an_account">Don\'t have an account number?</string>
+    <string name="dont_have_an_account">Don’t have an account number?</string>
     <string name="create_account">Create account</string>
     <string name="creating_new_account">Creating account...</string>
     <string name="failed_to_create_account">Failed to create account</string>
     <string name="account_created">Account created</string>
     <string name="congrats">Congrats!</string>
-    <string name="here_is_your_account_number">Here\'s your account number. Save it!</string>
+    <string name="here_is_your_account_number">Here’s your account number. Save it!</string>
     <string name="pay_to_start_using">To start using the app, you first need to add time to your
     account.</string>
     <string name="buy_credit">Buy credit</string>
@@ -71,7 +71,7 @@
     <string name="wireguard_mtu">WireGuard MTU</string>
     <string name="wireguard_mtu_footer">Set WireGuard MTU value. Valid range: %1$d - %2$d.</string>
     <string name="hint_default">Default</string>
-    <string name="problem_report_description">To help you more effectively, your app\'s log file
+    <string name="problem_report_description">To help you more effectively, your app’s log file
     will be attached to this message. Your data will remain secure and private, as it is anonymised
     before being sent over an encrypted channel.</string>
     <string name="user_email_hint">Your email (optional)</string>
@@ -184,7 +184,7 @@
     <string name="max_devices_resolved_title">Super!</string>
     <string name="max_devices_warning_description">You have too many active devices. Please log out
     of at least one by removing it from the list below. You can find the corresponding nickname
-    under the device\'s Account settings.</string>
+    under the device’s Account settings.</string>
     <string name="max_devices_resolved_description">You can now continue logging in on this
     device.</string>
     <string name="max_devices_confirm_removal_description">
diff --git a/android/translations-converter/src/normalize.rs b/android/translations-converter/src/normalize.rs
index 4896e6d25c..b1a1d6a1d2 100644
--- a/android/translations-converter/src/normalize.rs
+++ b/android/translations-converter/src/normalize.rs
@@ -38,7 +38,6 @@ mod gettext {
     use crate::gettext::MsgString;
 
     lazy_static! {
-        static ref APOSTROPHE_VARIATION: Regex = Regex::new("’").unwrap();
         static ref ESCAPED_SINGLE_QUOTES: Regex = Regex::new(r"\\'").unwrap();
         static ref ESCAPED_DOUBLE_QUOTES: Regex = Regex::new(r#"\\""#).unwrap();
         static ref PARAMETERS: Regex = Regex::new(r"%\([^)]*\)").unwrap();
@@ -46,10 +45,8 @@ mod gettext {
 
     impl Normalize for MsgString {
         fn normalize(&self) -> String {
-            // Use a single common apostrophe character
-            let string = APOSTROPHE_VARIATION.replace_all(self, "'");
             // Mark where parameters are positioned, removing the parameter name
-            let string = PARAMETERS.replace_all(&string, "%");
+            let string = PARAMETERS.replace_all(self, "%");
             // Remove escaped single-quotes
             let string = ESCAPED_SINGLE_QUOTES.replace_all(&string, r"'");
             // Remove escaped double-quotes