Move show/hide changeset comment locale strings out of javascripts

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index b9589f9ca0d6ccd7874866ffb43c3f20923f3a24..5d2ca6ff67b903d3239f580fe47c082bd961086a 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -37,7 +37,7 @@
                   :user => link_to(comment.author.display_name, comment.author) %>
             <% if current_user&.moderator? %>
               —
                   :user => link_to(comment.author.display_name, comment.author) %>
             <% if current_user&.moderator? %>
               —

-              <%= tag.button t("javascripts.changesets.show.#{comment.visible ? 'hide' : 'unhide'}_comment"),
+              <%= tag.button t(".#{comment.visible ? 'hide' : 'unhide'}_comment"),

                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                              :data => { :method => "POST",
                                         :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>
                              :class => "btn btn-sm small btn-link link-secondary p-0 align-baseline",
                              :data => { :method => "POST",
                                         :url => comment.visible ? changeset_comment_hide_url(comment) : changeset_comment_unhide_url(comment) } %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7b463421036030b059fb757657dbc1631d27100f..0b7027f80fe970ec7cbe6c20f8105110a76b8066 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -474,6 +474,8 @@ en:
       still_open: "Changeset still open - discussion will open once the changeset is closed."
       comment_by_html: "Comment from %{user} %{time_ago}"
       hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
       still_open: "Changeset still open - discussion will open once the changeset is closed."
       comment_by_html: "Comment from %{user} %{time_ago}"
       hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"

+      hide_comment: "hide"
+      unhide_comment: "unhide"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     paging_nav:


@@ -3174,8 +3176,6 @@ en:
         comment: "Comment"
         subscribe: "Subscribe"
         unsubscribe: "Unsubscribe"
         comment: "Comment"
         subscribe: "Subscribe"
         unsubscribe: "Unsubscribe"

-        hide_comment: "hide"
-        unhide_comment: "unhide"

     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"
     edit_help: Move the map and zoom in on a location you want to edit, then click here.
     directions:
       ascend: "Ascend"