From: Tom Hughes <tom@compton.nu>
Date: Sun, 14 Oct 2012 09:06:41 +0000 (+0100)
Subject: Localise notes interface
X-Git-Tag: live~5064^2~92
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/361906af9e5a7209af3f7006acbd117ed7b85e24

Localise notes interface
---

diff --git a/app/assets/javascripts/templates/notes/new.jst.ejs b/app/assets/javascripts/templates/notes/new.jst.ejs
index 9ccfab4f7..9c82a60a4 100644
--- a/app/assets/javascripts/templates/notes/new.jst.ejs
+++ b/app/assets/javascripts/templates/notes/new.jst.ejs
@@ -1,11 +1,11 @@
 <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/>
-  <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>
diff --git a/app/assets/javascripts/templates/notes/show.jst.ejs b/app/assets/javascripts/templates/notes/show.jst.ejs
index cf5d9010a..038ff5ebd 100644
--- 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">
-    <%- 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 %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dca41e8db..09c43fc09 100644
--- 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
+    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"