Merge branch 'develop'

2 files changed, 30 insertions, 22 deletions

diff --git a/app/views/config_snom/show.xml.haml b/app/views/config_snom/show.xml.haml
index 3d0edf1..22df8bc 100644
--- a/app/views/config_snom/show.xml.haml
+++ b/app/views/config_snom/show.xml.haml
@@ -36,6 +36,7 @@
     %ringer_animation{:perm => 'RW'}= 'on'
     %display_method{:perm => 'RW'}= 'display_name_number'
     %callpickup_dialoginfo{:perm => 'RW'}= 'on'
+    %pickup_indication{:perm => 'RW'}= 'off'
     %show_local_line{:perm => 'RW'}= 'off'
     %mwi_notification{:perm => 'RW'}= 'silent'
     %mwi_dialtone{:perm => 'RW'}= 'normal'
@@ -128,7 +129,7 @@
     != "\<!-- sip accounts: #{@sip_accounts.count} --\>"
     - @sip_accounts.each_with_index do |sip_account, array_index|
       - index = array_index + 1 
-      != "\<!-- sip account #{array_index}: #{sip_account[:idle_text]}, #{sip_account[:active]} --\>"
+      != "\<!-- sip account #{array_index}: #{sip_account[:user_idle_text]}, #{sip_account[:active]} --\>"
       %user_active{:idx => index, :perm => 'R'}= sip_account[:active]
       %user_pname{:idx => index, :perm => 'R'}= sip_account[:pname]
       %user_pass{:idx => index, :perm => 'R'}= sip_account[:pass]
@@ -136,7 +137,7 @@
       %user_outbound{:idx => index, :perm => 'R'}= sip_account[:outbound]
       %user_name{:idx => index, :perm => 'R'}= sip_account[:name]
       %user_realname{:idx => index, :perm => 'R'}= sip_account[:realname]
-      %user_idle_text{:idx => index, :perm => 'R'}= sip_account[:idle_text]
+      %user_idle_text{:idx => index, :perm => 'R'}= sip_account[:user_idle_text]
       %user_mailbox{:idx => index, :perm => 'R'}= sip_account[:mailbox]
       %user_expiry{:idx => index, :perm => 'R'}= sip_account[:expiry]
       %user_server_type{:idx => index, :perm => 'R'}= 'default'
diff --git a/app/views/config_snom/state_settings.xml.haml b/app/views/config_snom/state_settings.xml.haml
index 6be1efc..8bb5239 100644
--- a/app/views/config_snom/state_settings.xml.haml
+++ b/app/views/config_snom/state_settings.xml.haml
@@ -1,49 +1,56 @@
 !!! XML
 %SnomIPPhoneMenu{:state => 'relevant', :title => "Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}"}
-  %MenuItem{:name => '$(lang:menu100_phone_book)'}
+  %MenuItem{:name => t('config_snom.main_menu.phone_book')}
     %URL= "#{@base_url}/#{@sip_account_ids.first}/phone_book.xml"
-  %Menu{:name => '$(lang:menu100_call_lists)'}
-    %MenuItem{:name => '$(lang:list_missed)'}
+  %Menu{:name => t('config_snom.main_menu.call_history')}
+    %MenuItem{:name => t('config_snom.call_history.missed')}
       - @sip_account_ids.each_with_index do |id, index|
         %If{:condition => "$(current_line)==#{index+1}"}
           %URL= "#{@base_url}/#{id}/call_history_missed.xml"
-    %MenuItem{:name => '$(lang:list_taken)'}
+    %MenuItem{:name => t('config_snom.call_history.received')}
       - @sip_account_ids.each_with_index do |id, index|
         %If{:condition => "$(current_line)==#{index+1}"}
           %URL= "#{@base_url}/#{id}/call_history_received.xml"
-    %MenuItem{:name => '$(lang:list_dialed)'}
+    %MenuItem{:name => t('config_snom.call_history.dialed')}
       - @sip_account_ids.each_with_index do |id, index|
         %If{:condition => "$(current_line)==#{index+1}"}
           %URL= "#{@base_url}/#{id}/call_history_dialed.xml"
-  %MenuItem{:name => '$(lang:sel100_activeline)'}
+    %MenuItem{:name => t('config_snom.call_history.forwarded')}
+      - @sip_account_ids.each_with_index do |id, index|
+        %If{:condition => "$(current_line)==#{index+1}"}
+          %URL= "#{@base_url}/#{id}/call_history_forwarded.xml"
+
+  %MenuItem{:name => t('config_snom.main_menu.voicemail')}
+    %URL= "#{@base_url}/#{@sip_account_ids.first}/voicemail.xml"
+  %MenuItem{:name => t('config_snom.main_menu.sip_account')}
     %Action= 'active_line'
     
   - if @enable_login
-    %MenuItem{:name => 'Log in'}
+    %MenuItem{:name => t('config_snom.main_menu.log_in')}
       %URL= "#{@base_url}/log_in.xml"
   - if @enable_logout
-    %MenuItem{:name => 'Log out'}
+    %MenuItem{:name => t('config_snom.main_menu.log_out')}
       %URL= "#{@base_url}/log_out.xml"
 
-  %Menu{:name => '$(lang:preferences_settings)'}
-    %MenuItem{:name => '$(lang:menu_gen_contrast)'}
+  %Menu{:name => t('config_snom.main_menu.preferences')}
+    %MenuItem{:name => t('config_snom.preferences.contrast')}
       %Action= 'contrast'
-    %MenuItem{:name => '$(lang:use_backlight)'}
+    %MenuItem{:name => t('config_snom.preferences.use_backlight')}
       %Action= 'use_backlight'
-    %MenuItem{:name => '$(lang:use_backlight) $(lang:backlight_when_active)'}
+    %MenuItem{:name => t('config_snom.preferences.backlight_active')}
       %Action= 'backlight_active'
-    %MenuItem{:name => '$(lang:use_backlight) $(lang:backlight_when_idle)'}
+    %MenuItem{:name => t('config_snom.preferences.backlight_idle')}
       %Action= 'backlight_idle'
-    %MenuItem{:name => '$(lang:menu_equalizer)'}
+    %MenuItem{:name => t('config_snom.preferences.equalizer')}
       %Action= 'equalizer'
-  %Menu{:name => '$(lang:maintenance_settings)'}
-    %MenuItem{:name => '$(lang:system_information_menu)'}
+  %Menu{:name => t('config_snom.main_menu.maintenance')}
+    %MenuItem{:name => t('config_snom.maintenance.system_info')}
       %Action= 'sysinfo'
-    %MenuItem{:name => '$(lang:sel100_reboot)'}
+    %MenuItem{:name => t('config_snom.maintenance.reboot')}
       %Action= 'reboot'
     %If{:condition => '$(set:admin_mode)'}
-      %MenuItem{:name => '$(lang:reset_settings)'}
+      %MenuItem{:name => t('config_snom.maintenance.reset_settings')}
         %Action= 'reset_settings'
     %If{:condition => '$(update_available)'}
-      %MenuItem{:name => '$(lang:update_header)'}
-        %Action= 'software_update'
\ No newline at end of file
+      %MenuItem{:name => t('config_snom.maintenance.software_update')}
+        %Action= 'software_update'