From b9afe4fb66eaab06a7ebba7405c5da5cda0194cd Mon Sep 17 00:00:00 2001
From: Lim Chee Aun <cheeaun@gmail.com>
Date: Wed, 25 Oct 2023 13:55:12 +0800
Subject: [PATCH] s/Favourite/Like

Poll: https://mastodon.social/@cheeaun/111272668719225402
---
 src/components/keyboard-shortcuts-help.jsx |  8 ++++++--
 src/components/nav-menu.jsx                |  2 +-
 src/components/notification.jsx            | 16 ++++++++--------
 src/components/shortcuts-settings.jsx      |  4 ++--
 src/components/status.jsx                  | 22 +++++++++++-----------
 src/pages/favourites.jsx                   |  8 ++++----
 src/pages/settings.jsx                     |  2 +-
 7 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/components/keyboard-shortcuts-help.jsx b/src/components/keyboard-shortcuts-help.jsx
index 70ec7e5..08683cb 100644
--- a/src/components/keyboard-shortcuts-help.jsx
+++ b/src/components/keyboard-shortcuts-help.jsx
@@ -135,8 +135,12 @@ export default memo(function KeyboardShortcutsHelp() {
                   keys: <kbd>r</kbd>,
                 },
                 {
-                  action: 'Favourite',
-                  keys: <kbd>f</kbd>,
+                  action: 'Like (favourite)',
+                  keys: (
+                    <>
+                      <kbd>l</kbd> or <kbd>f</kbd>
+                    </>
+                  ),
                 },
                 {
                   action: 'Boost',
diff --git a/src/components/nav-menu.jsx b/src/components/nav-menu.jsx
index ac9c390..2e22d53 100644
--- a/src/components/nav-menu.jsx
+++ b/src/components/nav-menu.jsx
@@ -192,7 +192,7 @@ function NavMenu(props) {
                 <Icon icon="bookmark" size="l" /> <span>Bookmarks</span>
               </MenuLink>
               <MenuLink to="/f">
-                <Icon icon="heart" size="l" /> <span>Favourites</span>
+                <Icon icon="heart" size="l" /> <span>Likes</span>
               </MenuLink>
             </>
           )}
diff --git a/src/components/notification.jsx b/src/components/notification.jsx
index abe557d..198c542 100644
--- a/src/components/notification.jsx
+++ b/src/components/notification.jsx
@@ -49,17 +49,17 @@ const contentText = {
   reblog_reply: 'boosted your reply.',
   follow: 'followed you.',
   follow_request: 'requested to follow you.',
-  favourite: 'favourited your post.',
-  'favourite+account': (count) => `favourited ${count} of your posts.`,
-  favourite_reply: 'favourited your reply.',
+  favourite: 'liked your post.',
+  'favourite+account': (count) => `liked ${count} of your posts.`,
+  favourite_reply: 'liked your reply.',
   poll: 'A poll you have voted in or created has ended.',
   'poll-self': 'A poll you have created has ended.',
   'poll-voted': 'A poll you have voted in has ended.',
   update: 'A post you interacted with has been edited.',
-  'favourite+reblog': 'boosted & favourited your post.',
+  'favourite+reblog': 'boosted & liked your post.',
   'favourite+reblog+account': (count) =>
-    `boosted & favourited ${count} of your posts.`,
-  'favourite+reblog_reply': 'boosted & favourited your reply.',
+    `boosted & liked ${count} of your posts.`,
+  'favourite+reblog_reply': 'boosted & liked your reply.',
   'admin.sign_up': 'signed up.',
   'admin.report': (targetAccount) => <>reported {targetAccount}</>,
 };
@@ -142,8 +142,8 @@ function Notification({ notification, instance, isStatic }) {
 
   const genericAccountsHeading =
     {
-      'favourite+reblog': 'Boosted/Favourited by…',
-      favourite: 'Favourited by…',
+      'favourite+reblog': 'Boosted/Liked by…',
+      favourite: 'Liked by…',
       reblog: 'Boosted by…',
       follow: 'Followed by…',
     }[type] || 'Accounts';
diff --git a/src/components/shortcuts-settings.jsx b/src/components/shortcuts-settings.jsx
index 734d90d..11b0b89 100644
--- a/src/components/shortcuts-settings.jsx
+++ b/src/components/shortcuts-settings.jsx
@@ -46,7 +46,7 @@ const TYPE_TEXT = {
   search: 'Search',
   'account-statuses': 'Account',
   bookmarks: 'Bookmarks',
-  favourites: 'Favourites',
+  favourites: 'Likes',
   hashtag: 'Hashtag',
   trending: 'Trending',
   mentions: 'Mentions',
@@ -178,7 +178,7 @@ export const SHORTCUTS_META = {
   },
   favourites: {
     id: 'favourites',
-    title: 'Favourites',
+    title: 'Likes',
     path: '/f',
     icon: 'heart',
   },
diff --git a/src/components/status.jsx b/src/components/status.jsx
index 0a630f2..565901f 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -512,7 +512,7 @@ function Status({
               )}{' '}
               {favouritesCount > 0 && (
                 <span>
-                  <Icon icon="heart" alt="Favourites" size="s" />{' '}
+                  <Icon icon="heart" alt="Likes" size="s" />{' '}
                   <span>{shortenNumber(favouritesCount)}</span>
                 </span>
               )}
@@ -550,7 +550,7 @@ function Status({
         <MenuItem onClick={() => setShowReactions(true)}>
           <Icon icon="react" />
           <span>
-            Boosted/Favourited by<span class="more-insignificant">…</span>
+            Boosted/Liked by<span class="more-insignificant">…</span>
           </span>
         </MenuItem>
       )}
@@ -603,8 +603,8 @@ function Status({
                   if (!isSizeLarge) {
                     showToast(
                       favourited
-                        ? `Unfavourited @${username || acct}'s post`
-                        : `Favourited @${username || acct}'s post`,
+                        ? `Unliked @${username || acct}'s post`
+                        : `Liked @${username || acct}'s post`,
                     );
                   }
                 } catch (e) {}
@@ -616,7 +616,7 @@ function Status({
                   color: favourited && 'var(--favourite-color)',
                 }}
               />
-              <span>{favourited ? 'Unfavourite' : 'Favourite'}</span>
+              <span>{favourited ? 'Unlike' : 'Like'}</span>
             </MenuItem>
           </div>
           <div class="menu-horizontal">
@@ -836,15 +836,15 @@ function Status({
     enabled: hotkeysEnabled,
   });
   const fRef = useHotkeys(
-    'f',
+    'f, l',
     () => {
       try {
         favouriteStatus();
         if (!isSizeLarge) {
           showToast(
             favourited
-              ? `Unfavourited @${username || acct}'s post`
-              : `Favourited @${username || acct}'s post`,
+              ? `Unliked @${username || acct}'s post`
+              : `Liked @${username || acct}'s post`,
           );
         }
       } catch (e) {}
@@ -1528,8 +1528,8 @@ function Status({
               <div class="action has-count">
                 <StatusButton
                   checked={favourited}
-                  title={['Favourite', 'Unfavourite']}
-                  alt={['Favourite', 'Favourited']}
+                  title={['Like', 'Unlike']}
+                  alt={['Like', 'Liked']}
                   class="favourite-button"
                   icon="heart"
                   count={favouritesCount}
@@ -1962,7 +1962,7 @@ function ReactionsModal({ statusID, instance, onClose }) {
         </button>
       )}
       <header>
-        <h2>Boosted/Favourited by…</h2>
+        <h2>Boosted/Liked by…</h2>
       </header>
       <main>
         {accounts.length > 0 ? (
diff --git a/src/pages/favourites.jsx b/src/pages/favourites.jsx
index 24732ec..5a3310b 100644
--- a/src/pages/favourites.jsx
+++ b/src/pages/favourites.jsx
@@ -7,7 +7,7 @@ import useTitle from '../utils/useTitle';
 const LIMIT = 20;
 
 function Favourites() {
-  useTitle('Favourites', '/f');
+  useTitle('Likes', '/f');
   const { masto, instance } = api();
   const favouritesIterator = useRef();
   async function fetchFavourites(firstLoad) {
@@ -19,10 +19,10 @@ function Favourites() {
 
   return (
     <Timeline
-      title="Favourites"
+      title="Likes"
       id="favourites"
-      emptyText="No favourites yet. Go favourite something!"
-      errorText="Unable to load favourites"
+      emptyText="No likes yet. Go like something!"
+      errorText="Unable to load likes"
       instance={instance}
       fetchItems={fetchFavourites}
     />
diff --git a/src/pages/settings.jsx b/src/pages/settings.jsx
index ff06f6c..2e7bdaa 100644
--- a/src/pages/settings.jsx
+++ b/src/pages/settings.jsx
@@ -727,7 +727,7 @@ function PushNotificationsSection({ onClose }) {
                       },
                       {
                         value: 'favourite',
-                        label: 'Favourites',
+                        label: 'Likes',
                       },
                       {
                         value: 'reblog',