Localise notes interface

diff --git a/app/assets/javascripts/templates/notes/new.jst.ejs b/app/assets/javascripts/templates/notes/new.jst.ejs
index 9ccfab4f7199acd70a5588cd521a2105bef0b418..9c82a60a4220c51065623512f891bd90e3aeda29 100644 (file)
--- a/app/assets/javascripts/templates/notes/new.jst.ejs
+++ b/app/assets/javascripts/templates/notes/new.jst.ejs
@@ -1,11 +1,11 @@
 <p>
 <p>

-  Move the marker to the correct position and<br/>
-  describe the problem in the box below:
+  <%- I18n.t('javascripts.notes.new.intro_1') %><br/>
+  <%- I18n.t('javascripts.notes.new.intro_2') %>

 </p>
 <form action="#">
   <input type="hidden" name="lon">
   <input type="hidden" name="lat">
   <textarea name="comment" cols="40" rows="10"></textarea>
   <br/>
 </p>
 <form action="#">
   <input type="hidden" name="lon">
   <input type="hidden" name="lat">
   <textarea name="comment" cols="40" rows="10"></textarea>
   <br/>

-  <input type="submit" name="add" value="Add Note" id="note-add">
+  <input type="submit" name="add" value="<%- I18n.t('javascripts.notes.new.add') %>" id="note-add">

 </form>
 </form>

diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index cf5d9010a9e57955d635ac3818d975575b749101..038ff5ebde705976c875a018f93f63dfb2e8f56e 100644 (file)
--- a/app/assets/javascripts/templates/notes/show.jst.ejs
+++ b/app/assets/javascripts/templates/notes/show.jst.ejs
@@ -1,8 +1,10 @@
-<h2>Note <%- note.id %></h2>
+<h2><%- I18n.t('javascripts.notes.show.title', { id: note.id }) %></h2>

 <% note.comments.forEach(function (comment) { %>
 <p>
   <small class="deemphasize">
 <% note.comments.forEach(function (comment) { %>
 <p>
   <small class="deemphasize">

-    <%- comment.action %> by <%- comment.user %> at <%- comment.date %>
+    <%- I18n.t('javascripts.notes.show.comment', {
+       action: comment.action, user: comment.user, time: comment.date
+    }) %>

   </small>
   <br/>
   <%- comment.text %>
   </small>
   <br/>
   <%- comment.text %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index dca41e8db7819e92945dc48011f26e15cd8e18b8..09c43fc091aaff8a71c00e627ba618a095dc8c8b 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2040,6 +2040,14 @@ en:
       create_help2: and descripe it as accurate as possible
       report: Report Problem
       edityourself: You can also edit the map directly your self
       create_help2: and descripe it as accurate as possible
       report: Report Problem
       edityourself: You can also edit the map directly your self

+    notes:
+      new:
+        intro_1: Move the marker to the correct position and
+        intro_2: "add your comment in the box below:"
+        add: Add Note
+      show:
+        title: Note %{id}
+        comment: "%{action} by %{user} at %{time}"

   redaction:
     edit:
       description: "Description"
   redaction:
     edit:
       description: "Description"