data.coop/pinafore
8
0
Fork 0
Code Issues 1 Pull requests Packages Projects Releases Wiki Activity

fix: tweak language around bookmarking (#1848)

Browse source 
For consistency with the rest of the UI, say "toot" instead of "status" and specify "toot."
This commit is contained in:
Nolan Lawson 2020-08-27 08:49:36 -07:00 committed by GitHub
parent 08c021bc56
commit 2f41494a9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/routes/_actions/bookmark.js
View file

@ -12,14 +12,14 @@ export async function setStatusBookmarkedOrUnbookmarked (statusId, bookmarked) {
await unbookmarkStatus(currentInstance, accessToken, statusId) await unbookmarkStatus(currentInstance, accessToken, statusId)
} }
if (bookmarked) { if (bookmarked) {
toast.say('Bookmarked status') toast.say('Bookmarked toot')
} else { } else {
toast.say('Unbookmarked status') toast.say('Unbookmarked toot')
} }
store.setStatusBookmarked(currentInstance, statusId, bookmarked) store.setStatusBookmarked(currentInstance, statusId, bookmarked)
await database.setStatusBookmarked(currentInstance, statusId, bookmarked) await database.setStatusBookmarked(currentInstance, statusId, bookmarked)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
toast.say(`Unable to ${bookmarked ? 'bookmark' : 'unbookmark'} status: ` + (e.message || '')) toast.say(`Unable to ${bookmarked ? 'bookmark' : 'unbookmark'} toot: ` + (e.message || ''))
} }
} }

2
src/routes/_components/dialog/components/StatusOptionsDialog.html
View file

@ -83,7 +83,7 @@ export default {
muteConversationLabel: ({ mutingConversation }) => mutingConversation ? 'Unmute conversation' : 'Mute conversation', muteConversationLabel: ({ mutingConversation }) => mutingConversation ? 'Unmute conversation' : 'Mute conversation',
muteConversationIcon: ({ mutingConversation }) => mutingConversation ? '#fa-volume-up' : '#fa-volume-off', muteConversationIcon: ({ mutingConversation }) => mutingConversation ? '#fa-volume-up' : '#fa-volume-off',
isPublicOrUnlisted: ({ visibility }) => visibility === 'public' || visibility === 'unlisted', isPublicOrUnlisted: ({ visibility }) => visibility === 'public' || visibility === 'unlisted',
bookmarkLabel: ({ status }) => status.bookmarked ? 'Unbookmark' : 'Bookmark', bookmarkLabel: ({ status }) => status.bookmarked ? 'Unbookmark toot' : 'Bookmark toot',
items: ({ items: ({
blockLabel, blocking, blockIcon, muteLabel, muteIcon, followLabel, followIcon, blockLabel, blocking, blockIcon, muteLabel, muteIcon, followLabel, followIcon,
following, followRequested, pinLabel, isUser, visibility, mentionsUser, mutingConversation, following, followRequested, pinLabel, isUser, visibility, mentionsUser, mutingConversation,