diff options
| author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-08 19:07:34 +0100 |
|---|---|---|
| committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-08 19:07:34 +0100 |
| commit | 8a5dd852e202ce2c190a1f2ad79a8a452f4fcf53 (patch) | |
| tree | bbd124aef5a3b12daab6693aa2698db79082d84a /config | |
| parent | faabc3e5db9310727e5d8cb9cd509adeb900d6c0 (diff) | |
| parent | b67c3f5ff6474ba117c75eb81c7d2d9371e8a103 (diff) | |
Merge branch 'develop' of https://github.com/amooma/GS5 into develop
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/views/phone_numbers/de.yml | 3 | ||||
| -rw-r--r-- | config/locales/views/phone_numbers/en.yml | 1 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/config/locales/views/phone_numbers/de.yml b/config/locales/views/phone_numbers/de.yml index 40fc7f8..e801ab4 100644 --- a/config/locales/views/phone_numbers/de.yml +++ b/config/locales/views/phone_numbers/de.yml @@ -34,7 +34,8 @@ de: confirm: 'Sind Sie sicher, dass Sie diese Telefonnummer löschen möchten?' destroy: 'Löschen' edit: 'Bearbeiten' - view_all: 'View all phone numbers' + view_all: 'Alle anzeigen' + call: 'Anrufen' new: page_title: 'Neue Telefonnummer' edit: diff --git a/config/locales/views/phone_numbers/en.yml b/config/locales/views/phone_numbers/en.yml index 31af5c8..be3b4f5 100644 --- a/config/locales/views/phone_numbers/en.yml +++ b/config/locales/views/phone_numbers/en.yml @@ -35,6 +35,7 @@ en: destroy: 'Delete' edit: 'Edit' view_all: 'View all phone numbers' + call: 'Call' new: page_title: 'New Phone number' edit: diff --git a/config/routes.rb b/config/routes.rb index a0ad6aa..6d45f9f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -304,6 +304,7 @@ Gemeinschaft42c::Application.routes.draw do member do put 'move_higher' put 'move_lower' + put 'call' end end end |