From 101caa7595c02a028a7d655ef435c2d0d34c68f0 Mon Sep 17 00:00:00 2001
From: AleIlMagno <123492061+AleIlMagno@users.noreply.github.com>
Date: Mon, 1 Jul 2024 14:00:48 +0200
Subject: [PATCH 1/3] Fix UI translation

Currently there is a bug that makes translations for the remaing expiration time not showing.
The reason seems that the these strings are saved in a separate plurals.xml and should be integrated in the near strings.xml
---
 .../src/main/res/values/plurals.xml           | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/mail-common/presentation/src/main/res/values/plurals.xml b/mail-common/presentation/src/main/res/values/plurals.xml
index 19df59c049..8b13789179 100644
--- a/mail-common/presentation/src/main/res/values/plurals.xml
+++ b/mail-common/presentation/src/main/res/values/plurals.xml
@@ -1,32 +1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2022 Proton Technologies AG
-  ~ This file is part of Proton Technologies AG and Proton Mail.
-  ~
-  ~ Proton Mail is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ Proton Mail is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with Proton Mail. If not, see <https://www.gnu.org/licenses/>.
-  -->
-<resources>
-    <plurals name="expiration_minutes_full_word">
-        <item quantity="one">%d minute</item>
-        <item quantity="other">%d minutes</item>
-    </plurals>
-    <plurals name="expiration_hours_full_word">
-        <item quantity="one">%d hour</item>
-        <item quantity="other">%d hours</item>
-    </plurals>
-    <plurals name="expiration_days_full_word">
-        <item quantity="one">%d day</item>
-        <item quantity="other">%d days</item>
-    </plurals>
-</resources>
+

From 06b95e9366d5121f79e7b1a1e06e2c9905083587 Mon Sep 17 00:00:00 2001
From: AleIlMagno <123492061+AleIlMagno@users.noreply.github.com>
Date: Mon, 1 Jul 2024 14:09:07 +0200
Subject: [PATCH 2/3] Fix UI translation

Currently there is a bug that makes translations for the remaing expiration time not showing.
The reason seems that the these strings are saved in a separate plurals.xml and should be integrated in the near strings.xml
---
 .../presentation/src/main/res/values/strings.xml     | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/mail-common/presentation/src/main/res/values/strings.xml b/mail-common/presentation/src/main/res/values/strings.xml
index 48251feb5f..01b2730557 100644
--- a/mail-common/presentation/src/main/res/values/strings.xml
+++ b/mail-common/presentation/src/main/res/values/strings.xml
@@ -79,6 +79,18 @@
     <string name="action_more_content_description">More</string>
     <string name="common_error_loading_actions">Failed loading actions</string>
     <string name="yesterday">Yesterday</string>
+    <plurals name="expiration_minutes_full_word">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
+    <plurals name="expiration_hours_full_word">
+        <item quantity="one">%d hour</item>
+        <item quantity="other">%d hours</item>
+    </plurals>
+    <plurals name="expiration_days_full_word">
+        <item quantity="one">%d day</item>
+        <item quantity="other">%d days</item>
+    </plurals>
 
     <!-- notification channels -->
     <string name="attachment_download_notification_channel_name">Attachments</string>

From 89a877e6f102f503ff9e39fdd46845b57595c771 Mon Sep 17 00:00:00 2001
From: AleIlMagno <123492061+AleIlMagno@users.noreply.github.com>
Date: Mon, 1 Jul 2024 14:09:53 +0200
Subject: [PATCH 3/3] Fix UI translations

Currently there is a bug that makes translations for the remaing expiration time not showing.
The reason seems that the these strings are saved in a separate plurals.xml and should be integrated in the near strings.xml
---
 mail-common/presentation/src/main/res/values/plurals.xml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 mail-common/presentation/src/main/res/values/plurals.xml

diff --git a/mail-common/presentation/src/main/res/values/plurals.xml b/mail-common/presentation/src/main/res/values/plurals.xml
deleted file mode 100644
index 8b13789179..0000000000
--- a/mail-common/presentation/src/main/res/values/plurals.xml
+++ /dev/null
@@ -1 +0,0 @@
-