about summary refs log tree commit diff
path: root/app/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/admin/action_logs_helper.rb6
-rw-r--r--app/helpers/settings_helper.rb3
2 files changed, 7 insertions, 2 deletions
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'))
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': '繁體中文(臺灣)',