diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-12 15:31:20 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2019-08-12 23:01:37 +0200 |
| commit | 597ea5687a3601c6cc462831bf570bae05b08240 (patch) | |
| tree | b95cc1a5d557e80b1f59c0aa72851fbc19649468 /config | |
| parent | cf421bafdf644f8c8a44b4f06f82841cbd568cdf (diff) | |
Add option to disable emoji replacements
Fixes #647 The option is found in `/settings` (because that was easier to write it this way) but only affects the glitch-soc front-end.
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 1 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 2 insertions, 0 deletions
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 |