diff --git a/app/views/settings/preferences/reaching/show.html.haml b/app/views/settings/preferences/reaching/show.html.haml index a2053da7cc..845278f1d7 100644 --- a/app/views/settings/preferences/reaching/show.html.haml +++ b/app/views/settings/preferences/reaching/show.html.haml @@ -44,6 +44,9 @@ %h4= t 'preferences.searchability' + - unless Chewy.enabled? + %p.hint= t 'preferences.does_not_search' + .fields-row .fields-group.fields-row__column.fields-row__column-12 = ff.input :default_searchability, @@ -59,24 +62,26 @@ .fields-group = ff.input :disallow_unlisted_public_searchability, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_disallow_unlisted_public_searchability'), hint: I18n.t('simple_form.hints.defaults.setting_disallow_unlisted_public_searchability') - %h4= t 'preferences.search' + - if Chewy.enabled? + %h4= t 'preferences.search' - .fields-row - .fields-group.fields-row__column.fields-row__column-12 - = ff.input :default_searchability_of_search, - collection: Status.selectable_searchabilities_for_search, - hint: false, - include_blank: false, - kmyblue: true, - label: I18n.t('simple_form.labels.defaults.setting_default_searchability_of_search'), - label_method: ->(searchability) { safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_search_long")], ' - ') }, - required: false, - wrapper: :with_label - .fields-group - = ff.input :reverse_search_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_reverse_search_quote'), hint: I18n.t('simple_form.hints.defaults.setting_reverse_search_quote') + .fields-row + .fields-group.fields-row__column.fields-row__column-12 + = ff.input :default_searchability_of_search, + collection: Status.selectable_searchabilities_for_search, + hint: false, + include_blank: false, + kmyblue: true, + label: I18n.t('simple_form.labels.defaults.setting_default_searchability_of_search'), + label_method: ->(searchability) { safe_join([I18n.t("statuses.searchabilities.#{searchability}"), I18n.t("statuses.searchabilities.#{searchability}_search_long")], ' - ') }, + required: false, + wrapper: :with_label - .fields-group - = ff.input :use_public_index, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_use_public_index') + .fields-group + = ff.input :reverse_search_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_reverse_search_quote'), hint: I18n.t('simple_form.hints.defaults.setting_reverse_search_quote') + + .fields-group + = ff.input :use_public_index, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_use_public_index') .actions = f.button :button, t('generic.save_changes'), type: :submit diff --git a/config/locales/en.yml b/config/locales/en.yml index 798afeea6e..9daad29de6 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1721,6 +1721,7 @@ en: too_few_options: must have more than one item too_many_options: can't contain more than %{max} items preferences: + does_not_search: The full-text search feature is not available on this server. Instead, your posts will be searched according to this setting on other kmyblue servers. 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 diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 234334065b..34048a33db 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1700,6 +1700,7 @@ ja: too_few_options: は複数必要です too_many_options: は%{max}個までです preferences: + does_not_search: このサーバーでは全文検索機能を利用できません。代わりに、他のkmyblueサーバーであなたの投稿がこの設定に従って検索されます。 dtl: ディープタイムライン dtl_hint: "#%{tag} ハッシュタグに参加することで、ディープタイムラインに投稿できます。ここではディープタイムラインを利用しやすくするための設定ができます。" emoji_reaction_permitting: スタンプの受け入れ