From c1d0a6a7981b5fe74bdd03c958a558096ea3cde8 Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 31 May 2022 16:52:52 +0200 Subject: [PATCH] =?UTF-8?q?Make=20=E2=80=9CFlavour=20and=20skin=E2=80=9D?= =?UTF-8?q?=20admin=20setting=20label=20translatable=20(#1791)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/settings/edit.html.haml | 2 +- config/locales-glitch/en.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index a47cb2a885..dd794b7270 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -12,7 +12,7 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last + = f.input :flavour_and_skin, collection: Themes.instance.flavours_and_skins, group_label_method: lambda { |(flavour, _)| I18n.t("flavours.#{flavour}.name", default: flavour) }, wrapper: :with_label, label: t('admin.settings.flavour_and_skin.title'), include_blank: false, as: :grouped_select, label_method: :last, value_method: lambda { |value| value.join('/') }, group_method: :last .fields-row__column.fields-row__column-6.fields-group = f.input :registrations_mode, collection: %w(open approved none), wrapper: :with_label, label: t('admin.settings.registrations_mode.title'), include_blank: false, label_method: lambda { |mode| I18n.t("admin.settings.registrations_mode.modes.#{mode}") } diff --git a/config/locales-glitch/en.yml b/config/locales-glitch/en.yml index 78933f54e0..4cdc81a248 100644 --- a/config/locales-glitch/en.yml +++ b/config/locales-glitch/en.yml @@ -31,6 +31,8 @@ en: enable_keybase: desc_html: Allow your users to prove their identity via keybase title: Enable keybase integration + flavour_and_skin: + title: Flavour and skin outgoing_spoilers: desc_html: When federating toots, add this content warning to toots that do not have one. It is useful if your server is specialized in content other servers might want to have under a Content Warning. Media will also be marked as sensitive. title: Content warning for outgoing toots