From be93318c0538ccfc41997301800dc347ad0f4271 Mon Sep 17 00:00:00 2001 From: mayaeh Date: Mon, 4 Nov 2019 21:03:29 +0900 Subject: [PATCH] Integrate own poll's translation into own_poll. (#12231) run `yarn manage:translations en` --- .../notifications/components/notification.js | 2 +- .../mastodon/locales/defaultMessages.json | 20 +++++++++++++------ app/javascript/mastodon/locales/en.json | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/javascript/mastodon/features/notifications/components/notification.js b/app/javascript/mastodon/features/notifications/components/notification.js index e81ef00de..2dea8afa7 100644 --- a/app/javascript/mastodon/features/notifications/components/notification.js +++ b/app/javascript/mastodon/features/notifications/components/notification.js @@ -229,7 +229,7 @@ class Notification extends ImmutablePureComponent { {ownPoll ? ( - + ) : ( )} diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 4778ed56f..0dde61d32 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -2078,21 +2078,25 @@ }, { "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" @@ -2758,6 +2762,10 @@ "defaultMessage": "Exit full screen", "id": "video.exit_fullscreen" }, + { + "defaultMessage": "Download file", + "id": "video.download" + }, { "defaultMessage": "Sensitive content", "id": "status.sensitive_warning" diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index c50bdb8d3..61b77f754 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -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",