From 9045b821f35a329bb13501942162697229dbda0c Mon Sep 17 00:00:00 2001 From: Peter Kozak Date: Wed, 31 Jul 2013 08:50:24 +0200 Subject: set language code --- app/controllers/config_snom_controller.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/controllers/config_snom_controller.rb b/app/controllers/config_snom_controller.rb index f669b8e..da2f8c0 100644 --- a/app/controllers/config_snom_controller.rb +++ b/app/controllers/config_snom_controller.rb @@ -1577,12 +1577,8 @@ AAAA' if sip_account && !sip_account.language_code.blank? I18n.locale = sip_account.language_code @locale = sip_account.language_code - elsif @phone.phoneable - if @phone.phoneable_type == 'Tenant' - I18n.locale = tenant.language.code - elsif @phone.phoneable_type == 'User' - I18n.locale = @phone.phoneable.language.code - end + elsif @phone.phoneable && @phone.phoneable.respond_to?('language') && @phone.phoneable.language + I18n.locale = @phone.phoneable.language.code end end end -- cgit v1.2.3