Skip to content
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

Updated Bottom Sheet message string #3743

Merged
merged 2 commits into from
Feb 7, 2025
Merged

Updated Bottom Sheet message string #3743

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
2370d6b
updated bottom sheet string
Velin92 Feb 5, 2025
c4b7328
updated pseudo language tests
Velin92 Feb 5, 2025
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
4 changes: 2 additions & 2 deletions ElementX/Resources/Localizations/en-US.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
"common_message_removed" = "Message removed";
"common_modern" = "Modern";
"common_mute" = "Mute";
"common_name_and_id" = "%1$@ (%2$@)";
"common_no_results" = "No results";
"common_no_room_name" = "No room name";
"common_offline" = "Offline";
Expand Down Expand Up @@ -371,8 +372,7 @@
"screen_advanced_settings_element_call_base_url_description" = "Set a custom base URL for Element Call.";
"screen_advanced_settings_element_call_base_url_validation_error" = "Invalid URL, please make sure you include the protocol (http/https) and the correct address.";
"screen_bottom_sheet_create_dm_confirmation_button_title" = "Send invite";
"screen_bottom_sheet_create_dm_message" = "Would you like to start a chat with %1$@ (%2$@)?";
"screen_bottom_sheet_create_dm_message_no_displayname" = "Would you like to start a chat with %1$@?";
"screen_bottom_sheet_create_dm_message" = "Would you like to start a chat with %1$@?";
"screen_bottom_sheet_create_dm_title" = "Send invite?";
"screen_create_room_room_access_section_anyone_option_description" = "Anyone can join this room";
"screen_create_room_room_access_section_anyone_option_title" = "Anyone";
Expand Down
4 changes: 2 additions & 2 deletions ElementX/Resources/Localizations/en.lproj/Localizable.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@
"common_message_removed" = "Message removed";
"common_modern" = "Modern";
"common_mute" = "Mute";
"common_name_and_id" = "%1$@ (%2$@)";
"common_no_results" = "No results";
"common_no_room_name" = "No room name";
"common_offline" = "Offline";
Expand Down Expand Up @@ -371,8 +372,7 @@
"screen_advanced_settings_element_call_base_url_description" = "Set a custom base URL for Element Call.";
"screen_advanced_settings_element_call_base_url_validation_error" = "Invalid URL, please make sure you include the protocol (http/https) and the correct address.";
"screen_bottom_sheet_create_dm_confirmation_button_title" = "Send invite";
"screen_bottom_sheet_create_dm_message" = "Would you like to start a chat with %1$@ (%2$@)?";
"screen_bottom_sheet_create_dm_message_no_displayname" = "Would you like to start a chat with %1$@?";
"screen_bottom_sheet_create_dm_message" = "Would you like to start a chat with %1$@?";
"screen_bottom_sheet_create_dm_title" = "Send invite?";
"screen_create_room_room_access_section_anyone_option_description" = "Anyone can join this room";
"screen_create_room_room_access_section_anyone_option_title" = "Anyone";
Expand Down
12 changes: 6 additions & 6 deletions ElementX/Sources/Generated/Strings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,10 @@ internal enum L10n {
internal static var commonModern: String { return L10n.tr("Localizable", "common_modern") }
/// Mute
internal static var commonMute: String { return L10n.tr("Localizable", "common_mute") }
/// %1$@ (%2$@)
internal static func commonNameAndId(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "common_name_and_id", String(describing: p1), String(describing: p2))
}
/// No results
internal static var commonNoResults: String { return L10n.tr("Localizable", "common_no_results") }
/// No room name
Expand Down Expand Up @@ -1016,13 +1020,9 @@ internal enum L10n {
internal static var screenBlockedUsersUnblocking: String { return L10n.tr("Localizable", "screen_blocked_users_unblocking") }
/// Send invite
internal static var screenBottomSheetCreateDmConfirmationButtonTitle: String { return L10n.tr("Localizable", "screen_bottom_sheet_create_dm_confirmation_button_title") }
/// Would you like to start a chat with %1$@ (%2$@)?
internal static func screenBottomSheetCreateDmMessage(_ p1: Any, _ p2: Any) -> String {
return L10n.tr("Localizable", "screen_bottom_sheet_create_dm_message", String(describing: p1), String(describing: p2))
}
/// Would you like to start a chat with %1$@?
internal static func screenBottomSheetCreateDmMessageNoDisplayname(_ p1: Any) -> String {
return L10n.tr("Localizable", "screen_bottom_sheet_create_dm_message_no_displayname", String(describing: p1))
internal static func screenBottomSheetCreateDmMessage(_ p1: Any) -> String {
return L10n.tr("Localizable", "screen_bottom_sheet_create_dm_message", String(describing: p1))
}
/// Send invite?
internal static var screenBottomSheetCreateDmTitle: String { return L10n.tr("Localizable", "screen_bottom_sheet_create_dm_title") }
Expand Down
6 changes: 4 additions & 2 deletions ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ struct SendInviteConfirmationView: View {
private let topPadding: CGFloat = 24

private var subtitle: String {
let string: String
if let displayName = userToInvite.displayName {
L10n.screenBottomSheetCreateDmMessage(displayName, userToInvite.userID)
string = L10n.commonNameAndId(displayName, userToInvite.userID)
} else {
L10n.screenBottomSheetCreateDmMessageNoDisplayname(userToInvite.userID)
string = userToInvite.userID
}
return L10n.screenBottomSheetCreateDmMessage(string)
}

var body: some View {
Expand Down
4 changes: 2 additions & 2 deletions ...es/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions ...Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading