update message context texts and icons

Signed-off-by: Michael Weimann <[email protected]>

Author: weeman1337

res/css/views/context_menus/_MessageContextMenu.scss

@@ -1,4 +1,5 @@
 /*
+Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2021 Michael Weimann <[email protected]>
 
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -42,15 +43,15 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_iconLink::before {
-        mask-image: url('$(res)/img/element-icons/message/link.svg');
+        mask-image: url('$(res)/img/element-icons/link.svg');
     }
 
     .mx_MessageContextMenu_iconPermalink::before {
         mask-image: url('$(res)/img/element-icons/room/share.svg');
     }
 
     .mx_MessageContextMenu_iconUnhidePreview::before {
-        mask-image: url('$(res)/img/feather-customised/eye.svg');
+        mask-image: url('$(res)/img/element-icons/settings/appearance.svg');
     }
 
     .mx_MessageContextMenu_iconForward::before {
@@ -62,7 +63,7 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_iconResend::before {
-        mask-image: url('$(res)/img/element-icons/message/repeat.svg');
+        mask-image: url('$(res)/img/element-icons/retry.svg');
     }
 
     .mx_MessageContextMenu_iconSource::before {

res/img/element-icons/warning-badge.svg

@@ -22,13 +22,13 @@ import { EventStatus } from 'matrix-js-sdk/src/models/event';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
 import * as sdk from '../../../index';
-import {_t} from '../../../languageHandler';
+import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import Resend from '../../../Resend';
 import SettingsStore from '../../../settings/SettingsStore';
 import { isUrlPermitted } from '../../../HtmlUtils';
 import { isContentActionable } from '../../../utils/EventUtils';
-import IconizedContextMenu, {IconizedContextMenuOption, IconizedContextMenuOptionList} from "./IconizedContextMenu";
+import IconizedContextMenu, { IconizedContextMenuOption, IconizedContextMenuOptionList } from './IconizedContextMenu';
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { ReadPinsEventId } from "../right_panel/PinnedMessagesCard";
@@ -306,7 +306,7 @@ export default class MessageContextMenu extends React.Component {
         const viewSourceButton = (
             <IconizedContextMenuOption
                 iconClassName="mx_MessageContextMenu_iconSource"
-                label={_t("View Source")}
+                label={_t("View source")}
                 onClick={this.onViewSourceClick}
             />
         );
@@ -316,7 +316,7 @@ export default class MessageContextMenu extends React.Component {
                 unhidePreviewButton = (
                     <IconizedContextMenuOption
                         iconClassName="mx_MessageContextMenu_iconUnhidePreview"
-                        label={_t("Unhide Preview")}
+                        label={_t("Show preview")}
                         onClick={this.onUnhidePreviewClick}
                     />
                 );
@@ -351,8 +351,7 @@ export default class MessageContextMenu extends React.Component {
         }
 
         // Bridges can provide a 'external_url' to link back to the source.
-        if (true ||
-            typeof (mxEvent.event.content.external_url) === "string" &&
+        if (typeof (mxEvent.event.content.external_url) === "string" &&
             isUrlPermitted(mxEvent.event.content.external_url)
         ) {
             externalURLButton = (
@@ -372,7 +371,7 @@ export default class MessageContextMenu extends React.Component {
             collapseReplyThread = (
                 <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_iconCollapse"
-                    label={_t("Collapse Reply Thread")}
+                    label={_t("Collapse reply thread")}
                     onClick={this.onCollapseReplyThreadClick}
                 />
             );
@@ -383,31 +382,31 @@ export default class MessageContextMenu extends React.Component {
             reportEventButton = (
                 <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_iconReport"
-                    label={_t("Report Content")}
+                    label={_t("Report")}
                     onClick={this.onReportEventClick}
                 />
             );
         }
 
         optionLists.push((
             <IconizedContextMenuOptionList key={'group1'}>
-                {quoteButton}
-                {forwardButton}
-                {pinButton}
-                {permalinkButton}
-                {reportEventButton}
-                {externalURLButton}
-                {viewSourceButton}
-                {unhidePreviewButton}
-                {resendReactionsButton}
-                {collapseReplyThread}
+                { quoteButton }
+                { forwardButton }
+                { pinButton }
+                { permalinkButton }
+                { reportEventButton }
+                { externalURLButton }
+                { unhidePreviewButton }
+                { viewSourceButton }
+                { resendReactionsButton }
+                { collapseReplyThread }
             </IconizedContextMenuOptionList>
         ));
 
         if (redactButton) {
             optionLists.push((
                 <IconizedContextMenuOptionList key={'group2'} red>
-                    {redactButton}
+                    { redactButton }
                 </IconizedContextMenuOptionList>
             ));
         }
@@ -418,7 +417,7 @@ export default class MessageContextMenu extends React.Component {
                 className="mx_MessageContextMenu"
                 compact={true}
             >
-                {optionLists}
+                { optionLists }
             </IconizedContextMenu>
         );
     }

src/components/views/context_menus/MessageContextMenu.js

@@ -2219,7 +2219,7 @@
     "Sending": "Sending",
     "Sent": "Sent",
     "Open link": "Open link",
-    "Forward": "Forward",
+    "Forward message": "Forward message",
     "Message preview": "Message preview",
     "Search for rooms or people": "Search for rooms or people",
     "Confirm abort of host creation": "Confirm abort of host creation",
@@ -2499,12 +2499,12 @@
     "Are you sure you want to reject the invitation?": "Are you sure you want to reject the invitation?",
     "Unable to reject invite": "Unable to reject invite",
     "Resend %(unsentCount)s reaction(s)": "Resend %(unsentCount)s reaction(s)",
-    "Forward Message": "Forward",
-    "Unpin Message": "Unpin Message",
-    "Pin Message": "Pin Message",
-    "Unhide Preview": "Unhide Preview",
+    "Forward": "Forward",
+    "View source": "View source",
+    "Show preview": "Show preview",
     "Source URL": "Source URL",
-    "Collapse Reply Thread": "Collapse Reply Thread",
+    "Collapse reply thread": "Collapse reply thread",
+    "Report": "Report",
     "Clear status": "Clear status",
     "Update status": "Update status",
     "Set status": "Set status",