From f4239f8fc5d0e89da2eff4132332fdf0efdaf62a Mon Sep 17 00:00:00 2001 From: Tucker Chapman Date: Tue, 17 Nov 2020 20:33:27 -0500 Subject: [PATCH 1/2] Add last updated date to diary entry page --- app/views/diary_entries/_diary_entry.html.erb | 2 +- config/locales/en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index 48df5d18e0..a31560516e 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -7,7 +7,7 @@

<%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %>

- <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %> + <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code), :updated => l(diary_entry.updated_at, :format => :blog)) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 37d6f99e9b..263001f993 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -433,7 +433,7 @@ en: heading: "No entry with the id: %{id}" body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." diary_entry: - posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}" + posted_by_html: "Posted by %{link_user} on %{created} in %{language_link} last updated on %{updated}" comment_link: Comment on this entry reply_link: Send a message to the author comment_count: From c274d22fd6ad20394d6ec13e49b2a862e57e183d Mon Sep 17 00:00:00 2001 From: Tucker Chapman Date: Thu, 26 Nov 2020 22:04:54 -0500 Subject: [PATCH 2/2] Update translate string and only show if different from creation time --- app/views/diary_entries/_diary_entry.html.erb | 5 ++++- config/locales/en.yml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb index a31560516e..6616417a19 100644 --- a/app/views/diary_entries/_diary_entry.html.erb +++ b/app/views/diary_entries/_diary_entry.html.erb @@ -7,7 +7,10 @@

<%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %>

- <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code), :updated => l(diary_entry.updated_at, :format => :blog)) %> + <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %> + <% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %> + <%= t(".updated_at_html", :updated => l(diary_entry.updated_at, :format => :blog)) %> + <% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 263001f993..04c2b43386 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -433,7 +433,8 @@ en: heading: "No entry with the id: %{id}" body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong." diary_entry: - posted_by_html: "Posted by %{link_user} on %{created} in %{language_link} last updated on %{updated}" + posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}." + updated_at_html: "Last updated on %{updated}." comment_link: Comment on this entry reply_link: Send a message to the author comment_count: