about summary refs log tree commit diff
path: root/app/views
diff options
context:
space:
mode:
authornightpool <eg1290@gmail.com>2017-08-17 17:20:50 -0400
committerEugen Rochko <eugen@zeonfederated.com>2017-08-17 23:20:50 +0200
commitefec02f1538adc7f75ba9ca3716ea25b3f2ef4df (patch)
treec6b98bc3d0cfca8e225f796a2f8b22e70d13d3fa /app/views
parent116b8a63633cfdff83582f1cc40559c2e3c2ae80 (diff)
use existing inflections instead of custom helper (#4624)
* use existing inflections instead of custom helper

* use ActiveSupport versions
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/accounts/_account.html.haml2
-rw-r--r--app/views/admin/accounts/show.html.haml2
2 files changed, 2 insertions, 2 deletions
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