From 57808aec462eeb3fb3d5fbfc83b6c4e89fc392ac Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 25 Feb 2025 09:47:02 +0100 Subject: [PATCH] feat(join by alias) : use localazy strings --- .../impl/joinbyaddress/JoinRoomByAddressView.kt | 13 +++++++------ .../createroom/impl/root/CreateRoomRootView.kt | 2 +- .../impl/src/main/res/values/localazy.xml | 6 ++++++ tools/localazy/config.json | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressView.kt index 8c27cbfe81..1ae36c31b4 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/joinbyaddress/JoinRoomByAddressView.kt @@ -29,6 +29,7 @@ import androidx.compose.ui.text.input.KeyboardCapitalization import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp +import io.element.android.features.createroom.impl.R import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight import io.element.android.libraries.designsystem.theme.components.Button @@ -97,13 +98,13 @@ private fun RoomAddressField( TextField( modifier = modifier.focusRequester(focusRequester), value = address, - label = "Join room by address", - placeholder = "Enter...", + label = stringResource(R.string.screen_start_chat_join_room_by_address_action), + placeholder = stringResource(R.string.screen_start_chat_join_room_by_address_placeholder), supportingText = when (addressState) { - RoomAddressState.Invalid -> "Not a valid address" - is RoomAddressState.RoomFound -> "Matching room found" - RoomAddressState.RoomNotFound -> "Room not found" - RoomAddressState.Unknown, RoomAddressState.Resolving -> "e.g. #room-name:matrix.org" + RoomAddressState.Invalid -> stringResource(R.string.screen_start_chat_join_room_by_address_invalid_address) + is RoomAddressState.RoomFound -> stringResource(R.string.screen_start_chat_join_room_by_address_room_found) + RoomAddressState.RoomNotFound -> stringResource(R.string.screen_start_chat_join_room_by_address_room_not_found) + RoomAddressState.Unknown, RoomAddressState.Resolving -> stringResource(R.string.screen_start_chat_join_room_by_address_supporting_text) }, validity = when (addressState) { RoomAddressState.Unknown, RoomAddressState.Resolving -> null diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt index 31bd41a083..6f008d7283 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/root/CreateRoomRootView.kt @@ -176,7 +176,7 @@ private fun CreateRoomActionButtonsList( item { CreateRoomActionButton( iconRes = CompoundDrawables.ic_compound_room, - text = "Join room by address", + text = stringResource(R.string.screen_start_chat_join_room_by_address_action), onClick = onJoinByAddressClick, ) } diff --git a/features/createroom/impl/src/main/res/values/localazy.xml b/features/createroom/impl/src/main/res/values/localazy.xml index 6ed5510ce0..71208bf9e9 100644 --- a/features/createroom/impl/src/main/res/values/localazy.xml +++ b/features/createroom/impl/src/main/res/values/localazy.xml @@ -20,4 +20,10 @@ You can change this anytime in room settings." "Create a room" "Topic (optional)" "An error occurred when trying to start a chat" + "Join room by address" + "Not a valid address" + "Enter…" + "Matching room found" + "Room not found" + "e.g. #room-name:matrix.org" diff --git a/tools/localazy/config.json b/tools/localazy/config.json index a085b36619..20a53fdcf0 100644 --- a/tools/localazy/config.json +++ b/tools/localazy/config.json @@ -64,7 +64,8 @@ "includeRegex" : [ "screen_create_room_.*", "screen\\.create_room\\..*", - "screen_start_chat_.*" + "screen_start_chat_.*", + "screen\\.start_chat\\..*" ] }, {