From a2014830c2a015432702edc0c7a8adef6aaa531c Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Sun, 10 Nov 2019 23:05:15 +0100
Subject: Fix broken admin audit log in whitelist mode (#12303)

---
 app/helpers/admin/action_logs_helper.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'app/helpers')

diff --git a/app/helpers/admin/action_logs_helper.rb b/app/helpers/admin/action_logs_helper.rb
index 1daa60774..608a99dd5 100644
--- a/app/helpers/admin/action_logs_helper.rb
+++ b/app/helpers/admin/action_logs_helper.rb
@@ -44,6 +44,8 @@ module Admin::ActionLogsHelper
       'flag'
     when 'DomainBlock'
       'lock'
+    when 'DomainAllow'
+      'plus-circle'
     when 'EmailDomainBlock'
       'envelope'
     when 'Status'
@@ -86,7 +88,7 @@ module Admin::ActionLogsHelper
       record.shortcode
     when 'Report'
       link_to "##{record.id}", admin_report_path(record)
-    when 'DomainBlock', 'EmailDomainBlock'
+    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock'
       link_to record.domain, "https://#{record.domain}"
     when 'Status'
       link_to record.account.acct, ActivityPub::TagManager.instance.url_for(record)
@@ -99,7 +101,7 @@ module Admin::ActionLogsHelper
     case type
     when 'CustomEmoji'
       attributes['shortcode']
-    when 'DomainBlock', 'EmailDomainBlock'
+    when 'DomainBlock', 'DomainAllow', 'EmailDomainBlock'
       link_to attributes['domain'], "https://#{attributes['domain']}"
     when 'Status'
       tmp_status = Status.new(attributes.except('reblogs_count', 'favourites_count'))
-- 
cgit 


From 24ea938ce188729913ad4c8c0a33899f9c1e733d Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 13 Nov 2019 23:36:41 +0100
Subject: Add kn, mr, ur to available locales (#12379)

---
 app/helpers/settings_helper.rb | 3 +++
 config/application.rb          | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'app/helpers')

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',
-- 
cgit