summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-02-14 10:42:26 +0100
committerspag <spag@golwen.net>2013-02-14 10:42:26 +0100
commita1aafe9eec98f91fd76d104964ad98fcafc94a80 (patch)
tree2659b9f308d9909b5a9140aee50149ccb0ff3d0f
parent1776a5b243aa7b62eff09319e2f766426307e220 (diff)
language added
-rw-r--r--app/views/sip_accounts/_form_core.html.haml1
-rw-r--r--config/locales/views/sip_accounts/de.yml5
-rw-r--r--config/locales/views/sip_accounts/en.yml5
3 files changed, 9 insertions, 2 deletions
diff --git a/app/views/sip_accounts/_form_core.html.haml b/app/views/sip_accounts/_form_core.html.haml
index 1b96d27..1a8876a 100644
--- a/app/views/sip_accounts/_form_core.html.haml
+++ b/app/views/sip_accounts/_form_core.html.haml
@@ -15,3 +15,4 @@
= f.input :clip_no_screening, :label => t('sip_accounts.form.clip_no_screening.label'), :hint => conditional_hint('sip_accounts.form.clip_no_screening.hint')
- if CallForward.where(:phone_number_id => @sip_account.phone_number_ids).count == 0 || @sip_account.callforward_rules_act_per_sip_account == true
= f.input :callforward_rules_act_per_sip_account, :label => t('sip_accounts.form.callforward_rules_act_per_sip_account.label'), :hint => conditional_hint('sip_accounts.form.callforward_rules_act_per_sip_account.hint')
+ = f.input :language_code, :collection => Language.all.collect{|l| [l.to_s, l.code]}, :label => t('sip_accounts.form.language_code.label'), :hint => conditional_hint('sip_accounts.form.language_id.hint'), :include_blank => false
diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml
index 8fe2300..7a7e540 100644
--- a/config/locales/views/sip_accounts/de.yml
+++ b/config/locales/views/sip_accounts/de.yml
@@ -81,4 +81,7 @@ de:
callforward_rules_act_per_sip_account:
label: 'Rufweiterleitungen gelten für das gesamte SIP-Account'
hint: ''
- submit: 'Absenden' \ No newline at end of file
+ language_code:
+ label: 'Sprache'
+ hint: ''
+ submit: 'Absenden'
diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml
index aa934e9..35d5456 100644
--- a/config/locales/views/sip_accounts/en.yml
+++ b/config/locales/views/sip_accounts/en.yml
@@ -81,4 +81,7 @@ en:
hotdeskable:
label: 'Hotdeskable'
hint: ''
- submit: 'Submit' \ No newline at end of file
+ language_code:
+ label: 'Language'
+ hint: ''
+ submit: 'Submit'