Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/fga/user_moderation_bottomsheet

Browse source
This commit is contained in:
ganfra 2025-05-23 17:28:48 +02:00
commit 03e1926e14
250 changed files with 3339 additions and 2742 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
View file

@ -424,7 +424,7 @@ class MessageComposerPresenter @AssistedInject constructor(
resetComposer(markdownTextEditorState, richTextEditorState, fromEdit = capturedMode is MessageComposerMode.Edit)
when (capturedMode) {
is MessageComposerMode.Attachment,
is MessageComposerMode.Normal -> room.sendMessage(
is MessageComposerMode.Normal -> room.liveTimeline.sendMessage(
body = message.markdown,
htmlBody = message.html,
intentionalMentions = message.intentionalMentions

24
features/messages/impl/src/main/res/values-cy/translations.xml
View file

@ -38,29 +38,5 @@
<string name="screen_room_timeline_reactions_show_less">"Dangos llai"</string>
<string name="screen_room_timeline_reactions_show_more">"Dangos rhagor"</string>
<string name="screen_room_timeline_read_marker_title">"Newydd"</string>
<plurals name="screen_room_timeline_state_changes">
<item quantity="zero">"%1$d newid ystafelloedd"</item>
<item quantity="one">"%1$d newid ystafell"</item>
<item quantity="two">"%1$d newid ystafell"</item>
<item quantity="few">"%1$d newid ystafell"</item>
<item quantity="many">"%1$d newid ystafell"</item>
<item quantity="other">"%1$d newid ystafell"</item>
</plurals>
<plurals name="screen_room_typing_many_members">
<item quantity="zero">"%1$s, %2$s a %3$d arall"</item>
<item quantity="one">"%1$s, %2$s a %3$d arall"</item>
<item quantity="two">"%1$s, %2$s a %3$d arall"</item>
<item quantity="few">"%1$s, %2$s a %3$d arall"</item>
<item quantity="many">"%1$s, %2$s a %3$d arall"</item>
<item quantity="other">"%1$s, %2$s a %3$d arall"</item>
</plurals>
<plurals name="screen_room_typing_notification">
<item quantity="zero">"Mae %1$s yn teipio"</item>
<item quantity="one">"Mae %1$s yn teipio"</item>
<item quantity="two">"Mae %1$s yn teipio"</item>
<item quantity="few">"Mae %1$s yn teipio"</item>
<item quantity="many">"Mae %1$s yn teipio"</item>
<item quantity="other">"Mae %1$s yn teipio"</item>
</plurals>
<string name="screen_room_typing_two_members">"%1$s a %2$s"</string>
</resources>