diff --git a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt index 7f285e1f76..04c1eac5a9 100644 --- a/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt +++ b/features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt @@ -166,13 +166,13 @@ private fun RoomMemberAsyncActions( when (val action = state.unbanUserAsyncAction) { is AsyncAction.Confirming -> { ConfirmationDialog( - title = stringResource(R.string.screen_room_member_list_manage_member_unban_title), - content = stringResource(R.string.screen_room_member_list_manage_member_unban_message), - submitText = stringResource(R.string.screen_room_member_list_manage_member_unban_action), + title = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_title), + content = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_description), + submitText = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_action), onSubmitClick = { val userDisplayName = selectedUser?.getBestName().orEmpty() asyncIndicatorState.enqueue { - AsyncIndicator.Loading(text = stringResource(R.string.screen_room_member_list_unbanning_user, userDisplayName)) + AsyncIndicator.Loading(text = stringResource(R.string.screen_bottom_sheet_manage_room_member_unbanning_user, userDisplayName)) } state.eventSink(InternalRoomMemberModerationEvents.DoUnbanUser) }, @@ -297,7 +297,7 @@ private fun RoomMemberActionsBottomSheet( } is ModerationAction.UnbanUser -> { ListItem( - headlineContent = { Text(stringResource(R.string.screen_room_member_list_manage_member_unban_action)) }, + headlineContent = { Text(stringResource(R.string.screen_bottom_sheet_manage_room_member_unban)) }, leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Restart())), style = ListItemStyle.Destructive, onClick = { diff --git a/features/roommembermoderation/impl/src/main/res/values/localazy.xml b/features/roommembermoderation/impl/src/main/res/values/localazy.xml index 8e9b3defc1..16b013d537 100644 --- a/features/roommembermoderation/impl/src/main/res/values/localazy.xml +++ b/features/roommembermoderation/impl/src/main/res/values/localazy.xml @@ -12,10 +12,9 @@ "Remove from room" "Remove member and ban from joining in the future?" "Removing %1$s…" - "Ban from room" - "Only remove member" - "Unban" - "They will be able to join this room again if invited." - "Unban user" - "Unbanning %1$s" + "Unban from room" + "Unban" + "They would be able to join the room again if invited" + "Are you sure you want to unban this member?" + "Unbanning %1$s" diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 2cd87e5f2b..6b5cea1c78 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -339,23 +339,6 @@ Are you sure you want to continue?" "Hey, talk to me on %1$s: %2$s" "%1$s Android" "Rageshake to report bug" - "Ban from room" - "Ban" - "They won’t be able to join this room again if invited." - "Are you sure you want to ban this member?" - "Banning %1$s" - "Remove" - "They will be able to join this room again if invited." - "Are you sure you want to remove this member?" - "View profile" - "Remove from room" - "Remove member and ban from joining in the future?" - "Removing %1$s…" - "Unban from room" - "Unban" - "They would be able to join the room again if invited" - "Are you sure you want to unban this member?" - "Unbanning $1%s" "Failed selecting media, please try again." "Captions might not be visible to people using older apps." "Failed processing media to upload, please try again." diff --git a/tools/localazy/config.json b/tools/localazy/config.json index 51db790fd8..c32c60e4bc 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -329,9 +329,7 @@ { "name" : ":features:roommembermoderation:impl", "includeRegex" : [ - "screen\\.bottom_sheet\\.manage_room_member\\..*", - "screen_room_member_list_manage_member.*", - "screen_room_member_list_unbanning_user" + "screen\\.bottom_sheet\\.manage_room_member\\..*" ] } ]