diff --git a/app/helpers/attribute_fields_helper.rb b/app/helpers/attribute_fields_helper.rb index 8d2cbae..2771823 100644 --- a/app/helpers/attribute_fields_helper.rb +++ b/app/helpers/attribute_fields_helper.rb @@ -430,7 +430,7 @@ protected get_basic_field_name_base + "[value]" end - def label + def form_label label_tag(key,title,:class=>"control-label muted",:func => "field_label") end diff --git a/app/models/i18n_variable.rb b/app/models/i18n_variable.rb index ab9e83d..90660ac 100644 --- a/app/models/i18n_variable.rb +++ b/app/models/i18n_variable.rb @@ -18,7 +18,7 @@ class I18nVariable end def self.from_locale(locale) - I18nVariable.find_by(:key => locale)[I18n.locale] + I18nVariable.find_by(key: locale)[I18n.locale] end end diff --git a/config/routes.rb b/config/routes.rb index 1e0f679..dd8de08 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -39,8 +39,6 @@ Orbit::Application.routes.draw do locales = Site.first.in_use_locales rescue I18n.available_locales scope "(:locale)", locale: Regexp.new(locales.join("|")) do - - resources :member_profiles resources :users do collection do