mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Integrate own poll's translation into own_poll. (#12231) 

run `yarn manage:translations en`
pull/1242/head
mayaeh 2019-11-04 21:03:29 +09:00 committed by Eugen Rochko
parent 1e232e455c
commit be93318c05
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/notifications/components/notification.js
View File

@ -229,7 +229,7 @@ class Notification extends ImmutablePureComponent {
<span title={notification.get('created_at')}> <span title={notification.get('created_at')}>
{ownPoll ? ( {ownPoll ? (
<FormattedMessage id='notification.ownPoll' defaultMessage='Your poll has ended' /> <FormattedMessage id='notification.own_poll' defaultMessage='Your poll has ended' />
) : ( ) : (
<FormattedMessage id='notification.poll' defaultMessage='A poll you have voted in has ended' /> <FormattedMessage id='notification.poll' defaultMessage='A poll you have voted in has ended' />
)} )}

20
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -2078,21 +2078,25 @@
}, },
{ {
"descriptors": [ "descriptors": [
{
"defaultMessage": "{name} followed you",
"id": "notification.follow"
},
{ {
"defaultMessage": "{name} favourited your status", "defaultMessage": "{name} favourited your status",
"id": "notification.favourite" "id": "notification.favourite"
}, },
{ {
"defaultMessage": "{name} boosted your status", "defaultMessage": "{name} followed you",
"id": "notification.reblog" "id": "notification.follow"
},
{
"defaultMessage": "Your poll has ended",
"id": "notification.own_poll"
}, },
{ {
"defaultMessage": "A poll you have voted in has ended", "defaultMessage": "A poll you have voted in has ended",
"id": "notification.poll" "id": "notification.poll"
},
{
"defaultMessage": "{name} boosted your status",
"id": "notification.reblog"
} }
], ],
"path": "app/javascript/mastodon/features/notifications/components/notification.json" "path": "app/javascript/mastodon/features/notifications/components/notification.json"
@ -2758,6 +2762,10 @@
"defaultMessage": "Exit full screen", "defaultMessage": "Exit full screen",
"id": "video.exit_fullscreen" "id": "video.exit_fullscreen"
}, },
{
"defaultMessage": "Download file",
"id": "video.download"
},
{ {
"defaultMessage": "Sensitive content", "defaultMessage": "Sensitive content",
"id": "status.sensitive_warning" "id": "status.sensitive_warning"

2
app/javascript/mastodon/locales/en.json
View File

@ -274,6 +274,7 @@
"notification.favourite": "{name} favourited your status", "notification.favourite": "{name} favourited your status",
"notification.follow": "{name} followed you", "notification.follow": "{name} followed you",
"notification.mention": "{name} mentioned you", "notification.mention": "{name} mentioned you",
"notification.own_poll": "Your poll has ended",
"notification.poll": "A poll you have voted in has ended", "notification.poll": "A poll you have voted in has ended",
"notification.reblog": "{name} boosted your status", "notification.reblog": "{name} boosted your status",
"notifications.clear": "Clear notifications", "notifications.clear": "Clear notifications",
@ -412,6 +413,7 @@
"upload_modal.preview_label": "Preview ({ratio})", "upload_modal.preview_label": "Preview ({ratio})",
"upload_progress.label": "Uploading...", "upload_progress.label": "Uploading...",
"video.close": "Close video", "video.close": "Close video",
"video.download": "Download file",
"video.exit_fullscreen": "Exit full screen", "video.exit_fullscreen": "Exit full screen",
"video.expand": "Expand video", "video.expand": "Expand video",
"video.fullscreen": "Full screen", "video.fullscreen": "Full screen",