Skip to content

fix: translate German MLS migration message [WPB-25947] #4968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Garzas merged 2 commits into from
Jun 16, 2026
+13 −3
Merged

fix: translate German MLS migration message [WPB-25947] #4968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6aa131
fix: translate German MLS migration message
Garzas Jun 15, 2026
53abcfe
Merge branch 'develop' into fix/develop-migration-message-german-tran…
Garzas Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
textStyle = MaterialTheme.wireTypography.body01,
text = annotatedStringBuilder(expanded),
linkText = when {
learnMoreLink != null && (!expandable || expanded) -> stringResource(id = R.string.label_learn_more)
learnMoreLink != null && (!expandable || expanded) -> stringResource(id = learnMoreTextResId)
else -> null
},
textColor = MaterialTheme.wireColorScheme.secondaryText,
Expand Down Expand Up @@ -374,8 +374,13 @@
iconTintColor = MaterialTheme.wireColorScheme.onBackground,
learnMoreLinkResId = when (protocol) {
Conversation.Protocol.PROTEUS -> null
Conversation.Protocol.MIXED -> null
Conversation.Protocol.MIXED -> R.string.url_system_message_learn_more_about_mls
Conversation.Protocol.MLS -> R.string.url_system_message_learn_more_about_mls
},
learnMoreTextResId = when (protocol) {
Conversation.Protocol.PROTEUS -> R.string.label_learn_more
Conversation.Protocol.MIXED,
Conversation.Protocol.MLS -> R.string.label_learn_more_about_mls
}
) {
stringResource(
Expand Down Expand Up @@ -640,6 +645,7 @@
private fun buildContent(
expandable: Boolean = false,
@StringRes learnMoreLinkResId: Int? = null,
@StringRes learnMoreTextResId: Int = R.string.label_learn_more,
@DrawableRes iconResId: Int = commonR.drawable.ic_info,
iconTintColor: Color? = MaterialTheme.wireColorScheme.onBackground,
iconSize: Dp = MaterialTheme.wireDimensions.systemMessageIconSize,
Expand All @@ -649,6 +655,7 @@
) = SystemMessageContent(
expandable = expandable,
learnMoreLinkResId = learnMoreLinkResId,
learnMoreTextResId = learnMoreTextResId,
iconResId = iconResId,
iconTintColor = iconTintColor,
iconSize = iconSize,
Expand All @@ -669,6 +676,7 @@
data class SystemMessageContent(
val expandable: Boolean,
@get:StringRes val learnMoreLinkResId: Int?,
@get:StringRes val learnMoreTextResId: Int,

Check warning on line 679 in app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt

View check run for this annotation

Codecov / codecov/patch

app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt#L679 

Added line #L679 was not covered by tests
@get:DrawableRes val iconResId: Int?,
val iconTintColor: Color?,
val iconSize: Dp,
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
<string name="label_leave">Verlassen</string>
<string name="label_add_device">Gerät hinzufügen</string>
<string name="label_learn_more">Mehr erfahren</string>
<string name="label_learn_more_about_mls">Erfahren Sie mehr über MLS</string>
<string name="label_removing">Entfernen…</string>
<string name="label_logging_in">Anmelden…</string>
<string name="label_try_again">Erneut versuchen</string>
Expand Down Expand Up @@ -802,7 +803,7 @@
<string name="label_system_message_conversation_history_lost_protocol_changed">Sie haben Ihre App nicht rechtzeitig aktualisiert. Einige Nachrichten werden hier eventuell nicht angezeigt.</string>
<string name="label_system_message_conversation_protocol_changed_proteus">Migration des Verschlüsselungsprotokolls wurde abgebrochen.</string>
<string name="label_system_message_conversation_protocol_changed_during_a_call">Aufgrund der Umstellung auf MLS haben Sie möglicherweise Probleme mit Ihrem aktuellen Anruf. Wenn das der Fall ist, legen Sie auf und rufen Sie erneut an.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Die Migration des Verschlüsselungsprotokolls wurde gestartet. Stellen Sie sicher, dass alle Ihre Geräte aktualisiert werden.</string>
<string name="label_system_message_conversation_protocol_changed_mixed">Das Standard-Nachrichtenprotokoll wird von Proteus auf Messaging-Layer-Security (MLS) umgestellt.</string>
<string name="label_system_message_conversation_protocol_changed_mls">Diese Unterhaltung verwendet jetzt das neue Protokoll namens Messaging-Layer-Security (MLS). Um eine reibungslose Kommunikation zu gewährleisten, verwenden Sie immer die neueste Wire-Version auf Ihren Geräten.</string>
<string name="label_system_message_receipt_mode_on">ein</string>
<string name="label_system_message_receipt_mode_off">aus</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<string name="label_leave">Leave</string>
<string name="label_add_device">Add Device</string>
<string name="label_learn_more">Learn more</string>
<string name="label_learn_more_about_mls">Learn more about MLS</string>
<string name="label_removing">Removing…</string>
<string name="label_logging_in">Logging in…</string>
<string name="label_try_again">Try Again</string>
Expand Down
Loading