Change "Close" button to "Resolve" in notes popup

diff --git a/app/assets/javascripts/index/notes.js.erb b/app/assets/javascripts/index/notes.js.erb
index 3d6cd0a5f01c52ed38b5d95ce68b9eae330fcfcb..4594f1c782bf3fd1c692b2321c01459f012372fc 100644 (file)
--- 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() == "") {
       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.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);
       }
     });
         $(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 e60971884dcd0f07147f5dcfe2247f26dfe1917d..aa98220f4f362c4f6b191674b71b9fe374a1d351 100644 (file)
--- 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">
     <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>
       <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 3161dc3813fab6c9d7cd25e39ae020d0908eed79..0679e13250f2240b7ed72fd7e825df74a01ee975 100644 (file)
--- 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}"
         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:
         comment: Comment
   redaction:
     edit: