summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-10-03 03:59:43 +0200
committerGitHub <noreply@github.com>2019-10-03 03:59:43 +0200
commitfb45f6d9119fc8d1f24cb44c5a60b65c8700014d (patch)
tree30e6b1c2bd6d0e79182ade5e7428cfae28d31181
parent1681319d111006007846257c549dc8656ece2e00 (diff)
Add br, es-AR, et, mk, nn to available locales (#12062)
-rw-r--r--app/helpers/settings_helper.rb15
-rw-r--r--config/application.rb11
2 files changed, 18 insertions, 8 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index ecc73baf579..aa0a4d4674c 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -2,11 +2,11 @@
module SettingsHelper
HUMAN_LOCALES = {
- en: 'English',
ar: 'العربية',
ast: 'Asturianu',
bg: 'Български',
bn: 'বাংলা',
+ br: 'Breton',
ca: 'Català',
co: 'Corsu',
cs: 'Čeština',
@@ -14,8 +14,11 @@ module SettingsHelper
da: 'Dansk',
de: 'Deutsch',
el: 'Ελληνικά',
+ en: 'English',
eo: 'Esperanto',
+ 'es-AR': 'Español (Argentina)',
es: 'Español',
+ et: 'Eesti',
eu: 'Euskara',
fa: 'فارسی',
fi: 'Suomi',
@@ -36,32 +39,34 @@ module SettingsHelper
ko: '한국어',
lt: 'Lietuvių',
lv: 'Latviešu',
+ mk: 'Македонски',
ml: 'മലയാളം',
ms: 'Bahasa Melayu',
nl: 'Nederlands',
+ nn: 'Nynorsk',
no: 'Norsk',
oc: 'Occitan',
pl: 'Polski',
- pt: 'Português',
- 'pt-PT': 'Português (Portugal)',
'pt-BR': 'Português (Brasil)',
+ 'pt-PT': 'Português (Portugal)',
+ pt: 'Português',
ro: 'Română',
ru: 'Русский',
sk: 'Slovenčina',
sl: 'Slovenščina',
sq: 'Shqip',
- sr: 'Српски',
'sr-Latn': 'Srpski (latinica)',
+ sr: 'Српски',
sv: 'Svenska',
ta: 'தமிழ்',
te: 'తెలుగు',
th: 'ไทย',
tr: 'Türkçe',
uk: 'Українська',
- zh: '中文',
'zh-CN': '简体中文',
'zh-HK': '繁體中文(香港)',
'zh-TW': '繁體中文(臺灣)',
+ zh: '中文',
}.freeze
def human_locale(locale)
diff --git a/config/application.rb b/config/application.rb
index 60f73f8bb6c..9be41b1a75c 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -39,11 +39,11 @@ module Mastodon
# All translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
config.i18n.available_locales = [
- :en,
:ar,
:ast,
:bg,
:bn,
+ :br,
:ca,
:co,
:cs,
@@ -51,8 +51,11 @@ module Mastodon
:da,
:de,
:el,
+ :en,
:eo,
+ :'es-AR',
:es,
+ :et,
:eu,
:fa,
:fi,
@@ -73,20 +76,22 @@ module Mastodon
:ko,
:lt,
:lv,
+ :mk,
:ms,
:nl,
+ :nn,
:no,
:oc,
:pl,
- :'pt-PT',
:'pt-BR',
+ :'pt-PT',
:ro,
:ru,
:sk,
:sl,
:sq,
- :sr,
:'sr-Latn',
+ :sr,
:sv,
:ta,
:te,