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

diff --git a/app/views/notes/_comment.html.erb b/app/views/notes/_comment.html.erb
index c0d6e17d32b156efc308a97582c28ecb795efd3a..d9c17848b26995f00abbd91f9e4fca25b943db84 100644 (file)
--- a/app/views/notes/_comment.html.erb
+++ b/app/views/notes/_comment.html.erb
@@ -1,8 +1,8 @@
 <div class="note-comment" style="margin-top: 5px">
   <% if comment.author.nil? -%>
-  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_html", :when => friendly_date(comment.created_at) %></div>
+  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t ".#{comment.event}_at_html", :when => friendly_date(comment.created_at) %></div>
   <% else -%>
-  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t "note.description.#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
+  <div class="note-comment-description" style="font-size: smaller; color: #999999"><%= t ".#{comment.event}_at_by_html", :when => friendly_date(comment.created_at), :user => note_author(comment.author, :only_path => false) %></div>
   <% end -%>
   <div class="note-comment-text"><%= comment.body %></div>
 </div>

diff --git a/app/views/notes/_entry.html.erb b/app/views/notes/_entry.html.erb
index 6f0c8fb717e1b7209f041716206c69219c0ecf6f..624ecd15d8654e3c8733e589f99a317465b37705 100644 (file)
--- a/app/views/notes/_entry.html.erb
+++ b/app/views/notes/_entry.html.erb
@@ -1,4 +1,4 @@
-<h2><%= t "note.entry.comment" %></h2>
+<h2><%= t ".comment" %></h2>
 <%= render :partial => "comment", :object => entry %>
-<h2><%= t "note.entry.full" %></h2>
+<h2><%= t ".full" %></h2>
 <%= render :partial => "description", :object => entry.note %>

diff --git a/app/views/notes/_note.rss.builder b/app/views/notes/_note.rss.builder
index 38c42f1ec4786de0dba3fd82469903ec8d88fca0..9c72b8a5d42c15cd2e30ca248f659852be0c922b 100644 (file)
--- a/app/views/notes/_note.rss.builder
+++ b/app/views/notes/_note.rss.builder
@@ -2,11 +2,11 @@ xml.item do
   location = describe_location(note.lat, note.lon, 14, locale)
 
   if note.closed?
-    xml.title t("note.rss.closed", :place => location)
+    xml.title t("notes.rss.closed", :place => location)
   elsif note.comments.length > 1
-    xml.title t("note.rss.commented", :place => location)
+    xml.title t("notes.rss.commented", :place => location)
   else
-    xml.title t("note.rss.opened", :place => location)
+    xml.title t("notes.rss.opened", :place => location)
   end
 
   xml.link browse_note_url(note)

