diff --git a/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt b/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt index 20d133c..5724761 100644 --- a/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt +++ b/android/app/src/main/java/ru/daemonlord/messenger/ui/settings/SettingsScreen.kt @@ -444,7 +444,12 @@ private fun NotificationsFolder(state: AccountUiState, viewModel: AccountViewMod overflow = TextOverflow.Ellipsis, ) Text( - text = "chat=${notification.chatId ?: "-"} • msg=${notification.messageId ?: "-"} • ${notification.createdAt}", + text = stringResource( + id = R.string.settings_notification_meta, + notification.chatId?.toString() ?: "-", + notification.messageId?.toString() ?: "-", + notification.createdAt, + ), style = MaterialTheme.typography.labelSmall, color = MaterialTheme.colorScheme.onSurfaceVariant, maxLines = 1, @@ -554,7 +559,7 @@ private fun SettingsShortcut(title: String, subtitle: String, onClick: () -> Uni contentAlignment = Alignment.Center, ) { Text( - text = title.firstOrNull()?.uppercase() ?: "A", + text = title.firstOrNull()?.uppercase() ?: stringResource(id = R.string.settings_fallback_avatar_letter), style = MaterialTheme.typography.labelMedium, maxLines = 1, ) diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml index b4ab89c..743bc1c 100644 --- a/android/app/src/main/res/values-ru/strings.xml +++ b/android/app/src/main/res/values-ru/strings.xml @@ -234,6 +234,8 @@ Обновить историю уведомлений Последние уведомления Пока нет серверных уведомлений. + chat=%1$s • msg=%2$s • %3$s + А Личные сообщения Время захода Аватар diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 4b6071f..90ed85a 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -234,6 +234,8 @@ Refresh notification history Recent notifications No server notifications yet. + chat=%1$s • msg=%2$s • %3$s + A Private messages Last seen Avatar