From 3b3bfecba6131e79e1ffe8cfb1f6c45472f899a1 Mon Sep 17 00:00:00 2001 From: Jeremy Kescher Date: Sat, 27 May 2023 14:05:48 +0200 Subject: [PATCH] Fix translations --- .../glitch/locales/defaultMessages.json | 90 +++++++++++++++++++ .../flavours/glitch/locales/en.json | 8 +- config/locales-glitch/en.yml | 4 +- 3 files changed, 95 insertions(+), 7 deletions(-) diff --git a/app/javascript/flavours/glitch/locales/defaultMessages.json b/app/javascript/flavours/glitch/locales/defaultMessages.json index bf21fdef2..8feefa4a4 100644 --- a/app/javascript/flavours/glitch/locales/defaultMessages.json +++ b/app/javascript/flavours/glitch/locales/defaultMessages.json @@ -78,6 +78,15 @@ ], "path": "app/javascript/flavours/glitch/components/notification_purge_buttons.json" }, + { + "descriptors": [ + { + "defaultMessage": "React", + "id": "status.react" + } + ], + "path": "app/javascript/flavours/glitch/components/status_action_bar.json" + }, { "descriptors": [ { @@ -119,6 +128,15 @@ ], "path": "app/javascript/flavours/glitch/components/status_icons.json" }, + { + "descriptors": [ + { + "defaultMessage": "{name} reacted to your status", + "id": "notification.reaction" + } + ], + "path": "app/javascript/flavours/glitch/components/status_prepend.json" + }, { "descriptors": [ { @@ -903,6 +921,24 @@ ], "path": "app/javascript/flavours/glitch/features/local_settings/page/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "Reactions:", + "id": "notifications.column_settings.reaction" + } + ], + "path": "app/javascript/flavours/glitch/features/notifications/components/column_settings.json" + }, + { + "descriptors": [ + { + "defaultMessage": "Reactions", + "id": "notifications.filter.reactions" + } + ], + "path": "app/javascript/flavours/glitch/features/notifications/components/filter_bar.json" + }, { "descriptors": [ { @@ -956,6 +992,15 @@ ], "path": "app/javascript/flavours/glitch/features/reblogs/index.json" }, + { + "descriptors": [ + { + "defaultMessage": "React", + "id": "status.react" + } + ], + "path": "app/javascript/flavours/glitch/features/status/components/action_bar.json" + }, { "descriptors": [ { @@ -1110,5 +1155,50 @@ } ], "path": "app/javascript/flavours/glitch/features/ui/index.json" + }, + { + "descriptors": [ + { + "defaultMessage": "React", + "id": "status.react" + } + ], + "path": "app/javascript/mastodon/components/status_action_bar.json" + }, + { + "descriptors": [ + { + "defaultMessage": "Reactions:", + "id": "notifications.column_settings.reaction" + } + ], + "path": "app/javascript/mastodon/features/notifications/components/column_settings.json" + }, + { + "descriptors": [ + { + "defaultMessage": "Reactions", + "id": "notifications.filter.reactions" + } + ], + "path": "app/javascript/mastodon/features/notifications/components/filter_bar.json" + }, + { + "descriptors": [ + { + "defaultMessage": "{name} reacted to your status", + "id": "notification.reaction" + } + ], + "path": "app/javascript/mastodon/features/notifications/components/notification.json" + }, + { + "descriptors": [ + { + "defaultMessage": "React", + "id": "status.react" + } + ], + "path": "app/javascript/mastodon/features/status/components/action_bar.json" } ] \ No newline at end of file diff --git a/app/javascript/flavours/glitch/locales/en.json b/app/javascript/flavours/glitch/locales/en.json index 6d16f23ef..293073de5 100644 --- a/app/javascript/flavours/glitch/locales/en.json +++ b/app/javascript/flavours/glitch/locales/en.json @@ -61,7 +61,6 @@ "keyboard_shortcuts.bookmark": "to bookmark", "keyboard_shortcuts.secondary_toot": "to send toot using secondary privacy setting", "keyboard_shortcuts.toggle_collapse": "to collapse/uncollapse toots", - "tooltips.reactions": "Reactions", "layout.auto": "Auto", "layout.desktop": "Desktop", "layout.hint.auto": "Automatically chose layout based on “Enable advanced web interface” setting and screen size.", @@ -76,12 +75,13 @@ "navigation_bar.misc": "Misc", "notification.markForDeletion": "Mark for deletion", "notification.reaction": "{name} reacted to your post", - "notifications.column_settings.reaction": "Reactions:", "notification_purge.btn_all": "Select\nall", "notification_purge.btn_apply": "Clear\nselected", "notification_purge.btn_invert": "Invert\nselection", "notification_purge.btn_none": "Select\nnone", "notification_purge.start": "Enter notification cleaning mode", + "notifications.column_settings.reaction": "Reactions:", + "notifications.filter.reactions": "Reactions", "notifications.marked_clear": "Clear selected notifications", "notifications.marked_clear_confirmation": "Are you sure you want to permanently clear all selected notifications?", "onboarding.done": "Done", @@ -136,7 +136,6 @@ "settings.deprecated_setting": "This setting is now controlled from Mastodon's {settings_page_link}", "settings.enable_collapsed": "Enable collapsed toots", "settings.enable_collapsed_hint": "Collapsed posts have parts of their contents hidden to take up less screen space. This is distinct from the Content Warning feature", - "settings.enter_amount_prompt": "Enter an amount", "settings.enable_content_warnings_auto_unfold": "Automatically unfold content-warnings", "settings.general": "General", "settings.hicolor_privacy_icons": "High color privacy icons", @@ -150,7 +149,6 @@ "settings.layout_opts": "Layout options", "settings.media": "Media", "settings.media_fullwidth": "Full-width media previews", - "settings.num_visible_reactions": "Number of visible reactions", "settings.media_letterbox": "Letterbox media", "settings.media_letterbox_hint": "Scale down and letterbox media to fill the image containers instead of stretching and cropping them", "settings.media_reveal_behind_cw": "Reveal sensitive media behind a CW by default", @@ -193,7 +191,6 @@ "settings.wide_view": "Wide view (Desktop mode only)", "settings.wide_view_hint": "Stretches columns to better fill the available space.", "status.collapse": "Collapse", - "status.react": "React", "status.has_audio": "Features attached audio files", "status.has_pictures": "Features attached pictures", "status.has_preview_card": "Features an attached preview card", @@ -201,6 +198,7 @@ "status.in_reply_to": "This toot is a reply", "status.is_poll": "This toot is a poll", "status.local_only": "Only visible from your instance", + "status.react": "React", "status.sensitive_toggle": "Click to view", "status.uncollapse": "Uncollapse", "web_app_crash.change_your_settings": "Change your {settings}", diff --git a/config/locales-glitch/en.yml b/config/locales-glitch/en.yml index e88e98191..43b8ca6c7 100644 --- a/config/locales-glitch/en.yml +++ b/config/locales-glitch/en.yml @@ -38,10 +38,10 @@ en: title: User verification generic: use_this: Use this - settings: - flavours: Flavours notification_mailer: reaction: body: "%{name} reacted to your post:" subject: "%{name} reacted to your post" title: New reaction + settings: + flavours: Flavours