about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/helpers/settings_helper.rb3
-rw-r--r--config/application.rb8
2 files changed, 9 insertions, 2 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index aa0a4d467..39eb4180e 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -36,11 +36,13 @@ module SettingsHelper
     ja: '日本語',
     ka: 'ქართული',
     kk: 'Қазақша',
+    kn: 'ಕನ್ನಡ',
     ko: '한국어',
     lt: 'Lietuvių',
     lv: 'Latviešu',
     mk: 'Македонски',
     ml: 'മലയാളം',
+    mr: 'मराठी',
     ms: 'Bahasa Melayu',
     nl: 'Nederlands',
     nn: 'Nynorsk',
@@ -63,6 +65,7 @@ module SettingsHelper
     th: 'ไทย',
     tr: 'Türkçe',
     uk: 'Українська',
+    ur: 'اُردُو',
     'zh-CN': '简体中文',
     'zh-HK': '繁體中文(香港)',
     'zh-TW': '繁體中文(臺灣)',
diff --git a/config/application.rb b/config/application.rb
index 9be41b1a7..6cd660ca2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -53,8 +53,8 @@ module Mastodon
       :el,
       :en,
       :eo,
-      :'es-AR',
       :es,
+      :'es-AR',
       :et,
       :eu,
       :fa,
@@ -73,10 +73,13 @@ module Mastodon
       :ja,
       :ka,
       :kk,
+      :kn,
       :ko,
       :lt,
       :lv,
       :mk,
+      :ml,
+      :mr,
       :ms,
       :nl,
       :nn,
@@ -90,14 +93,15 @@ module Mastodon
       :sk,
       :sl,
       :sq,
-      :'sr-Latn',
       :sr,
+      :'sr-Latn',
       :sv,
       :ta,
       :te,
       :th,
       :tr,
       :uk,
+      :ur,
       :'zh-CN',
       :'zh-HK',
       :'zh-TW',