From f7f5539cb900fb4cde59d23b86443e1407273fb4 Mon Sep 17 00:00:00 2001 From: ganfra Date: Fri, 2 Jun 2023 19:22:23 +0200 Subject: [PATCH] Update localazy strings --- .../createroom/impl/configureroom/ConfigureRoomView.kt | 4 ++-- features/createroom/impl/src/main/res/values/localazy.xml | 2 -- features/invitelist/impl/src/main/res/values/localazy.xml | 4 ++-- .../features/roomdetails/impl/edit/RoomDetailsEditView.kt | 4 ++-- features/roomdetails/impl/src/main/res/values/localazy.xml | 4 +--- libraries/ui-strings/src/main/res/values/localazy.xml | 3 +++ 6 files changed, 10 insertions(+), 11 deletions(-) diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt index 4aae1936a9..05949f98e3 100644 --- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt +++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt @@ -226,7 +226,7 @@ fun RoomNameWithAvatar( LabelledTextField( label = stringResource(R.string.screen_create_room_room_name_label), value = roomName, - placeholder = stringResource(R.string.screen_create_room_room_name_placeholder), + placeholder = stringResource(StringR.string.common_room_name_placeholder), singleLine = true, onValueChange = onRoomNameChanged, ) @@ -243,7 +243,7 @@ fun RoomTopic( modifier = modifier, label = stringResource(R.string.screen_create_room_topic_label), value = topic, - placeholder = stringResource(R.string.screen_create_room_topic_placeholder), + placeholder = stringResource(StringR.string.common_topic_placeholder), onValueChange = onTopicChanged, maxLines = 3, ) diff --git a/features/createroom/impl/src/main/res/values/localazy.xml b/features/createroom/impl/src/main/res/values/localazy.xml index b3c0a6e618..0b6d87b8b8 100644 --- a/features/createroom/impl/src/main/res/values/localazy.xml +++ b/features/createroom/impl/src/main/res/values/localazy.xml @@ -9,9 +9,7 @@ "Messages are not encrypted and anyone can read them. You can enable encryption at a later date." "Public room (anyone)" "Room name" - "e.g. Product Sprint" "Topic (optional)" - "What is this room about?" "An error occurred when trying to start a chat" "Create a room" \ No newline at end of file diff --git a/features/invitelist/impl/src/main/res/values/localazy.xml b/features/invitelist/impl/src/main/res/values/localazy.xml index 56163ec3a8..6d52033110 100644 --- a/features/invitelist/impl/src/main/res/values/localazy.xml +++ b/features/invitelist/impl/src/main/res/values/localazy.xml @@ -5,5 +5,5 @@ "Are you sure you want to decline to chat with %1$s?" "Decline chat" "No Invites" - "%1$s invited you" - + "%1$s (%2$s) invited you" + \ No newline at end of file diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt index 414eaf9831..071200d16d 100644 --- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt +++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt @@ -145,7 +145,7 @@ fun RoomDetailsEditView( LabelledTextField( label = stringResource(id = R.string.screen_room_details_room_name_label), value = state.roomName, - placeholder = stringResource(id = R.string.screen_room_details_room_name_placeholder), + placeholder = stringResource(id = StringR.string.common_room_name_placeholder), singleLine = true, onValueChange = { state.eventSink(RoomDetailsEditEvents.UpdateRoomName(it)) }, ) @@ -162,7 +162,7 @@ fun RoomDetailsEditView( LabelledTextField( label = stringResource(id = StringR.string.common_topic), value = state.roomTopic, - placeholder = stringResource(id = R.string.screen_room_details_topic_placeholder), + placeholder = stringResource(id = StringR.string.common_topic_placeholder), maxLines = 10, onValueChange = { state.eventSink(RoomDetailsEditEvents.UpdateRoomTopic(it)) }, ) diff --git a/features/roomdetails/impl/src/main/res/values/localazy.xml b/features/roomdetails/impl/src/main/res/values/localazy.xml index 4f45bb6b49..5fffafb51d 100644 --- a/features/roomdetails/impl/src/main/res/values/localazy.xml +++ b/features/roomdetails/impl/src/main/res/values/localazy.xml @@ -12,10 +12,9 @@ "Unable to update room" "Messages are secured with locks. Only you and the recipients have the unique keys to unlock them." "Message encryption enabled" + "Invite people" "Room name" - "e.g. Product Sprint" "Share room" - "What is this room about?" "Updating room…" "Pending" "Room members" @@ -25,7 +24,6 @@ "Unblock" "On unblocking the user, you will be able to see all messages by them again." "Unblock user" - "Invite friends to Element" "Leave room" "People" "Security" diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index 954d078d01..06d6d5661b 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -69,6 +69,7 @@ "Encryption enabled" "Error" "File" + "File saved to Downloads" "GIF" "Image" "We can’t validate this user’s Matrix ID. The invite might not be received." @@ -89,6 +90,7 @@ "Report a bug" "Report submitted" "Room name" + "e.g. Product Sprint" "Search for someone" "Search results" "Security" @@ -102,6 +104,7 @@ "Success" "Suggestions" "Topic" + "What is this room about?" "Unable to decrypt" "We were unable to successfully send invites to one or more users." "Unable to send invite(s)"