Reorganize preferences page (#5161)

diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index 0526f174c6f8a81e1034751d338b2912ba3f55cc..d241c9d26b4750af62060477e44e12524487a435 100644 (file)
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -22,6 +22,16 @@ code {
     margin-top: 4px;
   }
 
+  h4 {
+    text-transform: uppercase;
+    font-size: 13px;
+    font-weight: 500;
+    color: $ui-primary-color;
+    padding-bottom: 8px;
+    margin-bottom: 8px;
+    border-bottom: 1px solid lighten($ui-base-color, 8%);
+  }
+
   p.hint {
     margin-bottom: 15px;
     color: $ui-primary-color;
@@ -316,6 +326,7 @@ code {
 
   select {
     font-size: 16px;
+    max-height: 29px;
   }
 
   .input-with-append {

diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml
index 5efd538e4e8f3164b9e050627fd2d03beae0f484..ffb1bbf6ac09310bef6cc7582d4effc084b5c06f 100644 (file)
--- a/app/views/settings/preferences/show.html.haml
+++ b/app/views/settings/preferences/show.html.haml
@@ -4,30 +4,22 @@
 = simple_form_for current_user, url: settings_preferences_path, html: { method: :put } do |f|
   = render 'shared/error_messages', object: current_user
 
+  %h4= t 'preferences.languages'
+
   .fields-group
-    = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| safe_join([I18n.t("themes.#{theme}", default: theme)])}, wrapper: :with_label, include_blank: false
-
-    = f.input :locale,
-      collection: I18n.available_locales,
-      wrapper: :with_label,
-      include_blank: false,
-      label_method: lambda { |locale| human_locale(locale) },
-      selected: I18n.locale
-
-    = f.input :filtered_languages,
-      collection: filterable_languages,
-      wrapper: :with_block_label,
-      include_blank: false,
-      label_method: lambda { |locale| human_locale(locale) },
-      required: false,
-      as: :check_boxes,
-      collection_wrapper_tag: 'ul',
-      item_wrapper_tag: 'li'
+    = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale
+
+    = f.input :filtered_languages, collection: filterable_languages, wrapper: :with_block_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, required: false, as: :check_boxes, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
+
+  %h4= t 'preferences.publishing'
 
+  .fields-group
     = f.input :setting_default_privacy, collection: Status.visibilities.keys - ['direct'], wrapper: :with_label, include_blank: false, label_method: lambda { |visibility| safe_join([I18n.t("statuses.visibilities.#{visibility}"), content_tag(:span, I18n.t("statuses.visibilities.#{visibility}_long"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
 
     = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
 
+  %h4= t 'preferences.notifications'
+
   .fields-group
     = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
       = ff.input :follow, as: :boolean, wrapper: :with_label
@@ -35,6 +27,9 @@
       = ff.input :reblog, as: :boolean, wrapper: :with_label
       = ff.input :favourite, as: :boolean, wrapper: :with_label
       = ff.input :mention, as: :boolean, wrapper: :with_label
+
+  .fields-group
+    = f.simple_fields_for :notification_emails, hash_to_object(current_user.settings.notification_emails) do |ff|
       = ff.input :digest, as: :boolean, wrapper: :with_label
 
   .fields-group
@@ -42,10 +37,17 @@
       = ff.input :must_be_follower, as: :boolean, wrapper: :with_label
       = ff.input :must_be_following, as: :boolean, wrapper: :with_label
 
+  %h4= t 'preferences.other'
+
   .fields-group
     = f.input :setting_noindex, as: :boolean, wrapper: :with_label
 
+  %h4= t 'preferences.web'
+
   .fields-group
+    - if Themes.instance.names.size > 1
+      = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false
+
     = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_boost_modal, as: :boolean, wrapper: :with_label
     = f.input :setting_delete_modal, as: :boolean, wrapper: :with_label

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 06a535ba62681387fabcc5d326f08bc67837cdfd..1192a7b102089b796ce3b7605dcdba37518dc1d4 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -388,7 +388,6 @@ de:
       private_long: Nur für Folgende sichtbar
       public: Öffentlich
       public_long: Für alle sichtbar
-      unlisted: Nicht gelistet
       unlisted: Für alle sichtbar, aber nicht in öffentlichen Zeitleisten aufgelistet
   stream_entries:
     click_to_show: Klicken, um zu zeigen

diff --git a/config/locales/devise.de.yml b/config/locales/devise.de.yml
index b1e26f1e50395c606874d6eaae984c6f3182c00a..0db946b9fb8f5fbdd451dc2dd68c32f600554b8b 100644 (file)
--- a/config/locales/devise.de.yml
+++ b/config/locales/devise.de.yml
@@ -8,10 +8,10 @@ de:
     failure:
       already_authenticated: Du bist bereits angemeldet.
       inactive: Dein Konto wurde noch nicht aktiviert.
-      invalid: '%{authentication_keys} oder Passwort ungültig.'
+      invalid: "%{authentication_keys} oder Passwort ungültig."
       last_attempt: Du hast noch einen Versuch, bevor dein Konto gesperrt wird.
       locked: Dein Konto ist gesperrt.
-      not_found_in_database: '%{authentication_keys} oder Passwort ungültig.'
+      not_found_in_database: "%{authentication_keys} oder Passwort ungültig."
       timeout: Deine Sitzung ist abgelaufen. Bitte melde dich erneut an.
       unauthenticated: Du musst dich anmelden oder registrieren, bevor du fortfahren kannst.
       unconfirmed: Du musst deine E-Mail-Adresse bestätigen, bevor du fortfahren kannst.

diff --git a/config/locales/en.yml b/config/locales/en.yml
index f87d8532c551cb90e8f80e0b3f2bac4ad75c5029..3049e0365b039ed254bb2d2a32a31b858be79779 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -393,6 +393,12 @@ en:
     next: Next
     prev: Prev
     truncate: "…"
+  preferences:
+    languages: Languages
+    notifications: Notifications
+    other: Other
+    publishing: Publishing
+    web: Web
   push_notifications:
     favourite:
       title: "%{name} favourited your status"

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 2ccc827dad62cf9e4156aed3855ac333620df7db..364bfcfd6c623a6faebaeb708f3313274d574e21 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -247,7 +247,7 @@ ja:
     salutation: "%{name} さん"
     settings: 'メール設定の変更: %{link}'
     signature: Mastodon %{instance} インスタンスからの通知
-    view: 'リンク'
+    view: リンク
   applications:
     created: アプリが作成されました
     destroyed: アプリが削除されました

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 406de36f0f7dbca7a1f12beafbc893fe92ff1b64..3100e6265fae2ad0248e0f76752d4fabc8281d39 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -93,8 +93,8 @@ oc:
       reset_password: Reïnicializar lo senhal
       resubscribe: Se tornar abonar
       salmon_url: URL Salmon
-      shared_inbox_url: URL de recepcion partejada
       search: Cercar
+      shared_inbox_url: URL de recepcion partejada
       show:
         created_reports: Rapòrts creat per aqueste compte
         report: rapòrt

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 9bf57e38b002fa8c0189a792b688010344ec09aa..f528831230b344b974577db399a8e8147ad24345 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -62,7 +62,7 @@ pl:
       followers: Śledzący
       followers_url: Adres śledzących
       follows: Śledzeni
-      inbox: Adres skrzynki
+      inbox_url: Adres skrzynki
       ip: Adres IP
       location:
         all: Wszystkie

diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 6f8b88898f2eab87a7a3a4d993c71dd63ea9b303..86c80290ce7dfd54148d5df04c6ba9e54cab8b62 100644 (file)
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -4,6 +4,7 @@ en:
     hints:
       defaults:
         avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 120x120px
+        digest: Sent after a long period of inactivity with a summary of mentions you've received in your absence
         display_name:
           one: <span class="name-counter">1</span> character left
           other: <span class="name-counter">%{count}</span> characters left
@@ -19,7 +20,7 @@ en:
       sessions:
         otp: Enter the Two-factor code from your phone or use one of your recovery codes.
       user:
-        filtered_languages: Selected languages will be removed from your public timelines.
+        filtered_languages: Checked languages will be filtered from public timelines for you
     labels:
       defaults:
         avatar: Avatar
@@ -44,7 +45,7 @@ en:
         setting_delete_modal: Show confirmation dialog before deleting a toot
         setting_noindex: Opt-out of search engine indexing
         setting_system_font_ui: Use system's default font
-        setting_theme: Site theme 
+        setting_theme: Site theme
         setting_unfollow_modal: Show confirmation dialog before unfollowing someone
         severity: Severity
         type: Import type