From 2b5a98126fd240a896855534bb4af7bd45f0adb4 Mon Sep 17 00:00:00 2001 From: Alix Rossi Date: Wed, 19 Jun 2019 17:30:08 +0200 Subject: [PATCH 1/2] Add label for admin theme selector (#11121) * Add simple_form default for admin theme selector * Revert "Add simple_form default for admin theme selector" This reverts commit 0b736f78a87d61075f9b9f774d8da80e1e897b47. * Add setting_theme label to admin theme selector --- app/views/admin/settings/edit.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admin/settings/edit.html.haml b/app/views/admin/settings/edit.html.haml index 1c2c00f109..a67e6a2c82 100644 --- a/app/views/admin/settings/edit.html.haml +++ b/app/views/admin/settings/edit.html.haml @@ -9,7 +9,7 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false + = f.input :theme, collection: Themes.instance.names, label: t('simple_form.labels.defaults.setting_theme'), label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false .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}") } From a83c65ecdffaa4a4af23f584de72137ba70e0ea2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Wed, 19 Jun 2019 18:25:06 +0200 Subject: [PATCH 2/2] Fix inconsistent interpolation in sk.yml (#11124) --- config/locales/sk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 70574dc866..3e12552763 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -301,7 +301,7 @@ sk: affected_accounts: few: "%{count} účtov v databázi ovplyvnených" many: "%{count} účtov v databázi ovplyvnených" - one: "%{count} účet v databázi ovplyvnený" + one: Jeden účet v databázi ovplyvnený other: "%{count} účty v databázi ovplyvnené" retroactive: silence: Zruš stíšenie všetkých momentálne utíšených účtov z tejto domény