From efec02f1538adc7f75ba9ca3716ea25b3f2ef4df Mon Sep 17 00:00:00 2001
From: nightpool <eg1290@gmail.com>
Date: Thu, 17 Aug 2017 17:20:50 -0400
Subject: use existing inflections instead of custom helper (#4624)
* use existing inflections instead of custom helper
* use ActiveSupport versions
---
app/helpers/account_helper.rb | 14 --------------
app/views/admin/accounts/_account.html.haml | 2 +-
app/views/admin/accounts/show.html.haml | 2 +-
3 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100644 app/helpers/account_helper.rb
(limited to 'app')
diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb
deleted file mode 100644
index 00d4fc657..000000000
--- a/app/helpers/account_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module AccountHelper
- def protocol_for_display(protocol)
- case protocol
- when 'activitypub'
- 'ActivityPub'
- when 'ostatus'
- 'OStatus'
- else
- protocol
- end
- end
-end
diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index a7fca6b3e..5265d77f6 100644
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -6,7 +6,7 @@
= link_to account.domain, admin_accounts_path(by_domain: account.domain)
%td.protocol
- unless account.local?
- = protocol_for_display(account.protocol)
+ = account.protocol.humanize
%td.confirmed
- if account.local?
- if account.user_confirmed?
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index f0e4e303c..18bcd5e8e 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -33,7 +33,7 @@
%td= link_to @account.url, @account.url
%tr
%th= t('admin.accounts.protocol')
- %td= protocol_for_display(@account.protocol)
+ %td= @account.protocol.humanize
- if @account.ostatus?
%tr
--
cgit