diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-03 14:33:06 +0200 |
commit | 6c233a04a04f674b1be75ce7c6c4547c7a006797 (patch) | |
tree | 24b32d52e098fac57e91fd26be1311b7b677c9c9 /config/application.rb | |
parent | e915bc3e9e32e34bf80d1bd66ee3f80d2ca37969 (diff) | |
parent | ccc2f608c5c1caac2ea4796f4490f29d59d67068 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: README.md Discarded upstream changes to the README, kept our version.
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 02def1ce5..151b1d0b4 100644 --- a/config/application.rb +++ b/config/application.rb @@ -70,12 +70,14 @@ module Mastodon :pl, :pt, :'pt-BR', + :ro, :ru, :sk, :sl, :sr, :'sr-Latn', :sv, + :ta, :te, :th, :tr, @@ -86,6 +88,7 @@ module Mastodon ] config.i18n.default_locale = ENV['DEFAULT_LOCALE']&.to_sym + unless config.i18n.available_locales.include?(config.i18n.default_locale) config.i18n.default_locale = :en end |