diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-05-10 15:15:39 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-05-10 16:19:56 +0200 |
| commit | 4a70792b4a8393a0cfd83a7e70f72179899111fa (patch) | |
| tree | d340885b5dfb0f990c81b1a29f529a258c49d591 /app/helpers/settings_helper.rb | |
| parent | c6ff4c634caf718adf7280e04909c091d15add1d (diff) | |
| parent | 4b766f984689311523b89e1b68d2a11dff3fc396 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Not a real conflict, just a glitch-soc-only dependency too close to a dependency that got updated upstream. Updated as well. - `app/models/status.rb`: Not a real conflict, just a change too close to glitch-soc-changed code for optionally showing boosts in public timelines. Applied upstream changes. - `app/views/layouts/application.html.haml`: Upstream a new, static CSS file, conflict due to glitch-soc's theming system, include the file regardless of the theme. - `config/initializers/content_security_policy.rb`: Upstream dropped 'unsafe-inline' from the 'style-src' directive, but both files are very different. Removed 'unsafe-inline' as well.
Diffstat (limited to 'app/helpers/settings_helper.rb')
| -rw-r--r-- | app/helpers/settings_helper.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 74544bad9..87718dc05 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -68,6 +68,7 @@ module SettingsHelper tr: 'Türkçe', uk: 'Українська', ur: 'اُردُو', + vi: 'Tiếng Việt', 'zh-CN': '简体中文', 'zh-HK': '繁體中文（香港）', 'zh-TW': '繁體中文（臺灣）', |