From 16d13fb2dfdbb7622d78d4d4b5f2450f04862e08 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Mon, 16 Jun 2025 10:08:01 +0200
Subject: [PATCH] fix wrong plurals implementation

(backported manually)

- key was duplicated
- kotlin handling of plurals was missing

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt    | 5 +++--
 app/src/main/res/layout/remainder_to_delete_conversation.xml | 1 -
 app/src/main/res/values/strings.xml                          | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 3f3289e10..39d3b08ae 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -1238,8 +1238,9 @@ class ChatActivity :
         val deleteNoticeText = binding.conversationDeleteNotice.findViewById<TextView>(R.id.deletion_message)
         viewThemeUtils.material.themeCardView(binding.conversationDeleteNotice)
 
-        deleteNoticeText.text = String.format(
-            resources.getString(R.string.nc_conversation_auto_delete_notice),
+        deleteNoticeText.text = resources.getQuantityString(
+            R.plurals.nc_conversation_auto_delete_info,
+            retentionPeriod,
             retentionPeriod
         )
         viewThemeUtils.material.colorMaterialButtonPrimaryTonal(
diff --git a/app/src/main/res/layout/remainder_to_delete_conversation.xml b/app/src/main/res/layout/remainder_to_delete_conversation.xml
index 02629b197..9c94b40d8 100644
--- a/app/src/main/res/layout/remainder_to_delete_conversation.xml
+++ b/app/src/main/res/layout/remainder_to_delete_conversation.xml
@@ -19,7 +19,6 @@
         android:id="@+id/deletion_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/nc_conversation_auto_delete_notice"
         android:textSize="14sp"
         android:lineSpacingExtra="4dp"
         android:gravity="center"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 887a4849f..43b72fa46 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -520,8 +520,11 @@ How to translate with transifex:
     <string name="nc_forward_message">Forward</string>
     <string name="nc_reply">Reply</string>
     <string name="nc_reply_privately">Reply privately</string>
+    <plurals name="nc_conversation_auto_delete_info">
+        <item quantity="one">This conversation will be automatically deleted for everyone in %1$d day of no activity</item>
+        <item quantity="other">This conversation will be automatically deleted for everyone in %1$d days of no activity</item>
+    </plurals>
     <string name="nc_delete_message">Delete</string>
-    <string name="nc_conversation_auto_delete_notice">This conversation will be automatically deleted for everyone in %1$d days of no activity</string>
     <string name="nc_delete_now">Delete now</string>
     <string name="nc_keep">Keep</string>
     <string name="nc_delete_message_leaked_to_matterbridge">Message deleted successfully, but it might have been leaked to other services</string>