Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

change (member moderation) : sync strings

Browse source
This commit is contained in:
ganfra 2025-05-21 18:30:45 +02:00
parent 2429879b5a
commit b0c95db0de
4 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

10
features/roommembermoderation/impl/src/main/kotlin/io/element/android/features/roommembermoderation/impl/RoomMemberModerationView.kt
View file

@ -166,13 +166,13 @@ private fun RoomMemberAsyncActions(
when (val action = state.unbanUserAsyncAction) { when (val action = state.unbanUserAsyncAction) {
is AsyncAction.Confirming -> { is AsyncAction.Confirming -> {
ConfirmationDialog( ConfirmationDialog(
title = stringResource(R.string.screen_room_member_list_manage_member_unban_title), title = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_title),
content = stringResource(R.string.screen_room_member_list_manage_member_unban_message), content = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_description),
submitText = stringResource(R.string.screen_room_member_list_manage_member_unban_action), submitText = stringResource(R.string.screen_bottom_sheet_manage_room_member_unban_member_confirmation_action),
onSubmitClick = { onSubmitClick = {
val userDisplayName = selectedUser?.getBestName().orEmpty() val userDisplayName = selectedUser?.getBestName().orEmpty()
asyncIndicatorState.enqueue { 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) state.eventSink(InternalRoomMemberModerationEvents.DoUnbanUser)
}, },
@ -297,7 +297,7 @@ private fun RoomMemberActionsBottomSheet(
} }
is ModerationAction.UnbanUser -> { is ModerationAction.UnbanUser -> {
ListItem( 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())), leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Restart())),
style = ListItemStyle.Destructive, style = ListItemStyle.Destructive,
onClick = { onClick = {

11
features/roommembermoderation/impl/src/main/res/values/localazy.xml
View file

@ -12,10 +12,9 @@
<string name="screen_bottom_sheet_manage_room_member_remove">"Remove from room"</string> <string name="screen_bottom_sheet_manage_room_member_remove">"Remove from room"</string>
<string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remove member and ban from joining in the future?"</string> <string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remove member and ban from joining in the future?"</string>
<string name="screen_bottom_sheet_manage_room_member_removing_user">"Removing %1$s…"</string> <string name="screen_bottom_sheet_manage_room_member_removing_user">"Removing %1$s…"</string>
<string name="screen_room_member_list_manage_member_remove_confirmation_ban">"Ban from room"</string> <string name="screen_bottom_sheet_manage_room_member_unban">"Unban from room"</string>
<string name="screen_room_member_list_manage_member_remove_confirmation_kick">"Only remove member"</string> <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Unban"</string>
<string name="screen_room_member_list_manage_member_unban_action">"Unban"</string> <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"They would be able to join the room again if invited"</string>
<string name="screen_room_member_list_manage_member_unban_message">"They will be able to join this room again if invited."</string> <string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Are you sure you want to unban this member?"</string>
<string name="screen_room_member_list_manage_member_unban_title">"Unban user"</string> <string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Unbanning %1$s"</string>
<string name="screen_room_member_list_unbanning_user">"Unbanning %1$s"</string>
</resources> </resources>

17
libraries/ui-strings/src/main/res/values/localazy.xml
View file

@ -339,23 +339,6 @@ Are you sure you want to continue?"</string>
<string name="invite_friends_text">"Hey, talk to me on %1$s: %2$s"</string> <string name="invite_friends_text">"Hey, talk to me on %1$s: %2$s"</string>
<string name="login_initial_device_name_android">"%1$s Android"</string> <string name="login_initial_device_name_android">"%1$s Android"</string>
<string name="preference_rageshake">"Rageshake to report bug"</string> <string name="preference_rageshake">"Rageshake to report bug"</string>
<string name="screen_bottom_sheet_manage_room_member_ban">"Ban from room"</string>
<string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_action">"Ban"</string>
<string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_description">"They won’t be able to join this room again if invited."</string>
<string name="screen_bottom_sheet_manage_room_member_ban_member_confirmation_title">"Are you sure you want to ban this member?"</string>
<string name="screen_bottom_sheet_manage_room_member_banning_user">"Banning %1$s"</string>
<string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_action">"Remove"</string>
<string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_description">"They will be able to join this room again if invited."</string>
<string name="screen_bottom_sheet_manage_room_member_kick_member_confirmation_title">"Are you sure you want to remove this member?"</string>
<string name="screen_bottom_sheet_manage_room_member_member_user_info">"View profile"</string>
<string name="screen_bottom_sheet_manage_room_member_remove">"Remove from room"</string>
<string name="screen_bottom_sheet_manage_room_member_remove_confirmation_title">"Remove member and ban from joining in the future?"</string>
<string name="screen_bottom_sheet_manage_room_member_removing_user">"Removing %1$s…"</string>
<string name="screen_bottom_sheet_manage_room_member_unban">"Unban from room"</string>
<string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_action">"Unban"</string>
<string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_description">"They would be able to join the room again if invited"</string>
<string name="screen_bottom_sheet_manage_room_member_unban_member_confirmation_title">"Are you sure you want to unban this member?"</string>
<string name="screen_bottom_sheet_manage_room_member_unbanning_user">"Unbanning $1%s"</string>
<string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string> <string name="screen_media_picker_error_failed_selection">"Failed selecting media, please try again."</string>
<string name="screen_media_upload_preview_caption_warning">"Captions might not be visible to people using older apps."</string> <string name="screen_media_upload_preview_caption_warning">"Captions might not be visible to people using older apps."</string>
<string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string> <string name="screen_media_upload_preview_error_failed_processing">"Failed processing media to upload, please try again."</string>

4
tools/localazy/config.json
View file

@ -329,9 +329,7 @@
{ {
"name" : ":features:roommembermoderation:impl", "name" : ":features:roommembermoderation:impl",
"includeRegex" : [ "includeRegex" : [
"screen\\.bottom_sheet\\.manage_room_member\\..*", "screen\\.bottom_sheet\\.manage_room_member\\..*"
"screen_room_member_list_manage_member.*",
"screen_room_member_list_unbanning_user"
] ]
} }
] ]