diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index dee1e52e2e276c..ee2454739cf660 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -26,6 +26,7 @@ .fields-group = ff.input :'web.advanced_layout', wrapper: :with_label, hint: false, label: I18n.t('simple_form.labels.defaults.setting_advanced_layout') + %h4= t 'appearance.animations_and_accessibility' .fields-group @@ -37,6 +38,8 @@ = ff.input :'web.disable_swiping', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_disable_swiping') = ff.input :'web.use_system_font', wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_system_font_ui') + %h4= t 'appearance.custom_emoji_and_emoji_reactions' + .fields-group = ff.input :'web.hide_recent_emojis', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_recent_emojis'), hint: false - if Setting.enable_emoji_reaction @@ -44,15 +47,21 @@ = ff.input :'web.show_emoji_reaction_on_timeline', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_emoji_reaction_on_timeline') = ff.input :'web.hide_emoji_reaction_unavailable_server', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_emoji_reaction_unavailable_server') + %h4= t 'appearance.saved_posts' + .fields-group = ff.input :'web.bookmark_category_needed', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_bookmark_category_needed'), hint: I18n.t('simple_form.hints.defaults.setting_bookmark_category_needed') = ff.input :'web.hide_favourite_menu', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_favourite_menu') + %h4= t 'appearance.quotes' + .fields-group = ff.input :'web.show_quote_in_home', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_quote_in_home'), hint: false = ff.input :'web.show_quote_in_public', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_show_quote_in_public'), hint: false = ff.input :'web.hide_blocking_quote', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_hide_blocking_quote'), hint: false + %h4= t 'appearance.timelines' + .fields-group = ff.input :'web.simple_timeline_menu', wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_simple_timeline_menu') diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml index 64a5789d732a0a..2d036fe7872a46 100644 --- a/app/views/settings/preferences/other/show.html.haml +++ b/app/views/settings/preferences/other/show.html.haml @@ -24,6 +24,8 @@ = ff.input :default_sensitive, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_default_sensitive'), hint: I18n.t('simple_form.hints.defaults.setting_default_sensitive') - if Setting.enable_emoji_reaction + %h4= t 'preferences.emoji_reaction_permitting' + .fields-row .fields-group.fields-row__column.fields-row__column-12 = ff.input :emoji_reaction_policy, kmyblue: true, collection: %w(allow outside_only followers_only following_only mutuals_only block), label_method: ->(item) { safe_join([t("simple_form.labels.defaults.setting_emoji_reaction_policy_items.#{item}")]) }, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', include_blank: false, wrapper: :with_label, label: I18n.t('simple_form.labels.defaults.setting_emoji_reaction_policy'), hint: false, warning_hint: I18n.t('simple_form.hints.defaults.setting_emoji_reaction_policy') diff --git a/app/views/settings/preferences/reaching/show.html.haml b/app/views/settings/preferences/reaching/show.html.haml index 8f0b68556e13a3..7c15aeaebd708e 100644 --- a/app/views/settings/preferences/reaching/show.html.haml +++ b/app/views/settings/preferences/reaching/show.html.haml @@ -1,5 +1,5 @@ - content_for :page_title do - = t('settings.preferences') + = t('preferences.reaching') - content_for :heading_actions do = button_tag t('generic.save_changes'), class: 'button', form: 'edit_preferences' diff --git a/config/locales/en.yml b/config/locales/en.yml index 9eff37d884219e..71ba46027e7c7d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1198,12 +1198,16 @@ en: advanced_web_interface_hint: 'If you want to make use of your entire screen width, the advanced web interface allows you to configure many different columns to see as much information at the same time as you want: Home, notifications, federated timeline, any number of lists and hashtags.' animations_and_accessibility: Animations and accessibility confirmation_dialogs: Confirmation dialogs + custom_emoji_and_emoji_reactions: Custom emoji and stamps discovery: Discovery localization: body: Mastodon is translated by volunteers. guide_link: https://crowdin.com/project/mastodon guide_link_text: Everyone can contribute. + quotes: Quotes + saved_posts: Saving posts sensitive_content: Sensitive content + timelines: Timelines application_mailer: notification_preferences: Change e-mail preferences salutation: "%{name}," @@ -1721,6 +1725,7 @@ en: preferences: dtl: Deep timeline dtl_hint: "You can join deep timeline with #%{tag} tag. Following settings make convenient to use deep timeline." + emoji_reaction_permitting: Receiving stamps other: Other posting_defaults: Posting defaults public_timelines: Public timelines diff --git a/config/locales/ja.yml b/config/locales/ja.yml index d9f83de879abbf..3767089c4986d8 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1193,12 +1193,16 @@ ja: advanced_web_interface_hint: 'ディスプレイを幅いっぱいまで活用したい場合、上級者向け UI をおすすめします。ホーム、通知、連合タイムライン、更にはリストやハッシュタグなど、様々な異なるカラムから望む限りの情報を一度に受け取れるような設定が可能になります。' animations_and_accessibility: アニメーションとアクセシビリティー confirmation_dialogs: 確認ダイアログ + custom_emoji_and_emoji_reactions: カスタム絵文字とスタンプ discovery: 見つける localization: body: Mastodonは有志によって翻訳されています。 guide_link: https://ja.crowdin.com/project/mastodon guide_link_text: 誰でも参加することができます。 + quotes: 引用 + saved_posts: 投稿の記録 sensitive_content: 閲覧注意コンテンツ + timelines: タイムライン application_mailer: notification_preferences: メール設定の変更 salutation: "%{name}さん" @@ -1707,6 +1711,7 @@ ja: preferences: dtl: ディープタイムライン dtl_hint: "#%{tag} ハッシュタグに参加することで、ディープタイムラインに投稿できます。ここではディープタイムラインを利用しやすくするための設定ができます。" + emoji_reaction_permitting: スタンプの受け入れ other: その他 posting_defaults: デフォルトの投稿設定 public_timelines: 公開タイムライン