Add: Desc to disable Timeline

.env.docker

@@ -281,7 +281,13 @@ MAX_REMOTE_EMOJI_SIZE=204800
 # HCAPTCHA_SECRET_KEY=
 # HCAPTCHA_SITE_KEY=
 
-# Whether Disable Public Timeline Streaming (Require Restart mastodon-streaming after change)
+# Whether Disable Public Timeline Streaming
+# Require Restart mastodon-streaming after change
+# This disable Both Local Timeline / Federated Timeline Streaming
+# Adminstrators and Moderators will always have access to all timelines,
+# even if they are not enabled.
+# If you want to disable non-streaming access to Public timelines,
+# you need to change the value at Preferences.
 # DISABLE_PUBLIC_TIMELINE_STREAMING=true
 
 # Max Follow count

.env.production.sample

@@ -292,7 +292,13 @@ MAX_REMOTE_EMOJI_SIZE=204800
 # HCAPTCHA_SECRET_KEY=
 # HCAPTCHA_SITE_KEY=
 
-# Whether Disable Public Timeline Streaming (Require Restart mastodon-streaming after change)
+# Whether Disable Public Timeline Streaming
+# Require Restart mastodon-streaming after change
+# This disable Both Local Timeline / Federated Timeline Streaming
+# Adminstrators and Moderators will always have access to all timelines,
+# even if they are not enabled.
+# If you want to disable non-streaming access to Public timelines,
+# you need to change the value at Preferences.
 # DISABLE_PUBLIC_TIMELINE_STREAMING=true
 
 # Max Follow count

app/views/admin/settings/edit.html.haml

@@ -108,10 +108,10 @@
     = f.input :show_replies_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_replies_in_public_timelines.title'), hint: t('admin.settings.show_replies_in_public_timelines.desc_html'), glitch_features: true
 
   .fields-group
-    = f.input :disable_local_timeline, as: :boolean, wrapper: :with_label, label: t('admin.settings.disable_local_timeline.title'), atsu1125_features: true
+    = f.input :disable_local_timeline, as: :boolean, wrapper: :with_label, label: t('admin.settings.disable_local_timeline.title'), hint: t('admin.settings.disable_local_timeline.desc_html'), atsu1125_features: true
 
   .fields-group
-    = f.input :disable_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.disable_public_timelines.title'), atsu1125_features: true
+    = f.input :disable_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.disable_public_timelines.title'), hint: t('admin.settings.disable_public_timelines.desc_html'), atsu1125_features: true
 
   %hr.spacer/
 

config/locales-glitch/en.yml

@@ -6,8 +6,10 @@ en:
         desc_html: This relies on external scripts from hCaptcha, which may be a security and privacy concern. In addition, <strong>this can make the registration process significantly less accessible to some (especially disabled) people</strong>. For these reasons, please consider alternative measures such as approval-based or invite-based registration.<br>Users that have been invited through a limited-use invite will not need to solve a CAPTCHA
         title: Require new users to solve a CAPTCHA to confirm their account
       disable_local_timeline:
+        desc_html: Disbale Local Timeline. Adminstrators and Moderators will always have access to all timelines, even if they are not enabled. Streaming Access will not be disabled. You need to change value at .env.production if you want to disable Streaming.
         title: Disable Local timeline
       disable_public_timelines:
+        desc_html: Disable Public Timelines. Adminstrators and Moderators will always have access to all timelines, even if they are not enabled. Streaming Access will not be disabled. You need to change value at .env.production if you want to disable Streaming.
         title: Disable Public timelines
       enable_keybase:
         desc_html: Allow your users to prove their identity via keybase

config/locales-glitch/ja.yml

@@ -2,10 +2,12 @@
 ja:
   admin:
     settings:
-      disable_public_timelines:
-        title: 公開タイムラインを無効化する
       disable_local_timeline:
+        desc_html: ローカルタイムラインを無効にします。これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。ストリーミングは無効化されないため必要であれば.env.productionに設定する必要があります。
         title: ローカルタイムラインを無効化する
+      disable_public_timelines:
+        desc_html: 公開タイムラインを無効にします。これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。ストリーミングは無効化されないため必要であれば.env.productionに設定する必要があります。
+        title: 公開タイムラインを無効化する
       enable_keybase:
         desc_html: Keybaseにより身元の証明が可能となります
         title: Keybase統合を有効にする