Move changeset subscribe/unsubscribe locale strings out of javascripts

diff --git a/app/views/changesets/show.html.erb b/app/views/changesets/show.html.erb
index 1d37e302a9004d8a6587506bab29531b8dd0eaf6..6ae0efb8b25af84a1428a3ebfed25abe54be37c5 100644 (file)
--- a/app/views/changesets/show.html.erb
+++ b/app/views/changesets/show.html.erb
@@ -18,13 +18,13 @@
     <% if current_user %>
       <div class="col-auto">
         <% if @changeset.subscribers.exists?(current_user.id) %>
     <% if current_user %>
       <div class="col-auto">
         <% if @changeset.subscribers.exists?(current_user.id) %>

-          <%= tag.button t("javascripts.changesets.show.unsubscribe"),
+          <%= tag.button t(".unsubscribe"),

                          :class => "btn btn-sm btn-primary",
                          :name => "unsubscribe",
                          :data => { :method => "POST",
                                     :url => api_changeset_unsubscribe_url(@changeset) } %>
         <% else %>
                          :class => "btn btn-sm btn-primary",
                          :name => "unsubscribe",
                          :data => { :method => "POST",
                                     :url => api_changeset_unsubscribe_url(@changeset) } %>
         <% else %>

-          <%= tag.button t("javascripts.changesets.show.subscribe"),
+          <%= tag.button t(".subscribe"),

                          :class => "btn btn-sm btn-primary",
                          :name => "subscribe",
                          :data => { :method => "POST",
                          :class => "btn btn-sm btn-primary",
                          :name => "subscribe",
                          :data => { :method => "POST",

diff --git a/app/views/diary_entries/show.html.erb b/app/views/diary_entries/show.html.erb
index 6c0895380d55d0c0e2024c15a00164a3a33110d1..1830c9ced6a4cbbfef8e1597d008ded6b8bb7bbc 100644 (file)
--- a/app/views/diary_entries/show.html.erb
+++ b/app/views/diary_entries/show.html.erb
@@ -19,9 +19,9 @@
     <% if current_user %>
       <div class="col-auto">
         <% if @entry.subscribers.exists?(current_user.id) %>
     <% if current_user %>
       <div class="col-auto">
         <% if @entry.subscribers.exists?(current_user.id) %>

-          <%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>
+          <%= link_to t(".unsubscribe"), diary_entry_unsubscribe_path(@entry.user, @entry), :method => :post, :class => "btn btn-sm btn-primary" %>

         <% else %>
         <% else %>

-          <%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(@entry.user, @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>
+          <%= link_to t(".subscribe"), diary_entry_subscribe_path(@entry.user, @entry.id), :method => :post, :class => "btn btn-sm btn-primary" %>

         <% end %>
       </div>
     <% end %>
         <% end %>
       </div>
     <% end %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index bad3ef02547d0ae629632807629a16a8d3981eb2..4a103b21e685fce85f095420e214269b4e723afd 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -472,6 +472,8 @@ en:
       discussion: Discussion
       join_discussion: "Log in to join the discussion"
       still_open: "Changeset still open - discussion will open once the changeset is closed."
       discussion: Discussion
       join_discussion: "Log in to join the discussion"
       still_open: "Changeset still open - discussion will open once the changeset is closed."

+      subscribe: "Subscribe"
+      unsubscribe: "Unsubscribe"

       comment_by_html: "Comment from %{user} %{time_ago}"
       hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
       hide_comment: "hide"
       comment_by_html: "Comment from %{user} %{time_ago}"
       hidden_comment_by_html: "Hidden comment from %{user} %{time_ago}"
       hide_comment: "hide"


@@ -546,6 +548,8 @@ en:
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
       discussion: "Discussion"
       title: "%{user}'s Diary | %{title}"
       user_title: "%{user}'s Diary"
       discussion: "Discussion"

+      subscribe: "Subscribe"
+      unsubscribe: "Unsubscribe"

       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Log in"
       leave_a_comment: "Leave a comment"
       login_to_leave_a_comment_html: "%{login_link} to leave a comment"
       login: "Log in"


@@ -3172,10 +3176,6 @@ en:
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       embed_html_disabled: HTML embedding is not available for this map layer
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
       embed_html_disabled: HTML embedding is not available for this map layer

-    changesets:
-      show:
-        subscribe: "Subscribe"
-        unsubscribe: "Unsubscribe"

     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"