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

Wording update #4155

Merged
merged 3 commits into from
Oct 5, 2021
Merged

Wording update #4155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6669587
Update wording in message bottom sheet (#3869)
bmarty Oct 4, 2021
52fe3a1
Message bottom sheet: move "View Reactions" action just below "Add Re…
bmarty Oct 4, 2021
f3393dd
changelog
bmarty Oct 4, 2021
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
1 change: 1 addition & 0 deletions changelog.d/4155.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Harmonize wording in the message bottom sheet and move up the View Reactions item
8 changes: 4 additions & 4 deletions ...n/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down