From 1d48a247c5f49b3b571fdc64e0455f2456888aeb Mon Sep 17 00:00:00 2001 From: Nick Colley <2445413+NickColley@users.noreply.github.com> Date: Sun, 12 Mar 2023 16:45:41 +0000 Subject: [PATCH 1/2] Move from toot to post --- docs/User-Guide.md | 6 +- src/intl/de.js | 2 +- src/intl/en-US.js | 78 +++++++++---------- src/intl/ru-RU.JS | 2 +- src/routes/_actions/showMoreAndScrollToTop.js | 2 +- .../_components/compose/ComposeBox.html | 2 +- .../_components/compose/ComposeInput.html | 4 +- .../compose/ComposeStickyButton.html | 2 +- .../profile/AccountProfileFilters.html | 4 +- .../shortcut/ScrollListShortcuts.html | 4 +- .../status/StatusMediaAttachments.html | 2 +- src/routes/_pages/pinned.html | 10 +-- 12 files changed, 59 insertions(+), 59 deletions(-) diff --git a/docs/User-Guide.md b/docs/User-Guide.md index 780136f2..52aa3cab 100644 --- a/docs/User-Guide.md +++ b/docs/User-Guide.md @@ -8,15 +8,15 @@ This will walk you through the basic usage of Semaphore and its major difference ## Home page -The home page is both where you write toots and where you read your home timeline: +The home page is both where you write posts and where you read your home timeline: ![Screenshot of home page](https://github.com/NickColley/semaphore/blob/main/docs/Screenshot1.png) -When you scroll down, the "toot" button transforms into a "compose" button: +When you scroll down, the "post" button transforms into a "compose" button: ![Screenshot showing home page scrolled down](https://github.com/NickColley/semaphore/blob/main/docs/Screenshot2.png) -If you press this compose button, you can toot anywhere in your home timeline. +If you press this compose button, you can post anywhere in your home timeline. ![Screenshot showing compose box in a modal dialog](https://github.com/NickColley/semaphore/blob/main/docs/Screenshot3.png) diff --git a/src/intl/de.js b/src/intl/de.js index ae87d5bf..3bd87ddb 100644 --- a/src/intl/de.js +++ b/src/intl/de.js @@ -187,7 +187,7 @@ export default { pinPage: 'Hefte {label} an', // Status composition composeStatus: 'Tröt erstellen', - postStatus: 'Tröt!', + postStatus: 'Post', contentWarning: 'Inhaltswarnung', dropToUpload: 'Fallenlassen zum Hochladen', invalidFileType: 'Ungültiger Dateityp', diff --git a/src/intl/en-US.js b/src/intl/en-US.js index e952f4ee..e400ab98 100644 --- a/src/intl/en-US.js +++ b/src/intl/en-US.js @@ -27,7 +27,7 @@ export default { `, // Manifest longAppName: 'Semaphore for Mastodon', - newStatus: 'New toot', + newStatus: 'New post', // Generic UI loading: 'Loading', okay: 'OK', @@ -66,7 +66,7 @@ export default { local: 'Local', notifications: 'Notifications', mutedUsers: 'Muted users', - pinnedStatuses: 'Pinned toots', + pinnedStatuses: 'Pinned posts', followRequests: 'Follow requests', followRequestsLabel: `Follow requests {hasFollowRequests, select, true {({count})} @@ -102,7 +102,7 @@ export default { listNotLoggedIn: 'A list will appear here when logged in.', notificationsNotLoggedIn: 'Your notifications will appear here when logged in.', notificationMentionsNotLoggedIn: 'Your notification mentions will appear here when logged in.', - statusNotLoggedIn: 'A toot thread will appear here when logged in.', + statusNotLoggedIn: 'A post thread will appear here when logged in.', tagNotLoggedIn: 'A hashtag timeline will appear here when logged in.', // Notification subpages filters: 'Filters', @@ -132,7 +132,7 @@ export default { } to switch columns -
  • 7 or c to compose a new toot
    • +
  • 7 or c to compose a new post
  • s or / to search
  • g + h to go home
  • g + n to go to notifications
    • @@ -144,8 +144,8 @@ export default {
  • Backspace to go back, close dialogs
    • `, timelineHotkeys: ` -
  • j or ↓ to activate the next toot
    • -
  • k or ↑ to activate the previous toot
    • +
  • j or ↓ to activate the next post
    • +
  • k or ↑ to activate the previous post
  • . to show more and scroll to top
  • o to open
  • f to favorite
    • @@ -192,8 +192,8 @@ export default { }`, pinPage: 'Pin {label}', // Status composition - composeStatus: 'Compose toot', - postStatus: 'Toot!', + composeStatus: 'Compose post', + postStatus: 'Post', contentWarning: 'Content warning', dropToUpload: 'Drop to upload', invalidFileType: 'Invalid file type', @@ -275,25 +275,25 @@ export default { additionalComments: 'Additional comments', forwardDescription: 'Forward to the moderators of {instance} as well?', forwardLabel: 'Forward to {instance}', - unableToLoadStatuses: 'Unable to load recent toots: {error}', + unableToLoadStatuses: 'Unable to load recent posts: {error}', report: 'Report', noContent: '(No content)', - noStatuses: 'No toots to report', + noStatuses: 'No posts to report', // Status options unpinFromProfile: 'Unpin from profile', pinToProfile: 'Pin to profile', muteConversation: 'Mute conversation', unmuteConversation: 'Unmute conversation', - bookmarkStatus: 'Bookmark toot', - unbookmarkStatus: 'Unbookmark toot', + bookmarkStatus: 'Bookmark post', + unbookmarkStatus: 'Unbookmark post', deleteAndRedraft: 'Delete and redraft', - reportStatus: 'Report toot', - shareStatus: 'Share toot', - copyLinkToStatus: 'Copy link to toot', + reportStatus: 'Report post', + shareStatus: 'Share post', + copyLinkToStatus: 'Copy link to post', // Account profile profileForAccount: 'Profile for {account}', statisticsAndMoreOptions: 'Stats and more options', - statuses: 'Toots', + statuses: 'posts', follows: 'Follows', followers: 'Followers', moreOptions: 'More options', @@ -373,10 +373,10 @@ export default { largeMedia: 'Show large inline images and videos', autoplayGifs: 'Autoplay animated GIFs', hideCards: 'Hide link preview cards', - underlineLinks: 'Underline links in toots and profiles', + underlineLinks: 'Underline links in posts and profiles', accessibility: 'Accessibility', reduceMotion: 'Reduce motion in UI animations', - disableTappable: 'Disable tappable area on entire toot', + disableTappable: 'Disable tappable area on entire post', removeEmoji: 'Remove emoji from user display names', shortAria: 'Use short article ARIA labels', theme: 'Theme', @@ -416,7 +416,7 @@ export default { // to see a description. It's hard to properly internationalize, so we just break up the strings. disableInfiniteScrollPre: 'Disable', disableInfiniteScrollText: 'infinite scroll', - disableInfiniteScrollDescription: `When infinite scroll is disabled, new toots will not automatically appear at + disableInfiniteScrollDescription: `When infinite scroll is disabled, new posts will not automatically appear at the bottom or top of the timeline. Instead, buttons will allow you to load more content on demand.`, disableInfiniteScrollPost: '', @@ -475,7 +475,7 @@ export default { newFollowers: 'New followers', reblogs: 'Boosts', pollResults: 'Poll results', - subscriptions: 'Subscribed toots', + subscriptions: 'Subscribed posts', needToReauthenticate: 'You need to reauthenticate in order to enable push notification. Log out of {instance}?', failedToUpdatePush: 'Failed to update push notification settings: {error}', // Themes @@ -509,11 +509,11 @@ export default { one {1 time} other {{count} times} }`, - pinnedStatus: 'Pinned toot', - rebloggedYou: 'boosted your toot', - favoritedYou: 'favorited your toot', + pinnedStatus: 'Pinned post', + rebloggedYou: 'boosted your post', + favoritedYou: 'favorited your post', followedYou: 'followed you', - edited: 'edited their toot', + edited: 'edited their post', requestedFollow: 'requested to follow you', reported: 'filed a report', signedUp: 'signed up', @@ -529,14 +529,14 @@ export default { clickToShowSensitive: 'Sensitive content. Click to show.', longPost: 'Long post', // Accessible status labels - accountRebloggedYou: '{account} boosted your toot', - accountFavoritedYou: '{account} favorited your toot', - accountEdited: '{account} edited their toot', + accountRebloggedYou: '{account} boosted your post', + accountFavoritedYou: '{account} favorited your post', + accountEdited: '{account} edited their post', rebloggedByAccount: 'Boosted by {account}', contentWarningContent: 'Content warning: {spoiler}', hasMedia: 'has media', hasPoll: 'has poll', - shortStatusLabel: '{privacy} toot by {account}', + shortStatusLabel: '{privacy} post by {account}', // Privacy types public: 'Public', unlisted: 'Unlisted', @@ -590,21 +590,21 @@ export default { showCountMore: 'Show {count} more', nothingToShow: 'Nothing to show.', // status thread page - statusThreadPage: 'Toot thread page', - status: 'Toot', + statusThreadPage: 'post thread page', + status: 'post', // toast messages blockedAccount: 'Blocked account', unblockedAccount: 'Unblocked account', unableToBlock: 'Unable to block account: {error}', unableToUnblock: 'Unable to unblock account: {error}', - bookmarkedStatus: 'Bookmarked toot', - unbookmarkedStatus: 'Unbookmarked toot', + bookmarkedStatus: 'Bookmarked post', + unbookmarkedStatus: 'Unbookmarked post', unableToBookmark: 'Unable to bookmark: {error}', unableToUnbookmark: 'Unable to unbookmark: {error}', cannotPostOffline: 'You cannot post while offline', - unableToPost: 'Unable to post toot: {error}', - statusDeleted: 'Toot deleted', - unableToDelete: 'Unable to delete toot: {error}', + unableToPost: 'Unable to post post: {error}', + statusDeleted: 'post deleted', + unableToDelete: 'Unable to delete post: {error}', cannotFavoriteOffline: 'You cannot favorite while offline', cannotUnfavoriteOffline: 'You cannot unfavorite while offline', unableToFavorite: 'Unable to favorite: {error}', @@ -624,9 +624,9 @@ export default { unmutedConversation: 'Unmuted conversation', unableToMuteConversation: 'Unable to mute conversation: {error}', unableToUnmuteConversation: 'Unable to unmute conversation: {error}', - unpinnedStatus: 'Unpinned toot', - unableToPinStatus: 'Unable to pin toot: {error}', - unableToUnpinStatus: 'Unable to unpin toot: {error}', + unpinnedStatus: 'Unpinned post', + unableToPinStatus: 'Unable to pin post: {error}', + unableToUnpinStatus: 'Unable to unpin post: {error}', unableToRefreshPoll: 'Unable to refresh poll: {error}', unableToVoteInPoll: 'Unable to vote in poll: {error}', cannotReblogOffline: 'You cannot boost while offline.', @@ -652,7 +652,7 @@ export default { unableToSubscribe: 'Unable to subscribe: {error}', unableToUnsubscribe: 'Unable to unsubscribe: {error}', showingOfflineContent: 'Internet request failed. Showing offline content.', - youAreOffline: 'You seem to be offline. You can still read toots while offline.', + youAreOffline: 'You seem to be offline. You can still read posts while offline.', // Snackbar UI updateAvailable: 'App update available.', // Word/phrase filters diff --git a/src/intl/ru-RU.JS b/src/intl/ru-RU.JS index 9887945b..592843cb 100644 --- a/src/intl/ru-RU.JS +++ b/src/intl/ru-RU.JS @@ -193,7 +193,7 @@ export default { pinPage: 'Закрепить {label}', // Status composition composeStatus: 'Создать запись', - postStatus: 'Опубликовать!', + postStatus2: 'Опубликовать!', contentWarning: 'Предупреждение о содержимом', dropToUpload: 'Перетащите для загрузки', invalidFileType: 'Неверный тип файла', diff --git a/src/routes/_actions/showMoreAndScrollToTop.js b/src/routes/_actions/showMoreAndScrollToTop.js index 6793c75d..57ff8098 100644 --- a/src/routes/_actions/showMoreAndScrollToTop.js +++ b/src/routes/_actions/showMoreAndScrollToTop.js @@ -6,7 +6,7 @@ import { tryToFocusElement } from '../_utils/tryToFocusElement.js' export function showMoreAndScrollToTop () { // Similar to Twitter, pressing "." will click the "show more" button and select - // the first toot. + // the first post. showMoreItemsForCurrentTimeline() const { currentInstance, diff --git a/src/routes/_components/compose/ComposeBox.html b/src/routes/_components/compose/ComposeBox.html index 4f416c69..a4924840 100644 --- a/src/routes/_components/compose/ComposeBox.html +++ b/src/routes/_components/compose/ComposeBox.html @@ -200,7 +200,7 @@ } // The reason we add a scheduleIdleTask delay here is because we also use scheduleIdleTask // in ComposeInput.html to debounce the input events. If the user is very fast at typing - // at their keyboard and quickly presses Ctrl+Enter or the "Toot" button then there could + // at their keyboard and quickly presses Ctrl+Enter or the "Post" button then there could // be a race condition where not all of their status is posted. this.set({ aboutToPostStatus: true }) scheduleIdleTask(() => { diff --git a/src/routes/_components/compose/ComposeInput.html b/src/routes/_components/compose/ComposeInput.html index 47172d3e..3599ba2f 100644 --- a/src/routes/_components/compose/ComposeInput.html +++ b/src/routes/_components/compose/ComposeInput.html @@ -108,7 +108,7 @@ textarea.selectionStart = textarea.selectionEnd = newSelectionStart } // this next autosize is required to resize after - // the user clicks the "toot" button + // the user clicks the "post" button mark('autosize.update()') autosize.update(textarea) stop('autosize.update()') @@ -173,7 +173,7 @@ }, onKeydown (e) { const { keyCode } = e - // ctrl or cmd (on macs) was pressed; ctrl-enter means post a toot + // ctrl or cmd (on macs) was pressed; ctrl-enter means create a post const ctrlPressed = e.getModifierState('Control') || e.getModifierState('Meta') switch (keyCode) { case 9: { // tab diff --git a/src/routes/_components/compose/ComposeStickyButton.html b/src/routes/_components/compose/ComposeStickyButton.html index 8362555a..b0564bf3 100644 --- a/src/routes/_components/compose/ComposeStickyButton.html +++ b/src/routes/_components/compose/ComposeStickyButton.html @@ -63,7 +63,7 @@ // so we should launch a new compose dialog this.showDialog() } else { - // else we're actually posting a new toot, let our parent know + // else we're actually posting a new post, let our parent know this.fire('postAction') } }, diff --git a/src/routes/_components/profile/AccountProfileFilters.html b/src/routes/_components/profile/AccountProfileFilters.html index 020e09a4..9d1fb943 100644 --- a/src/routes/_components/profile/AccountProfileFilters.html +++ b/src/routes/_components/profile/AccountProfileFilters.html @@ -18,12 +18,12 @@ [ { name: '', - label: 'Toots', + label: 'Posts', href: `/accounts/${account.id}` }, { name: 'with_replies', - label: 'Toots and replies', + label: 'Posts and replies', href: `/accounts/${account.id}/with_replies` }, { diff --git a/src/routes/_components/shortcut/ScrollListShortcuts.html b/src/routes/_components/shortcut/ScrollListShortcuts.html index 822b2eef..3f78b270 100644 --- a/src/routes/_components/shortcut/ScrollListShortcuts.html +++ b/src/routes/_components/shortcut/ScrollListShortcuts.html @@ -119,8 +119,8 @@ if (!activeElement) { return null } - // The user might be focused on an element inside a toot. We want to - // move relative to that toot. + // The user might be focused on an element inside a post. We want to + // move relative to that post. const activeArticle = activeElement.closest('article') if (!activeArticle) { return null diff --git a/src/routes/_components/status/StatusMediaAttachments.html b/src/routes/_components/status/StatusMediaAttachments.html index 941e7ebd..a9eaf68d 100644 --- a/src/routes/_components/status/StatusMediaAttachments.html +++ b/src/routes/_components/status/StatusMediaAttachments.html @@ -220,7 +220,7 @@ sensitivesShown[uuid] = !sensitivesShown[uuid] this.store.set({ sensitivesShown }) this.fire('recalculateHeight') - // Only change focus for clicks, not for hotkeys. It's weird if, when the entire toot + // Only change focus for clicks, not for hotkeys. It's weird if, when the entire post // is focused and you press "y", that the focus changes to the sensitive media button. if (changeFocus) { requestAnimationFrame(() => { diff --git a/src/routes/_pages/pinned.html b/src/routes/_pages/pinned.html index 08545d35..2fca899f 100644 --- a/src/routes/_pages/pinned.html +++ b/src/routes/_pages/pinned.html @@ -1,10 +1,10 @@ {#if $isUserLoggedIn } -
    +
    {#if loading} {:elseif statuses && statuses.length} -
      +
        {#each statuses as status, index} {/each} @@ -13,18 +13,18 @@
    {/if}