This repository was archived by the owner on Sep 11, 2024. It is now read-only.
Migrate more strings to translation keys#11522
Merged
Merged
Conversation
replace "HTML" "export_chat|html" replace "JSON" "export_chat|json" replace "Plain Text" "export_chat|text" replace "From the beginning" "export_chat|from_the_beginning" replace "Specify a number of messages" "export_chat|number_of_messages" replace "Current Timeline" "export_chat|current_timeline" replace "Creating HTML…" "export_chat|creating_html" replace "Starting export…" "export_chat|starting_export" replace "Export successful!" "export_chat|export_successful" replace "Unnamed Room" "common|unnamed_room" replace "Unnamed Space" "common|unnamed_space" replace "Are you sure you want to exit during this export?" "export_chat|unload_confirm" replace "Generating a ZIP" "export_chat|generating_zip" replace "Processing event %(number)s out of %(total)s" "export_chat|processing_event_n" replace "Fetched %(count)s events out of %(total)s" "export_chat|fetched_n_events_with_total" replace "Fetched %(count)s events so far" "export_chat|fetched_n_events" replace "Fetched %(count)s events in %(seconds)ss" "export_chat|fetched_n_events_in_time" replace "Exported %(count)s events in %(seconds)s seconds" "export_chat|exported_n_events_in_time" replace "Media omitted" "export_chat|media_omitted" replace "Media omitted - file size limit exceeded" "export_chat|media_omitted_file_size" replace "%(creatorName)s created this room." "export_chat|creator_summary" replace "This is the start of export of <roomName/>. Exported by <exporterDetails/> at %(exportDate)s." "export_chat|export_info" replace "Topic: %(topic)s" "export_chat|topic" replace "Previous group of messages" "export_chat|previous_page" replace "Next group of messages" "export_chat|next_page" replace "Exported Data" "export_chat|html_title" replace "Error fetching file" "export_chat|error_fetching_file" replace "File Attached" "export_chat|file_attached" replace "Fetching events…" "export_chat|fetching_events" replace "Creating output…" "export_chat|creating_output" ```
replace "Messages containing my display name" "settings|notifications|rule_contains_display_name" replace "Messages containing my username" "settings|notifications|rule_contains_user_name" replace "Messages containing @room" "settings|notifications|rule_roomnotif" replace "Messages in one-to-one chats" "settings|notifications|rule_room_one_to_one" replace "Messages in group chats" "settings|notifications|rule_message" replace "Encrypted messages in group chats" "settings|notifications|rule_encrypted" replace "When I'm invited to a room" "settings|notifications|rule_invite_for_me" replace "Call invitation" "settings|notifications|rule_call" replace "Messages sent by bot" "settings|notifications|rule_suppress_notices" replace "When rooms are upgraded" "settings|notifications|rule_tombstone" replace "Encrypted messages in one-to-one chats" "settings|notifications|rule_encrypted_room_one_to_one" ```
replace "Create a video room" "create_room|title_video_room" replace "Create a public room" "create_room|title_public_room" replace "Create a private room" "create_room|title_private_room" replace "Create video room" "create_room|action_create_video_room" replace "Create room" "create_room|action_create_room" ```
replace "Video call started in %(roomName)s." "timeline|m.call|video_call_started" replace "Video call started in %(roomName)s. (not supported by this browser)" "timeline|m.call|video_call_started_unsupported" replace "%(senderName)s placed a voice call." "timeline|m.call.invite|voice_call" replace "%(senderName)s placed a voice call. (not supported by this browser)" "timeline|m.call.invite|voice_call_unsupported" replace "%(senderName)s placed a video call." "timeline|m.call.invite|video_call" replace "%(senderName)s placed a video call. (not supported by this browser)" "timeline|m.call.invite|video_call_unsupported" replace "%(targetName)s accepted the invitation for %(displayName)s" "timeline|m.room.member|accepted_3pid_invite" replace "%(targetName)s accepted an invitation" "timeline|m.room.member|accepted_invite" replace "%(senderName)s invited %(targetName)s" "timeline|m.room.member|invite" replace "%(senderName)s banned %(targetName)s: %(reason)s" "timeline|m.room.member|ban_reason" replace "%(senderName)s banned %(targetName)s" "timeline|m.room.member|ban" replace "%(oldDisplayName)s changed their display name and profile picture" "timeline|m.room.member|change_name_avatar" replace "%(oldDisplayName)s changed their display name to %(displayName)s" "timeline|m.room.member|change_name" replace "%(senderName)s set their display name to %(displayName)s" "timeline|m.room.member|set_name" replace "%(senderName)s removed their display name (%(oldDisplayName)s)" "timeline|m.room.member|remove_name" replace "%(senderName)s removed their profile picture" "timeline|m.room.member|remove_avatar" replace "%(senderName)s changed their profile picture" "timeline|m.room.member|change_avatar" replace "%(senderName)s set a profile picture" "timeline|m.room.member|set_avatar" replace "%(senderName)s made no change" "timeline|m.room.member|no_change" replace "%(targetName)s joined the room" "timeline|m.room.member|join" replace "%(targetName)s rejected the invitation" "timeline|m.room.member|reject_invite" replace "%(targetName)s left the room: %(reason)s" "timeline|m.room.member|left_reason" replace "%(targetName)s left the room" "timeline|m.room.member|left" replace "%(senderName)s unbanned %(targetName)s" "timeline|m.room.member|unban" replace "%(senderName)s withdrew %(targetName)s's invitation: %(reason)s" "timeline|m.room.member|withdrew_invite_reason" replace "%(senderName)s withdrew %(targetName)s's invitation" "timeline|m.room.member|withdrew_invite" replace "%(senderName)s removed %(targetName)s: %(reason)s" "timeline|m.room.member|kick_reason" replace "%(senderName)s removed %(targetName)s" "timeline|m.room.member|kick" replace "%(senderDisplayName)s changed the topic to \"%(topic)s\"." "timeline|m.room.topic" replace "%(senderDisplayName)s changed the room avatar." "timeline|m.room.avatar" replace "%(senderDisplayName)s removed the room name." "timeline|m.room.name|remove" replace "%(senderDisplayName)s changed the room name from %(oldRoomName)s to %(newRoomName)s." "timeline|m.room.name|change" replace "%(senderDisplayName)s changed the room name to %(roomName)s." "timeline|m.room.name|set" replace "%(senderDisplayName)s upgraded this room." "timeline|m.room.tombstone" replace "%(senderDisplayName)s made the room public to whoever knows the link." "timeline|m.room.join_rules|public" replace "%(senderDisplayName)s made the room invite only." "timeline|m.room.join_rules|invite" replace "%(senderDisplayName)s changed the join rule to ask to join." "timeline|m.room.join_rules|knock" replace "%(senderDisplayName)s changed who can join this room. <a>View settings</a>." "timeline|m.room.join_rules|restricted_settings" replace "%(senderDisplayName)s changed who can join this room." "timeline|m.room.join_rules|restricted" replace "%(senderDisplayName)s changed the join rule to %(rule)s" "timeline|m.room.join_rules|unknown" replace "%(senderDisplayName)s has allowed guests to join the room." "timeline|m.room.guest_access|can_join" replace "%(senderDisplayName)s has prevented guests from joining the room." "timeline|m.room.guest_access|forbidden" replace "%(senderDisplayName)s changed guest access to %(rule)s" "timeline|m.room.guest_access|unknown" replace "%(senderDisplayName)s sent an image." "timeline|m.image" replace "%(senderDisplayName)s sent a sticker." "timeline|m.sticker" replace "%(senderDisplayName)s set the server ACLs for this room." "timeline|m.room.server_acl|set" replace "%(senderDisplayName)s changed the server ACLs for this room." "timeline|m.room.server_acl|changed" replace "🎉 All servers are banned from participating! This room can no longer be used." "timeline|m.room.server_acl|all_servers_banned" replace "%(senderName)s set the main address for this room to %(address)s." "timeline|m.room.canonical_alias|set" replace "%(senderName)s removed the main address for this room." "timeline|m.room.canonical_alias|removed" ```
t3chguy
added
the
T-Task
richvdh
approved these changes
Sep 4, 2023
|
|
||
| if (!currentlyActive && activeAgo !== undefined && activeAgo > 0) { | ||
| const duration = this.getDuration(activeAgo); | ||
| const duration = formatDuration(activeAgo); |
Member
There was a problem hiding this comment.
🚀 , though there's an argument it should have been a separate PR: it's quite a different class of change to the rest of the changes here.
Member
Author
There was a problem hiding this comment.
@richvdh happy to split it out if you'd prefer!
Member
There was a problem hiding this comment.
don't worry now we're here. One for next time.
nurjinjafar
pushed a commit
to nordeck/matrix-react-sdk
that referenced
this pull request
Sep 6, 2023
github-merge-queue Bot
pushed a commit
that referenced
this pull request
Sep 7, 2023
* Implement denied request mask and logic Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com> * refactor / fix deny requests isues * fix tests create denied message test Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com> * add another test for the primary action for denied request Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com> * fix linter issues Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net> * regenerate translation Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net> * fix translation and minor refactoring Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net> * segment into 4 * Remove parallel from Cypress command to avoid talking to Cypress Cloud * Re-add --parallel flag for Percy * Prevent event propagation when clicking icon buttons (#11515) * Prevent event propagation when clicking icon buttons * Inhibit view user on click behaviour for room header face pile * Update snapshot * Add a 'm.relates_to' to edits in receipt tests and disable failing tests (#11501) * Add a 'm.relates_to' to edits in receipt tests * Disable a test that fails with real edits * Wait for the room to be read after we mark it as read * Skip tests that are failing because of inconsistencies between local and CI behaviour * Allow creating public knock rooms (#11481) * Allow creating public knock rooms Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> * Apply PR feedback Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> * Apply PR feedback Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> --------- Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> * Collect `console.debug` logs during cypress tests (#11478) In order for the logs collected by cypress to actually be useful, we really need `cons:debug`. * Migrate more strings to translation keys (#11522) * Only show Search button in RoomSummaryCard if new room UI enabled (#11524) * Only show Search button in RoomSummaryCard if new room UI enabled * Update snapshot * Update vector-im (#11526) * Update vector-im * Update snapshots of Compound Avatars * Update snapshots of Compound Avatars --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> * Migrate more strings to translation keys (#11530) * Fix regression around FacePile with overflow (#11527) * Work around compound-web AvatarStack not applying overlap to non-Avatars * Fix FacePile overflow tile not being layed out correctly * Use RoomStateEvent.Update for knocks (#11516) Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> * Cypress tests for event shields (#11525) * Factor downloadKey out to `utils.ts` * Add a new `describe` block for event shields * create a beforeEach block * Cypress tests for event shields * Document how to match the CI config for Cypress (#11531) * Document how to match the CI config for Cypress * Clarify language about needing Chrome * Move Cypress info into the Cypress-specific docs * Migrate more strings to translation keys (#11532) --------- Signed-off-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com> Signed-off-by: nurjinn jafar <nurjin.jafar@nordeck.net> Signed-off-by: Charly Nguyen <charly.nguyen@nordeck.net> Co-authored-by: AHMAD KADRI <52747422+ahmadkadri@users.noreply.github.com> Co-authored-by: Kerry Archibald <kerrya@element.io> Co-authored-by: Andy Balaam <andy.balaam@matrix.org> Co-authored-by: Johannes Marbach <johannesm@element.io> Co-authored-by: Germain <germains@element.io> Co-authored-by: Charly Nguyen <1422657+charlynguyen@users.noreply.github.com> Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com> Co-authored-by: Michael Telatynski <7t3chguy@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
For element-hq/element-web#25608
This change is marked as an internal change (Task), so will not be included in the changelog.