From: Tom Hughes <tom@compton.nu>
Date: Mon, 16 Dec 2019 22:26:33 +0000 (+0000)
Subject: Note events use "opened" not "open" as the status
X-Git-Tag: live~2851
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6f8966e7c1fd5ad7d24cf51db176a5b0c07ded11?ds=sidebyside

Note events use "opened" not "open" as the status
---

diff --git a/app/views/browse/note.html.erb b/app/views/browse/note.html.erb
index f68dfbe2e..2389598bc 100644
--- a/app/views/browse/note.html.erb
+++ b/app/views/browse/note.html.erb
@@ -12,7 +12,7 @@
   </div>
 
   <div class="details" data-coordinates="<%= @note.lat %>,<%= @note.lon %>" data-status="<%= @note.status %>">
-    <%= note_event("open", @note.created_at, @note.author) %>
+    <%= note_event("opened", @note.created_at, @note.author) %>
     <% if @note.status == "closed" %>
       <br />
       <%= note_event(@note.status, @note.closed_at, @note_comments.last.author) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c634c30af..b99e068b8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -288,8 +288,8 @@ en:
       open_title: "Unresolved note #%{note_name}"
       closed_title: "Resolved note #%{note_name}"
       hidden_title: "Hidden note #%{note_name}"
-      open_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
-      open_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by: "Created by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
+      opened_by_anonymous: "Created by anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
       commented_by: "Comment from %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
       commented_by_anonymous: "Comment from anonymous <abbr title='%{exact_time}'>%{when}</abbr>"
       closed_by: "Resolved by %{user} <abbr title='%{exact_time}'>%{when}</abbr>"
diff --git a/test/helpers/note_helper_test.rb b/test/helpers/note_helper_test.rb
index ce82f3ab5..838217e40 100644
--- a/test/helpers/note_helper_test.rb
+++ b/test/helpers/note_helper_test.rb
@@ -8,7 +8,7 @@ class NoteHelperTest < ActionView::TestCase
     date = Time.new(2014, 3, 5, 21, 37, 45, "+00:00")
     user = create(:user)
 
-    assert_match %r{^Created by anonymous <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.* ago</span></abbr>$}, note_event("open", date, nil)
+    assert_match %r{^Created by anonymous <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.* ago</span></abbr>$}, note_event("opened", date, nil)
     assert_match %r{^Resolved by <a href="/user/#{ERB::Util.u(user.display_name)}">#{user.display_name}</a> <abbr title='Wed, 05 Mar 2014 21:37:45 \+0000'><span title=" 5 March 2014 at 21:37">.* ago</span></abbr>$}, note_event("closed", date, user)
   end