diff options
| author | Reverite <github@reverite.sh> | 2019-06-27 21:10:01 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-27 21:10:01 -0700 |
| commit | 9861df046853b71370cede86afbba1a371714756 (patch) | |
| tree | 38416f38dfc2a2349b7a5df20646bb7d0f51361f /config | |
| parent | 2d396aa3a0bf2674194b9f4c0e0a1052b8d23a06 (diff) | |
| parent | ca17bae904783dfb1f4899a533d28a79da0c6fe9 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index e5e12c05a..b35b9b6ec 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -39,6 +39,7 @@ en: setting_noindex: Affects your public profile and status pages setting_show_application: The application you use to toot will be displayed in the detailed view of your toots setting_skin: Reskins the selected Mastodon flavour + setting_use_blurhash: Gradients are based on the colors of the hidden visuals but obfuscate any details 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 featured_tag: @@ -120,6 +121,7 @@ en: setting_skin: Skin setting_system_font_ui: Use system's default font setting_unfollow_modal: Show confirmation dialog before unfollowing someone + setting_use_blurhash: Show colorful gradients for hidden media severity: Severity type: Import type username: Username diff --git a/config/settings.yml b/config/settings.yml index 97da9883e..07e24f8e2 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -36,6 +36,7 @@ defaults: &defaults skin: 'default' aggregate_reblogs: true advanced_layout: false + use_blurhash: true notification_emails: follow: false reblog: false |