diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 16:18:24 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-02-26 16:18:24 +0100 |
| commit | 390fbe398bbf7e485d2a9960a62e60e4083fd1df (patch) | |
| tree | 8779ba4653c1f98c89932e091f742dc2a798f328 /config | |
| parent | ab2bf212ed91b1e9359f026ef8775de2238a49be (diff) | |
| parent | 0399b856c75b842f43bc5380f9c19a64c6418f11 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/views/sip_accounts/de.yml | 2 | ||||
| -rw-r--r-- | config/locales/views/sip_accounts/en.yml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/config/locales/views/sip_accounts/de.yml b/config/locales/views/sip_accounts/de.yml index 7a7e540..2b4939b 100644 --- a/config/locales/views/sip_accounts/de.yml +++ b/config/locales/views/sip_accounts/de.yml @@ -41,6 +41,8 @@ de: registration: 'Registrierung' expires: 'Läuft ab' user_agent: 'User Agent' + tel_protocol: 'TEL Protokoll' + register_tel_protocol: 'Für tel: URLs registrieren' actions: confirm_destroy: 'Sind Sie sicher, dass Sie diesen SIP-Account löschen möchten?' destroy: 'Löschen' diff --git a/config/locales/views/sip_accounts/en.yml b/config/locales/views/sip_accounts/en.yml index 35d5456..78d20c2 100644 --- a/config/locales/views/sip_accounts/en.yml +++ b/config/locales/views/sip_accounts/en.yml @@ -41,6 +41,8 @@ en: registration: 'Registration' expires: 'Expires' user_agent: 'User Agent' + tel_protocol: 'TEL Protocol' + register_tel_protocol: 'Register for tel: URLs with browser' actions: confirm_destroy: 'Are you sure you want to delete this SIP account?' destroy: 'Delete' diff --git a/config/routes.rb b/config/routes.rb index 87c9c66..adff556 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -276,6 +276,9 @@ Gemeinschaft42c::Application.routes.draw do end end resources :voicemail_settings + member do + get 'call' + end end resources :phones, :only => [] do |