From 6f8966e7c1fd5ad7d24cf51db176a5b0c07ded11 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 16 Dec 2019 22:26:33 +0000 Subject: [PATCH] Note events use "opened" not "open" as the status --- app/views/browse/note.html.erb | 2 +- config/locales/en.yml | 4 ++-- test/helpers/note_helper_test.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 @@
- <%= note_event("open", @note.created_at, @note.author) %> + <%= note_event("opened", @note.created_at, @note.author) %> <% if @note.status == "closed" %>
<%= 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} %{when}" - open_by_anonymous: "Created by anonymous %{when}" + opened_by: "Created by %{user} %{when}" + opened_by_anonymous: "Created by anonymous %{when}" commented_by: "Comment from %{user} %{when}" commented_by_anonymous: "Comment from anonymous %{when}" closed_by: "Resolved by %{user} %{when}" 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 .* ago$}, note_event("open", date, nil) + assert_match %r{^Created by anonymous .* ago$}, note_event("opened", date, nil) assert_match %r{^Resolved by #{user.display_name} .* ago$}, note_event("closed", date, user) end -- 2.45.2