summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-09-02 22:31:53 +0200
committerGitHub <noreply@github.com>2018-09-02 22:31:53 +0200
commit14a300b4282356100d4ca2c0858ed49e5ee76932 (patch)
tree04d8edfa19b0da6326bd91f43cd55d9273bec7de
parent78b89e7a5d82f1cf038f96fcccc04ff70229ca39 (diff)
Enable ro and ta locales in Rails (#8583)
* Enable ro and ta locales in Rails * Add Tamil and Romanian to language dropdown
-rw-r--r--app/helpers/settings_helper.rb2
-rw-r--r--config/application.rb3
2 files changed, 5 insertions, 0 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index ae915abf686..fc03fcf8268 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -35,12 +35,14 @@ module SettingsHelper
pl: 'Polszczyzna',
pt: 'Português',
'pt-BR': 'Português do Brasil',
+ ro: 'Limba română',
ru: 'Русский',
sk: 'Slovenčina',
sl: 'Slovenščina',
sr: 'Српски',
'sr-Latn': 'Srpski (latinica)',
sv: 'Svenska',
+ ta: 'தமிழ்',
te: 'తెలుగు',
th: 'ภาษาไทย',
tr: 'Türkçe',
diff --git a/config/application.rb b/config/application.rb
index af023b0db6b..24f75d3a245 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -69,12 +69,14 @@ module Mastodon
:pl,
:pt,
:'pt-BR',
+ :ro,
:ru,
:sk,
:sl,
:sr,
:'sr-Latn',
:sv,
+ :ta,
:te,
:th,
:tr,
@@ -85,6 +87,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