ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-03 06:55:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only show a badge in the composer if the room is unencrypted. (#3866)

Browse Source 
* Partially revert the message composer encryption badges and only show it for unencrypted rooms.

* Update preview test snapshots.

* Update UI test snapshots.
This commit is contained in:
Stefan Ceriu
2025-03-04 14:58:15 +02:00
committed by GitHub
parent 3ecf9a20cd
commit 56d8af1d2e
79 changed files with 156 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX/Resources/Localizations/en-US.lproj/Localizable.strings
+1 -1
View File
@@ -355,6 +355,7 @@
"rich_text_editor_code_block" = "Toggle code block";
"rich_text_editor_composer_encrypted_placeholder" = "Encrypted message…";
"rich_text_editor_composer_placeholder" = "Message…";
"rich_text_editor_composer_unencrypted_placeholder" = "Unencrypted message…";
"rich_text_editor_create_link" = "Create a link";
"rich_text_editor_edit_link" = "Edit link";
"rich_text_editor_format_bold" = "Apply bold format";
@@ -936,7 +937,6 @@
"screen_roomlist_main_space_title" = "Chats";
"screen_roomlist_mark_as_read" = "Mark as read";
"screen_roomlist_mark_as_unread" = "Mark as unread";
"screen_roomlist_room_directory_button_title" = "Browse all rooms";
"screen_server_confirmation_message_login_element_dot_io" = "A private server for Element employees.";
"screen_server_confirmation_message_login_matrix_dot_org" = "Matrix is an open network for secure, decentralized communication.";
"screen_server_confirmation_message_register" = "This is where your conversations will live — just like you would use an email provider to keep your emails.";
ElementX/Resources/Localizations/en.lproj/Localizable.strings
+1 -1
View File
@@ -355,6 +355,7 @@
"rich_text_editor_code_block" = "Toggle code block";
"rich_text_editor_composer_encrypted_placeholder" = "Encrypted message…";
"rich_text_editor_composer_placeholder" = "Message…";
"rich_text_editor_composer_unencrypted_placeholder" = "Unencrypted message…";
"rich_text_editor_create_link" = "Create a link";
"rich_text_editor_edit_link" = "Edit link";
"rich_text_editor_format_bold" = "Apply bold format";
@@ -936,7 +937,6 @@
"screen_roomlist_main_space_title" = "Chats";
"screen_roomlist_mark_as_read" = "Mark as read";
"screen_roomlist_mark_as_unread" = "Mark as unread";
"screen_roomlist_room_directory_button_title" = "Browse all rooms";
"screen_server_confirmation_message_login_element_dot_io" = "A private server for Element employees.";
"screen_server_confirmation_message_login_matrix_dot_org" = "Matrix is an open network for secure, decentralised communication.";
"screen_server_confirmation_message_register" = "This is where your conversations will live — just like you would use an email provider to keep your emails.";