Merge remote-tracking branch 'upstream/pull/3911'

[rails.git] / app / assets / javascripts / index / note.js

diff --git a/app/assets/javascripts/index/note.js b/app/assets/javascripts/index/note.js
index e5eb3a04148112279862854d3136ced79cbfe175..e7790c904b111804f7332b46cc7a81bffcee654e 100644 (file)
--- a/app/assets/javascripts/index/note.js
+++ b/app/assets/javascripts/index/note.js
@@ -60,10 +60,10 @@ OSM.Note = function (map) {
       var form = e.target.form;
 
       if ($(e.target).val() === "") {
-        $(form.close).val(I18n.t("javascripts.notes.show.resolve"));
+        $(form.close).val($(form.close).data("defaultActionText"));
         $(form.comment).prop("disabled", true);
       } else {
-        $(form.close).val(I18n.t("javascripts.notes.show.comment_and_resolve"));
+        $(form.close).val($(form.close).data("commentActionText"));
         $(form.comment).prop("disabled", false);
       }
     });