Fix up translation issues in diary comment notifier.

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index b291c2b57de027d6dbc3d89b5b5f06f24df5bf3a..4500e527f9914edd454be7fb39e8a647a23518d7 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -72,7 +72,7 @@ class Notifier < ActionMailer::Base
     body :to_user => comment.diary_entry.user.display_name,
          :from_user => comment.user.display_name,
          :body => comment.body,
-         :subject => comment.diary_entry.title,
+         :title => comment.diary_entry.title,
          :readurl => url_for(:host => SERVER_URL,
                              :controller => "diary_entry",
                              :action => "view",

diff --git a/app/views/notifier/diary_comment_notification.rhtml b/app/views/notifier/diary_comment_notification.rhtml
index cfae495da82a07f77ae44303e612440a9ce0b3c0..a052ad79390f5ff396688b0e57e2d8c15088a256 100644 (file)
--- a/app/views/notifier/diary_comment_notification.rhtml
+++ b/app/views/notifier/diary_comment_notification.rhtml
@@ -1,25 +1,25 @@
 ***************************************************************************
 *                                                                         *
-<%= t'banner1' %>
-<%= t'banner2' %>
+<%= t'notifier.diary_comment_notification.banner1' %>
+<%= t'notifier.diary_comment_notification.banner2' %>
 *                                                                         *
 ***************************************************************************
 
 
-<%= t'notifier.diary.hi', :to_user => @to_user %> 
+<%= t'notifier.diary_comment_notification.hi', :to_user => @to_user %> 
 
-<%= t'notifier.diary.header', :from_user => @from_user, :subject => @subject %>
+<%= t'notifier.diary_comment_notification.header', :from_user => @from_user, :subject => @title %>
 
 ==
 <%= @body %>
 ==
 
-<%= t'notifier.diary.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
+<%= t'notifier.diary_comment_notification.footer', :readurl => @readurl, :commenturl => @commenturl, :replyurl => @replyurl %>
 
 
 ***************************************************************************
 *                                                                         *
-<%= t'banner1' %>
-<%= t'banner2' %>
+<%= t'notifier.diary_comment_notification.banner1' %>
+<%= t'notifier.diary_comment_notification.banner2' %>
 *                                                                         *
 ***************************************************************************

diff --git a/config/locales/de.yml b/config/locales/de.yml
index f2d55817fa69d08d40bcc6fd287138266e68d866..8528ec2495f879aacabd7bf12dc8070e29651b5a 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -243,7 +243,7 @@ de:
     sotm: 'Besuche die OpenStreetMap-Konferenz, The State of the Map 2009, am 10.-12. Juli in Amsterdam!'
     alt_donation: Spenden
   notifier:
-    diary:
+    diary_comment_notification:
       banner1: "*                Bitte antworte nicht auf diese E-Mail.                *"
       banner2: "*     Verwende stattdessen die OpenStreetMap Website zum Antworten.    *"
       hi: "Hallo {{to_user}},"

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3c993e690139316de7cdd8f1b3d89ab63c4726bc..0ac74429dd978279ba6afea490e68b323d6c8f6c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -318,7 +318,7 @@ en:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
-    diary:
+    diary_comment_notification:
       banner1: "*                   Please do not reply to this email.                    *"
       banner2: "*                Use the OpenStreetMap web site to reply.                 *"
       hi: "Hi {{to_user}},"

diff --git a/config/locales/es.yml b/config/locales/es.yml
index b903bfa20c37e59622ef3bd4120260b3284f24bf..ea2872946c00c957f61188b0f8e0723ea2c270bd 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,6 +1,6 @@
 es:\r
   notifier:\r
-    diary:\r
+    diary_comment_notification:\r
       banner1: "*                 Por favor, no responda a este mensaje.                  *"\r
       banner2: "*           Utilice el OpenStreetMap sitio web para responder.            *"\r
 \r

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8ff4a84956e2e64bcbca73fc62cf4cf0fb0b99be..3085d510b537ff22133ea09f3ddcecc34b37c1c8 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -138,7 +138,7 @@ fr:
     sotm : 'Venez a la conférence 2009 de OpenStreetMap, <a href="http://www.stateofthemap.org">The State of the Map</a>, 10-12 juillet à Amsterdam!'
     alt_donation: "Faites une donation"
   notifier:
-    diary:
+    diary_comment_notification:
       banner1: "*            S’il vous plaît de ne pas répondre à ce message.             *"
       banner2: "*           Utilisez le OpenStreetMap site Web pour y répondre.           *"
   site:

diff --git a/config/locales/is.yml b/config/locales/is.yml
index f2ee8cebb1f77a5f369ab2ce5dba19229c02032c..df907f19be276e68aa03b486123cb589a226143c 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -314,7 +314,7 @@ is:
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: Make a Donation
   notifier:
-    diary:
+    diary_comment_notification:
       banner1: "*                        Ekki svara þessum pósti.                         *"
       banner2: "*                Notaðu OpenStreetMap vefinn til að svara.                *"
       hi: "Hæ {{to_user}},"

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 4d5468075bbb02a6196d39879b8e569bcef93a59..04aedd2b1aab335f8fbaa6637f0c78915fb9b8f3 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -314,7 +314,7 @@ sl:
     sotm: 'Udeležite se letošnje OpenStreetMap konference, The State of the Map, ki bo od 10 do 12 Julija v Amsterdamu!'
     alt_donation: Prispevajte finančna sredstva
   notifier:
-    diary:
+    diary_comment_notification:
       banner1: "*                    Ne odgovarjajte na to sporočilo.                     *"
       banner2: "*           Za odgovor uporabite spletno stran OpenStreetMap.             *"
       hi: "Pozdravljen, {{to_user}}!"