Selaa lähdekoodia

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

run `yarn manage:translations en`
master^2
mayaeh 4 vuotta sitten
committed by Eugen Rochko
vanhempi
commit
be93318c05
3 muutettua tiedostoa jossa 17 lisäystä ja 7 poistoa
  1. +1
    -1
      app/javascript/mastodon/features/notifications/components/notification.js
  2. +14
    -6
      app/javascript/mastodon/locales/defaultMessages.json
  3. +2
    -0
      app/javascript/mastodon/locales/en.json

+ 1
- 1
app/javascript/mastodon/features/notifications/components/notification.js Näytä tiedosto

@@ -229,7 +229,7 @@ class Notification extends ImmutablePureComponent {

<span title={notification.get('created_at')}>
{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' />
)}


+ 14
- 6
app/javascript/mastodon/locales/defaultMessages.json Näytä tiedosto

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


+ 2
- 0
app/javascript/mastodon/locales/en.json Näytä tiedosto

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


Ladataan…
Peruuta
Tallenna