From 9f025130fddd7b9c7314cfec36dbe160c41e6698 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 5 Feb 2013 18:56:59 +0000
Subject: [PATCH] Change "Close" button to "Resolve" in notes popup

---
 app/assets/javascripts/index/notes.js.erb           | 4 ++--
 app/assets/javascripts/templates/notes/show.jst.ejs | 2 +-
 config/locales/en.yml                               | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 3d6cd0a5f..4594f1c78 100644
--- a/app/assets/javascripts/index/notes.js.erb
+++ b/app/assets/javascripts/index/notes.js.erb
@@ -145,10 +145,10 @@ $(document).ready(function () {
       var form = e.target.form;
 
       if ($(e.target).val() == "") {
-        $(form.close).val(I18n.t("javascripts.notes.show.close"));
+        $(form.close).val(I18n.t("javascripts.notes.show.resolve"));
         $(form.comment).prop("disabled", true);
       } else {
-        $(form.close).val(I18n.t("javascripts.notes.show.comment_and_close"));
+        $(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
         $(form.comment).prop("disabled", false);
       }
     });
diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index e60971884..aa98220f4 100644
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -25,7 +25,7 @@
     <textarea class="comment" name="text" cols="40" rows="5"></textarea>
     <br/>
     <div class="buttons">
-      <input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.close') %>" data-url="<%- note.close_url %>">
+      <input type="submit" name="close" value="<%- I18n.t('javascripts.notes.show.resolve') %>" data-url="<%- note.close_url %>">
       <input type="submit" name="comment" value="<%- I18n.t('javascripts.notes.show.comment') %>" data-url="<%- note.comment_url %>" disabled="1">
     </div>
   </form>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3161dc381..0679e1325 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2041,8 +2041,8 @@ en:
         closed_by_anonymous: "resolved by anonymous at %{time}"
         reopened_by: "reactivated by <a href='%{user_url}'>%{user}</a> at %{time}"
         reopened_by_anonymous: "reactivated by anonymous at %{time}"
-        close: Close
-        comment_and_close: Comment & Close
+        resolve: Resolve
+        comment_and_resolve: Comment & Resolve
         comment: Comment
   redaction:
     edit:
-- 
2.43.2