diff options
| author | Reverite <github@reverite.sh> | 2019-08-13 15:45:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-08-13 15:45:40 -0700 |
| commit | 2e221bd5b6472d1eecb654b3518af7886d3dadaf (patch) | |
| tree | afb9e3a86ba3a93b6b5f04cdec6070351992fed4 /config | |
| parent | 9528d3eda280ffac20a18c6f21bfc51f594e2c86 (diff) | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 5fc166f4c..79b8e02bd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -641,6 +641,8 @@ en: people: one: "%{count} person" other: "%{count} people" + domain_validator: + invalid_domain: is not a valid domain name errors: '403': You don't have permission to view this page. '404': The page you are looking for isn't here. diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 5da0cc45d..8f63df013 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -124,6 +124,7 @@ en: setting_reduce_motion: Reduce motion in animations setting_show_application: Disclose application used to send toots setting_skin: Skin + setting_system_emoji_font: Use system's default font for emojis (applies to Glitch flavour only) setting_system_font_ui: Use system's default font setting_theme: Site theme setting_trends: Show today's trends diff --git a/config/settings.yml b/config/settings.yml index 10836db3f..70a9a3a44 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -29,6 +29,7 @@ defaults: &defaults reduce_motion: false show_application: false system_font_ui: false + system_emoji_font: false noindex: false hide_followers_count: false enable_keybase: true |