diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt index 98a1228297..ff969c2b84 100755 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt @@ -360,14 +360,11 @@ class DefaultNotificationCreator( notificationAccountParams: NotificationAccountParams, ): Notification { val userId = notificationAccountParams.user.userId - val text = if (notificationAccountParams.showSessionId) { - // TODO i18n - "$userId will not receive notifications anymore." - } else { - // TODO i18n - "You will not receive notifications anymore." - } + val text = stringProvider.getString(R.string.notification_error_unified_push_unregistered_android) return NotificationCompat.Builder(context, notificationChannels.getChannelIdForTest()) + .setSubText(userId.value) + // The text is long and can be truncated so use BigTextStyle. + .setStyle(NotificationCompat.BigTextStyle().bigText(text)) .setContentTitle(stringProvider.getString(CommonStrings.dialog_title_warning)) .setContentText(text) .configureWith(notificationAccountParams) @@ -479,7 +476,7 @@ class DefaultNotificationCreator( .build() ).also { it.conversationTitle = if (isThread) { - stringProvider.getString(CommonStrings.notification_thread_in_room, roomName) + stringProvider.getString(R.string.notification_thread_in_room, roomName) } else { roomName } diff --git a/libraries/push/impl/src/main/res/values-cs/translations.xml b/libraries/push/impl/src/main/res/values-cs/translations.xml index b93ae49dd7..8cc5d79095 100644 --- a/libraries/push/impl/src/main/res/values-cs/translations.xml +++ b/libraries/push/impl/src/main/res/values-cs/translations.xml @@ -42,6 +42,7 @@ "Já" "%1$s zmínil(a) nebo odpověděl(a)" "Prohlížíte si oznámení! Klikněte na mě!" + "Vlákno v %1$s" "%1$s: %2$s" "%1$s: %2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values-da/translations.xml b/libraries/push/impl/src/main/res/values-da/translations.xml index 255605953b..a5b23fc7ba 100644 --- a/libraries/push/impl/src/main/res/values-da/translations.xml +++ b/libraries/push/impl/src/main/res/values-da/translations.xml @@ -38,6 +38,7 @@ "Mig" "%1$s nævnt eller besvaret" "Du ser notifikationen! Klik på mig!" + "Tråd i %1$s" "%1$s: %2$s" "%1$s: %2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values-de/translations.xml b/libraries/push/impl/src/main/res/values-de/translations.xml index dff6371773..1a9e2f21c4 100644 --- a/libraries/push/impl/src/main/res/values-de/translations.xml +++ b/libraries/push/impl/src/main/res/values-de/translations.xml @@ -38,6 +38,7 @@ "Ich" "%1$s hat Dich erwähnt oder geantwortet" "Du siehst dir die Benachrichtigung an! Klicke hier!" + "Thread in %1$s" "%1$s: %2$s" "%1$s: %2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values-et/translations.xml b/libraries/push/impl/src/main/res/values-et/translations.xml index 45d8e3c8c8..7f012722e7 100644 --- a/libraries/push/impl/src/main/res/values-et/translations.xml +++ b/libraries/push/impl/src/main/res/values-et/translations.xml @@ -38,6 +38,7 @@ "Mina" "%1$s mainis või vastas" "See ongi teavitus! Klõpsi mind!" + "Jutulõng „%1$s“ jututoas" "%1$s: %2$s" "%1$s: %2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values-fr/translations.xml b/libraries/push/impl/src/main/res/values-fr/translations.xml index 5324597f8b..9464297d8a 100644 --- a/libraries/push/impl/src/main/res/values-fr/translations.xml +++ b/libraries/push/impl/src/main/res/values-fr/translations.xml @@ -38,6 +38,7 @@ "Moi" "%1$s mentionné ou en réponse" "Vous êtes en train de voir la notification ! Cliquez-moi !" + "Discussion dans %1$s" "%1$s : %2$s" "%1$s : %2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values-sk/translations.xml b/libraries/push/impl/src/main/res/values-sk/translations.xml index 5dd3b8c0f2..a4deefba78 100644 --- a/libraries/push/impl/src/main/res/values-sk/translations.xml +++ b/libraries/push/impl/src/main/res/values-sk/translations.xml @@ -42,6 +42,7 @@ "Ja" "%1$s spomenul/a alebo odpovedal/a" "Prezeráte si oznámenie! Kliknite na mňa!" + "Vlákno v %1$s" "%1$s: %2$s" "%1$s: %2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml index eded8c4c88..9e167a2e92 100644 --- a/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml +++ b/libraries/push/impl/src/main/res/values-zh-rTW/translations.xml @@ -34,6 +34,7 @@ "我" "%1$s 提及或回覆" "您正在查看通知！點我！" + "在 %1$s 的討論串" "%1$s：%2$s" "%1$s：%2$s %3$s" diff --git a/libraries/push/impl/src/main/res/values/localazy.xml b/libraries/push/impl/src/main/res/values/localazy.xml index 45a3235ad5..0764851647 100644 --- a/libraries/push/impl/src/main/res/values/localazy.xml +++ b/libraries/push/impl/src/main/res/values/localazy.xml @@ -13,6 +13,7 @@ "%d notification" "%d notifications" + "The UnifiedPush notification distributor couldn\'t be registered, so you will not receive notifications anymore. Please check the notifications settings of the app and the status of the push distributor." "You have new messages." "📹 Incoming call" "** Failed to send - please open room" @@ -38,6 +39,7 @@ "Me" "%1$s mentioned or replied" "You are viewing the notification! Click me!" + "Thread in %1$s" "%1$s: %2$s" "%1$s: %2$s %3$s" diff --git a/libraries/ui-strings/src/main/res/values-cs/translations.xml b/libraries/ui-strings/src/main/res/values-cs/translations.xml index 0dc85069ef..ccc293a691 100644 --- a/libraries/ui-strings/src/main/res/values-cs/translations.xml +++ b/libraries/ui-strings/src/main/res/values-cs/translations.xml @@ -427,7 +427,6 @@ Opravdu chcete pokračovat?" "🔐️ Připojte se ke mně na %1$s" "Ahoj, ozvi se mi na %1$s: %2$s" "%1$s Android" - "Vlákno v %1$s" "Zatřeste zařízením pro nahlášení chyby" "Snímek obrazovky" "%1$s: %2$s" diff --git a/libraries/ui-strings/src/main/res/values-da/translations.xml b/libraries/ui-strings/src/main/res/values-da/translations.xml index b3d2aac151..f8491d6f26 100644 --- a/libraries/ui-strings/src/main/res/values-da/translations.xml +++ b/libraries/ui-strings/src/main/res/values-da/translations.xml @@ -420,7 +420,6 @@ Er du sikker på, at du vil fortsætte?" "🔐️ Kom med mig til %1$s" "Hej, lad os snakkes på %1$s: %2$s" "%1$s Android" - "Tråd i %1$s" "Ryst enheden i frustration for at anmelde en fejl" "Skærmbillede" "%1$s: %2$s" diff --git a/libraries/ui-strings/src/main/res/values-de/translations.xml b/libraries/ui-strings/src/main/res/values-de/translations.xml index e8ac460307..27e75b687c 100644 --- a/libraries/ui-strings/src/main/res/values-de/translations.xml +++ b/libraries/ui-strings/src/main/res/values-de/translations.xml @@ -420,7 +420,6 @@ Möchtest du wirklich fortfahren?" "🔐️ Begleite mich auf %1$s" "Hey, sprich mit mir auf %1$s: %2$s" "%1$s Android" - "Thread in %1$s" "Heftiges Schütteln um Fehler zu melden" "Bildschirmfoto" "%1$s: %2$s" diff --git a/libraries/ui-strings/src/main/res/values-et/translations.xml b/libraries/ui-strings/src/main/res/values-et/translations.xml index 2f3bd58e04..2732cb60de 100644 --- a/libraries/ui-strings/src/main/res/values-et/translations.xml +++ b/libraries/ui-strings/src/main/res/values-et/translations.xml @@ -421,7 +421,6 @@ Kas sa oled kindel, et soovid jätkata?" "🔐️ Liitu minuga rakenduses %1$s" "Hei, suhtle minuga %1$s võrgus: %2$s" "%1$s Android" - "Jutulõng „%1$s“ jututoas" "Veast teatamiseks raputa nutiseadet ägedalt" "Ekraanitõmmis" "%1$s: %2$s" diff --git a/libraries/ui-strings/src/main/res/values-fr/translations.xml b/libraries/ui-strings/src/main/res/values-fr/translations.xml index ec88a9e79f..ebc611015a 100644 --- a/libraries/ui-strings/src/main/res/values-fr/translations.xml +++ b/libraries/ui-strings/src/main/res/values-fr/translations.xml @@ -421,7 +421,6 @@ Raison : %1$s." "🔐️ Rejoignez-moi sur %1$s" "Salut, parle-moi sur %1$s : %2$s" "%1$s Android" - "Discussion dans %1$s" "Rageshake pour signaler un problème" "Capture d’écran" "%1$s: %2$s" diff --git a/libraries/ui-strings/src/main/res/values-sk/translations.xml b/libraries/ui-strings/src/main/res/values-sk/translations.xml index 9a2601019c..a94c5657cf 100644 --- a/libraries/ui-strings/src/main/res/values-sk/translations.xml +++ b/libraries/ui-strings/src/main/res/values-sk/translations.xml @@ -429,7 +429,6 @@ Naozaj chcete pokračovať?" "🔐️ Pripojte sa ku mne na %1$s" "Ahoj, porozprávajte sa so mnou na %1$s: %2$s" "%1$s Android" - "Vlákno v %1$s" "Zúrivo potriasť pre nahlásenie chyby" "Snímka obrazovky" "%1$s: %2$s" diff --git a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml index 2838cf9669..0a8f32a694 100644 --- a/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml +++ b/libraries/ui-strings/src/main/res/values-zh-rTW/translations.xml @@ -412,7 +412,6 @@ "🔐️ 在 %1$s 上加入我" "嘿，來 %1$s 和我聊天：%2$s" "%1$s Android" - "在 %1$s 的討論串" "憤怒搖晃以回報臭蟲" "螢幕截圖" "%1$s：%2$s" diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 7bf9e8192c..efe530f885 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -421,7 +421,6 @@ Are you sure you want to continue?" "🔐️ Join me on %1$s" "Hey, talk to me on %1$s: %2$s" "%1$s Android" - "Thread in %1$s" "Rageshake to report bug" "Screenshot" "%1$s: %2$s" diff --git a/tools/localazy/config.json b/tools/localazy/config.json index 39d63484a9..405451bb34 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -129,6 +129,7 @@ "includeRegex" : [ "push_.*", "notification_.*", + "notification\\..*", "troubleshoot_notifications\\.test_blocked_users\\..*", "troubleshoot_notifications_test_current_push_provider.*", "troubleshoot_notifications_test_detect_push_provider.*",