mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 19:05:56 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4155 from vector-im/feature/bma/wording_update

Browse source 
Wording update
This commit is contained in:
Benoit Marty 2021-10-05 10:04:14 +02:00 committed by GitHub
commit 1fcb9f284a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4155.bugfix Normal file
View file

@ -0,0 +1 @@
Harmonize wording in the message bottom sheet and move up the View Reactions item

8
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
View file

@ -341,14 +341,14 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
add(EventSharedAction.AddReaction(eventId))
}
if (canQuote(timelineEvent, messageContent, actionPermissions)) {
add(EventSharedAction.Quote(eventId))
}
if (canViewReactions(timelineEvent)) {
add(EventSharedAction.ViewReactions(informationData))
}
if (canQuote(timelineEvent, messageContent, actionPermissions)) {
add(EventSharedAction.Quote(eventId))
}
if (timelineEvent.hasBeenEdited()) {
add(EventSharedAction.ViewEditHistory(informationData))
}

2
vector/src/main/res/values/strings.xml
View file

@ -378,7 +378,7 @@
<string name="none">None</string>
<string name="revoke">Revoke</string>
<string name="disconnect">Disconnect</string>
<string name="report_content">Report content</string>
<string name="report_content">Report Content</string>
<string name="active_call">Active call</string>
<string name="play_video">Play</string>
<string name="pause_video">Pause</string>