From e15957357a1f33159ff2f133663891fb99532559 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Mon, 16 Jun 2025 10:08:01 +0200 Subject: [PATCH] fix wrong plurals implementation - key was duplicated - kotlin handling of plurals was missing Signed-off-by: Marcel Hibbe [skip ci] --- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 5 +++-- app/src/main/res/layout/remainder_to_delete_conversation.xml | 1 - 2 files changed, 3 insertions(+), 3 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(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"