Complete refactor of Gemfile and upgraded gems (#2553)

This commit is contained in:
Ahmad Farhat
2021-02-26 17:34:07 -05:00
committed by GitHub
parent c5b00e89aa
commit 09ab074aaf
29 changed files with 327 additions and 376 deletions

View File

@ -75,13 +75,14 @@ module ApplicationHelper
end
def translated_role_name(role)
if role.name == "denied"
case role.name
when "denied"
I18n.t("roles.banned")
elsif role.name == "pending"
when "pending"
I18n.t("roles.pending")
elsif role.name == "admin"
when "admin"
I18n.t("roles.admin")
elsif role.name == "user"
when "user"
I18n.t("roles.user")
else
role.name

View File

@ -44,7 +44,7 @@ module UsersHelper
# Returns language selection options for user edit
def language_options
locales = I18n.available_locales
language_opts = [['<<<< ' + t("language_default") + ' >>>>', "default"]]
language_opts = [["<<<< #{t('language_default')} >>>>", "default"]]
locales.each do |locale|
language_mapping = I18n::Language::Mapping.language_mapping_list[locale.to_s.gsub("_", "-")]
language_opts.push([language_mapping["nativeName"], locale.to_s])