From: Tom Hughes <tom@compton.nu>
Date: Wed, 3 Jun 2020 16:07:31 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/2640'
X-Git-Tag: live~3131
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/49a576a390c60abf24f8a98889eef1590e981f0a?hp=46c3e70ec61716847f5875fd5cab4df957b892fb

Merge remote-tracking branch 'upstream/pull/2640'
---

diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb
index 32a4e1e0f..96c052da6 100644
--- a/app/views/diary_entries/index.html.erb
+++ b/app/views/diary_entries/index.html.erb
@@ -10,14 +10,12 @@
         <li><%= rss_link_to :action => "rss", :language => params[:language] %></li>
       <% end -%>
 
-      <% if @user %>
-        <% if @user == current_user %>
-          <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
-        <% end %>
-      <% else %>
-        <% if current_user %>
-          <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
-        <% end %>
+      <% if @user && @user == current_user || !@user && current_user %>
+        <li><%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
+      <% end %>
+
+      <% if !@user && current_user %>
+        <li><%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %></li>
       <% end %>
     </ul>
   </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f9ea78ef3..1ee3f2378 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -373,6 +373,7 @@ en:
       in_language_title: "Diary Entries in %{language}"
       new: New Diary Entry
       new_title: Compose a new entry in my user diary
+      my_diary: My Diary
       no_entries: No diary entries
       recent_entries: "Recent diary entries"
       older_entries: Older Entries