diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js index 3873d6d99..83c87e0bf 100644 --- a/app/soapbox/features/account/components/header.js +++ b/app/soapbox/features/account/components/header.js @@ -299,7 +299,7 @@ class Header extends ImmutablePureComponent { > { /* : TODO : shortNumberFormat(account.get('favourite_count')) */ } - + ; + const emptyMessage = ; return ( diff --git a/app/soapbox/features/favourites/index.js b/app/soapbox/features/favourites/index.js index 480e7baf1..84cb94c1a 100644 --- a/app/soapbox/features/favourites/index.js +++ b/app/soapbox/features/favourites/index.js @@ -44,7 +44,7 @@ class Favourites extends ImmutablePureComponent { ); } - const emptyMessage = ; + const emptyMessage = ; return ( diff --git a/app/soapbox/features/getting_started/index.js b/app/soapbox/features/getting_started/index.js index f9e395348..7f2c9c0c3 100644 --- a/app/soapbox/features/getting_started/index.js +++ b/app/soapbox/features/getting_started/index.js @@ -20,7 +20,7 @@ const messages = defineMessages({ direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, - favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favorites' }, + favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Likes' }, blocks: { id: 'navigation_bar.blocks', defaultMessage: 'Blocked users' }, domain_blocks: { id: 'navigation_bar.domain_blocks', defaultMessage: 'Hidden domains' }, mutes: { id: 'navigation_bar.mutes', defaultMessage: 'Muted users' }, diff --git a/app/soapbox/features/notifications/components/column_settings.js b/app/soapbox/features/notifications/components/column_settings.js index 47edf3431..c48b72fbf 100644 --- a/app/soapbox/features/notifications/components/column_settings.js +++ b/app/soapbox/features/notifications/components/column_settings.js @@ -58,7 +58,7 @@ export default class ColumnSettings extends React.PureComponent {
- +
diff --git a/app/soapbox/features/notifications/components/filter_bar.js b/app/soapbox/features/notifications/components/filter_bar.js index 208654c6d..ced6f9e82 100644 --- a/app/soapbox/features/notifications/components/filter_bar.js +++ b/app/soapbox/features/notifications/components/filter_bar.js @@ -5,7 +5,7 @@ import Icon from 'soapbox/components/icon'; const tooltips = defineMessages({ mentions: { id: 'notifications.filter.mentions', defaultMessage: 'Mentions' }, - favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Favorites' }, + favourites: { id: 'notifications.filter.favourites', defaultMessage: 'Likes' }, boosts: { id: 'notifications.filter.boosts', defaultMessage: 'Reposts' }, polls: { id: 'notifications.filter.polls', defaultMessage: 'Poll results' }, follows: { id: 'notifications.filter.follows', defaultMessage: 'Follows' }, diff --git a/app/soapbox/features/ui/components/hotkeys_modal.js b/app/soapbox/features/ui/components/hotkeys_modal.js index 7768fae77..005e19898 100644 --- a/app/soapbox/features/ui/components/hotkeys_modal.js +++ b/app/soapbox/features/ui/components/hotkeys_modal.js @@ -47,7 +47,7 @@ class HotkeysModal extends ImmutablePureComponent { f - + b @@ -133,7 +133,7 @@ class HotkeysModal extends ImmutablePureComponent { g + f - + g + p diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index 965459484..a83aac3ce 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -850,7 +850,7 @@ "id": "account.followers" }, { - "defaultMessage": "Favorites", + "defaultMessage": "Likes", "id": "navigation_bar.favourites" }, { @@ -1443,7 +1443,7 @@ { "descriptors": [ { - "defaultMessage": "You don't have any favorite posts yet. When you favorite one, it will show up here.", + "defaultMessage": "You don't have any liked posts yet. When you like one, it will show up here.", "id": "empty_column.favourited_statuses" } ], @@ -1452,7 +1452,7 @@ { "descriptors": [ { - "defaultMessage": "No one has favorited this post yet. When someone does, they will show up here.", + "defaultMessage": "No one has liked this post yet. When someone does, they will show up here.", "id": "empty_column.favourites" } ], @@ -1550,7 +1550,7 @@ "id": "navigation_bar.follow_requests" }, { - "defaultMessage": "Favorites", + "defaultMessage": "Likes", "id": "navigation_bar.favourites" }, { @@ -2041,7 +2041,7 @@ "id": "notifications.column_settings.follow" }, { - "defaultMessage": "Favorites:", + "defaultMessage": "Likes:", "id": "notifications.column_settings.favourite" }, { @@ -2066,7 +2066,7 @@ "id": "notifications.filter.mentions" }, { - "defaultMessage": "Favorites", + "defaultMessage": "Likes", "id": "notifications.filter.favourites" }, { @@ -2633,7 +2633,7 @@ "id": "keyboard_shortcuts.profile" }, { - "defaultMessage": "to favorite", + "defaultMessage": "to like", "id": "keyboard_shortcuts.favourite" }, { @@ -2701,7 +2701,7 @@ "id": "keyboard_shortcuts.start" }, { - "defaultMessage": "to open favorites list", + "defaultMessage": "to open likes list", "id": "keyboard_shortcuts.favourites" }, { diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 9e65e819b..950098cf9 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -144,8 +144,8 @@ "empty_column.community": "The local timeline is empty. Write something publicly to get the ball rolling!", "empty_column.direct": "You don't have any direct messages yet. When you send or receive one, it will show up here.", "empty_column.domain_blocks": "There are no hidden domains yet.", - "empty_column.favourited_statuses": "You don't have any favorite posts yet. When you favorite one, it will show up here.", - "empty_column.favourites": "No one has favorited this post yet. When someone does, they will show up here.", + "empty_column.favourited_statuses": "You don't have any liked posts yet. When you like one, it will show up here.", + "empty_column.favourites": "No one has liked this post yet. When someone does, they will show up here.", "empty_column.filters": "You haven't created any muted words yet.", "empty_column.follow_requests": "You don't have any follow requests yet. When you receive one, it will show up here.", "empty_column.group": "There is nothing in this group yet. When members of this group make new posts, they will appear here.", @@ -201,8 +201,8 @@ "keyboard_shortcuts.direct": "to open direct messages column", "keyboard_shortcuts.down": "to move down in the list", "keyboard_shortcuts.enter": "to open post", - "keyboard_shortcuts.favourite": "to favorite", - "keyboard_shortcuts.favourites": "to open favorites list", + "keyboard_shortcuts.favourite": "to like", + "keyboard_shortcuts.favourites": "to open likes list", "keyboard_shortcuts.heading": "Keyboard shortcuts", "keyboard_shortcuts.home": "to open home timeline", "keyboard_shortcuts.hotkey": "Hotkey", @@ -259,7 +259,7 @@ "navigation_bar.discover": "Discover", "navigation_bar.domain_blocks": "Hidden domains", "navigation_bar.edit_profile": "Edit profile", - "navigation_bar.favourites": "Favorites", + "navigation_bar.favourites": "Likes", "navigation_bar.filters": "Muted words", "navigation_bar.follow_requests": "Follow requests", "navigation_bar.info": "About this server", @@ -274,7 +274,7 @@ "navigation_bar.public_timeline": "Federated timeline", "navigation_bar.security": "Security", "notification.emoji_react": "{name} reacted to your post", - "notification.favourite": "{name} favorited your post", + "notification.favourite": "{name} liked your post", "notification.follow": "{name} followed you", "notification.mention": "{name} mentioned you", "notification.poll": "A poll you have voted in has ended", @@ -282,7 +282,7 @@ "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", "notifications.column_settings.alert": "Desktop notifications", - "notifications.column_settings.favourite": "Favorites:", + "notifications.column_settings.favourite": "Likes:", "notifications.column_settings.filter_bar.advanced": "Display all categories", "notifications.column_settings.filter_bar.category": "Quick filter bar", "notifications.column_settings.filter_bar.show": "Show", @@ -295,7 +295,7 @@ "notifications.column_settings.sound": "Play sound", "notifications.filter.all": "All", "notifications.filter.boosts": "Reposts", - "notifications.filter.favourites": "Favorites", + "notifications.filter.favourites": "Likes", "notifications.filter.follows": "Follows", "notifications.filter.mentions": "Mentions", "notifications.filter.polls": "Poll results",