diff --git a/app/views/notes/feed.rss.builder b/app/views/notes/feed.rss.builder
index 708192e5f48f020149ead7ef6dadd3aabdb5ee1c..4a4fb3e1a75c05bb6b1ec9340163f6cdf5a6694a 100644 (file)
--- a/app/views/notes/feed.rss.builder
+++ b/app/views/notes/feed.rss.builder
@@ -5,15 +5,15 @@ xml.rss("version" => "2.0",
         "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
-    xml.title t("note.rss.title")
-    xml.description t("note.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
+    xml.title t("notes.rss.title")
+    xml.description t("notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
     @comments.each do |comment|
       location = describe_location(comment.note.lat, comment.note.lon, 14, locale)
 
       xml.item do
-        xml.title t("note.rss.#{comment.event}", :place => location)
+        xml.title t("notes.rss.#{comment.event}", :place => location)
 
         xml.link url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)
         xml.guid url_for(:controller => "browse", :action => "note", :id => comment.note.id, :anchor => "c#{comment.id}", :only_path => false)

diff --git a/app/views/notes/index.rss.builder b/app/views/notes/index.rss.builder
index e912b99216455257bcb91cf80dfd4840cd1a8a4c..d28efa1942da01a918fb9f38cea6b508b3f2eae5 100644 (file)
--- a/app/views/notes/index.rss.builder
+++ b/app/views/notes/index.rss.builder
@@ -5,8 +5,8 @@ xml.rss("version" => "2.0",
         "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
-    xml.title t("note.rss.title")
-    xml.description t("note.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
+    xml.title t("notes.rss.title")
+    xml.description t("notes.rss.description_area", :min_lat => @min_lat, :min_lon => @min_lon, :max_lat => @max_lat, :max_lon => @max_lon)
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
     xml << (render(:partial => "note", :collection => @notes) || "")

diff --git a/app/views/notes/mine.html.erb b/app/views/notes/mine.html.erb
index 666c7dc8f94c6af01bad70d4f32d2b54969949f6..13824419e8a02e1d9e638f3f013ec3608c44aa2e 100644 (file)
--- a/app/views/notes/mine.html.erb
+++ b/app/views/notes/mine.html.erb
@@ -8,11 +8,11 @@
 <table class="note_list">
   <tr>
     <th></th>
-    <th><%= t'note.mine.id' %></th>
-    <th><%= t'note.mine.creator' %></th>
-    <th><%= t'note.mine.description' %></th>
-    <th><%= t'note.mine.created_at' %></th>
-    <th><%= t'note.mine.last_changed' %></th>
+    <th><%= t '.id' %></th>
+    <th><%= t '.creator' %></th>
+    <th><%= t '.description' %></th>
+    <th><%= t '.created_at' %></th>
+    <th><%= t '.last_changed' %></th>
   </tr>
 <% @notes.each do |note| -%>
   <tr<% if note.author != @user2 %> class="creator"<% end %>>
@@ -25,9 +25,9 @@
     </td>
     <td><%= link_to note.id.to_s, :controller => "browse", :action => "note", :id => note.id %></td>
     <td><%= note_author(note.author) %></td>
-    <td><%= note.comments.first.body.to_html %></td>   
-    <td><%= t 'note.mine.ago_html', :when => friendly_date(note.created_at) %></td>
-    <td><%= t 'note.mine.ago_html', :when => friendly_date(note.updated_at) %></td>
+    <td><%= note.comments.first.body.to_html %></td>
+    <td><%= t '.ago_html', :when => friendly_date(note.created_at) %></td>
+    <td><%= t '.ago_html', :when => friendly_date(note.updated_at) %></td>
   </tr>
 <% end -%>
 </table>

diff --git a/app/views/notes/show.rss.builder b/app/views/notes/show.rss.builder
index 62ccbe8a94a4ab2f3f2969eff254b4264ae65d1f..f406479008471afa2eaeaba5ad3a516afb84e1a0 100644 (file)
--- a/app/views/notes/show.rss.builder
+++ b/app/views/notes/show.rss.builder
@@ -4,8 +4,8 @@ xml.rss("version" => "2.0",
         "xmlns:geo" => "http://www.w3.org/2003/01/geo/wgs84_pos#",
         "xmlns:georss" => "http://www.georss.org/georss") do
   xml.channel do
-    xml.title t("note.rss.title")
-    xml.description t("note.rss.description_item", :id => @note.id)
+    xml.title t("notes.rss.title")
+    xml.description t("notes.rss.description_item", :id => @note.id)
     xml.link url_for(:controller => "site", :action => "index", :only_path => false)
 
     xml << render(:partial => "note", :object => @note)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3900f9fba97449b64e36d55073f07450a7641167..9c7ab2b4978ca0380a1ada6e0c1611d3c5718b7a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -2202,8 +2202,8 @@ en:
       showing_page: "Page %{page}"
       next: "Next »"
       previous: "« Previous"
-  note:
-    description:
+  notes:
+    comment:
       opened_at_html: "Created %{when} ago"
       opened_at_by_html: "Created %{when} ago by %{user}"
       commented_at_html: "Updated %{when} ago"