From 35eeff008193a9fc2fc6f01c9ded931333c007b9 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 2 Jun 2009 08:25:00 +0000 Subject: [PATCH] Fix up translation issues in diary comment notifier. --- app/models/notifier.rb | 2 +- .../notifier/diary_comment_notification.rhtml | 14 +++++++------- config/locales/de.yml | 2 +- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- config/locales/fr.yml | 2 +- config/locales/is.yml | 2 +- config/locales/sl.yml | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/notifier.rb b/app/models/notifier.rb index b291c2b57..4500e527f 100644 --- 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 cfae495da..a052ad793 100644 --- 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 f2d55817f..8528ec249 100644 --- 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 3c993e690..0ac74429d 100644 --- 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 b903bfa20..ea2872946 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,6 +1,6 @@ es: notifier: - diary: + diary_comment_notification: banner1: "* Por favor, no responda a este mensaje. *" banner2: "* Utilice el OpenStreetMap sitio web para responder. *" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 8ff4a8495..3085d510b 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -138,7 +138,7 @@ fr: sotm : 'Venez a la conférence 2009 de OpenStreetMap, The State of the Map, 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 f2ee8cebb..df907f19b 100644 --- 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 4d5468075..04aedd2b1 100644 --- 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}}!" -- 2.39.5