diff options
| -rw-r--r-- | app/views/filters/_fields.html.haml | 4 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/app/views/filters/_fields.html.haml b/app/views/filters/_fields.html.haml index a02b04e51..3df611596 100644 --- a/app/views/filters/_fields.html.haml +++ b/app/views/filters/_fields.html.haml @@ -1,5 +1,7 @@ .fields-row .fields-row__column.fields-row__column-6.fields-group - = f.input :phrase, as: :string, wrapper: :with_label, hint: false + = f.input :phrase, as: :string, wrapper: :with_label + %p.hint{ style: 'margin-bottom: 25px' }= t('simple_form.hints.defaults.phrase_html') + .fields-row__column.fields-row__column-6.fields-group = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 6e9118535..cf9c1b073 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -26,7 +26,6 @@ en: locale: The language of the creature interface, e-mails and push notifications locked: Requires you to manually approve packmates password: Use at least 8 characters - phrase: Will be matched regardless of casing in text or content warning of a roar scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. setting_advanced_layout: The advanced UI consists of multiple customizable columns setting_aggregate_reblogs: Do not show new repeats for roars that have been recently repeated (only affects newly-received repeats) @@ -46,7 +45,7 @@ en: setting_skin: Reskins the selected Mastodon flavour setting_theme: Affects how Mastodon looks when you're logged in from any device. username: Your username will be unique on %{domain} - whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word + phrase_html: "<code>"thing"</code> - match whole words<br/><code>tags: "thing"</code> - match tags</code><br/><code>subj: thing</code> - match subject or CW</code><br/><code>text: thing</code> - match text<br/><code>desc: thing</code> - match media descriptions" featured_tag: name: 'You might want to use one of these:' imports: @@ -114,7 +113,7 @@ en: note: Bio otp_attempt: Two-factor code password: Password - phrase: Keyword or phrase + phrase: Regular expression setting_advanced_layout: Enable advanced web interface setting_aggregate_reblogs: Group repeats in timelines setting_auto_play_gif: Auto-play animated GIFs |