Merge branch 'develop'

1 files changed, 5 insertions, 4 deletions

diff --git a/app/views/layouts/_navbar.html.haml b/app/views/layouts/_navbar.html.haml
index 3e1da1c..d83660b 100644
--- a/app/views/layouts/_navbar.html.haml
+++ b/app/views/layouts/_navbar.html.haml
@@ -20,9 +20,10 @@
             %li
               %a{:href => sip_account_call_histories_path(current_user.sip_accounts.first)}
                 =t("call_histories.index.page_title")
-            %li
-              %a{:href => sip_account_voicemail_messages_path(current_user.sip_accounts.first)}
-                =t("voicemail_messages.index.page_title")
+            - if current_user.voicemail_accounts.first
+              %li
+                %a{:href => voicemail_account_voicemail_messages_path(current_user.voicemail_accounts.first)}
+                  =t("voicemail_messages.index.page_title")
    
       - if current_user
         %ul.nav.pull-right
@@ -60,5 +61,5 @@
 
         - if GuiFunction.display?('search_field_in_top_navigation_bar', current_user)
           = form_tag search_path, :method => :post, :class => 'navbar-search pull-right' do
-            %input.text{:placeholder => 'Suchen ...', :name => 'q', :class => 'search-query span2'}
+            %input.text{:placeholder => t('navigation.search_placeholder'), :name => 'q', :class => 'search-query span2'}