Skip to content
This repository was archived by the owner on Mar 11, 2024. It is now read-only.

Move from toot to post #52

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docs/User-Guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/intl/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
78 changes: 39 additions & 39 deletions src/intl/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default {
`,
// Manifest
longAppName: 'Semaphore for Mastodon',
newStatus: 'New toot',
newStatus: 'New post',
// Generic UI
loading: 'Loading',
okay: 'OK',
Expand Down Expand Up @@ -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})}
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -132,7 +132,7 @@ export default {
}
to switch columns
</li>
<li><kbd>7</kbd> or <kbd>c</kbd> to compose a new toot</li>
<li><kbd>7</kbd> or <kbd>c</kbd> to compose a new post</li>
<li><kbd>s</kbd> or <kbd>/</kbd> to search</li>
<li><kbd>g</kbd> + <kbd>h</kbd> to go home</li>
<li><kbd>g</kbd> + <kbd>n</kbd> to go to notifications</li>
Expand All @@ -144,8 +144,8 @@ export default {
<li><kbd>Backspace</kbd> to go back, close dialogs</li>
`,
timelineHotkeys: `
<li><kbd>j</kbd> or <kbd>↓</kbd> to activate the next toot</li>
<li><kbd>k</kbd> or <kbd>↑</kbd> to activate the previous toot</li>
<li><kbd>j</kbd> or <kbd>↓</kbd> to activate the next post</li>
<li><kbd>k</kbd> or <kbd>↑</kbd> to activate the previous post</li>
<li><kbd>.</kbd> to show more and scroll to top</li>
<li><kbd>o</kbd> to open</li>
<li><kbd>f</kbd> to favorite</li>
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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: '',
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand Down Expand Up @@ -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}',
Expand All @@ -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.',
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/intl/ru-RU.JS
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ export default {
pinPage: 'Закрепить {label}',
// Status composition
composeStatus: 'Создать запись',
postStatus: 'Опубликовать!',
postStatus2: 'Опубликовать!',
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so this will break ru locale?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a mistake yes, thank you @Oreolek

contentWarning: 'Предупреждение о содержимом',
dropToUpload: 'Перетащите для загрузки',
invalidFileType: 'Неверный тип файла',
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_actions/showMoreAndScrollToTop.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_components/compose/ComposeBox.html
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ <h2 class="sr-only">{intl.composeStatus}</h2>
}
// 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(() => {
Expand Down
1 change: 0 additions & 1 deletion src/routes/_components/compose/ComposeButton.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
.compose-box-button {
grid-area: button;
justify-self: right;
text-transform: uppercase;
position: relative;
margin: 5px;
pointer-events: auto;
Expand Down
4 changes: 2 additions & 2 deletions src/routes/_components/compose/ComposeInput.html
Original file line number Diff line number Diff line change
Expand Up @@ -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()')
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_components/compose/ComposeStickyButton.html
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
},
Expand Down
4 changes: 2 additions & 2 deletions src/routes/_components/profile/AccountProfileFilters.html
Original file line number Diff line number Diff line change
Expand Up @@ -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`
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/routes/_components/shortcut/ScrollListShortcuts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_components/status/StatusMediaAttachments.html
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand Down
10 changes: 5 additions & 5 deletions src/routes/_pages/pinned.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<DynamicPageBanner title="{intl.pinnedStatuses}" icon="#fa-thumb-tack" />
{#if $isUserLoggedIn }
<div class="pinned-toots-page">
<div class="pinned-posts-page">
{#if loading}
<LoadingPage />
{:elseif statuses && statuses.length}
<ul class="pinned-toots-results">
<ul class="pinned-posts-results">
{#each statuses as status, index}
<StatusSearchResult {status} {index} length={statuses.length} />
{/each}
Expand All @@ -13,18 +13,18 @@
</div>
{/if}
<style>
.pinned-toots-page {
.pinned-posts-page {
padding: 20px 20px;
position: relative;
}
.pinned-toots-results {
.pinned-posts-results {
list-style: none;
box-sizing: border-box;
border: 1px solid var(--main-border);
border-radius: 2px;
}
@media (max-width: 767px) {
.pinned-toots-page {
.pinned-posts-page {
padding: 20px 10px;
}
}
Expand Down