From 0d1133cd5106143a71d0b0d752110a6a03a856c3 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 9 Mar 2011 15:33:46 +0100
Subject: [PATCH] fixed some translations do not escape html in private_message
 text only email

---
 app/views/conversations/new.haml             |  1 +
 app/views/notifier/private_message.text.haml | 14 +++++++-------
 app/views/people/show.html.haml              |  2 +-
 config/locales/diaspora/en.yml               | 12 ++++++------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index 84c343fb0..b00376cf4 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -13,6 +13,7 @@
       asHtmlID: "contact_ids",
       keyDelay: 0,
       startText: '',
+      emptyText: #{t('.no_results')}
       preFill: [{ 'name' : "#{params[:name]}",
                  'value' : "#{params[:contact_id]}"}]
       });
diff --git a/app/views/notifier/private_message.text.haml b/app/views/notifier/private_message.text.haml
index 58419ab2c..9819a2ade 100644
--- a/app/views/notifier/private_message.text.haml
+++ b/app/views/notifier/private_message.text.haml
@@ -1,9 +1,9 @@
-= t('notifier.hello', :name => @receiver.profile.first_name)
-= "#{@sender.name} (#{@sender.diaspora_handle})"
-= t('notifier.private_message.private_message')
+!= t('notifier.hello', :name => @receiver.profile.first_name)
+!= "#{@sender.name} (#{@sender.diaspora_handle})"
+!= t('notifier.private_message.private_message')
 
-= t('notifier.private_message.message_subject', :subject => @conversation.subject)
-= @message.text
+!= t('notifier.private_message.message_subject', :subject => @conversation.subject)
+!= @message.text
 
-= "#{t('notifier.love')} \n"
-= t('notifier.diaspora')
+!= "#{t('notifier.love')} \n"
+!= t('notifier.diaspora')
diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml
index d37df6b7c..f45c472f0 100644
--- a/app/views/people/show.html.haml
+++ b/app/views/people/show.html.haml
@@ -47,7 +47,7 @@
     - else
       - if @contact.person
         .right
-          = link_to 'Message', new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name, :contact_id => @contact.id), :class => 'button', :rel => 'facebox'
+          = link_to t('.message'), new_conversation_path(:contact_id => @contact.id, :name => @contact.person.name, :contact_id => @contact.id), :class => 'button', :rel => 'facebox'
 
         /- if @post_type == :photos
         /  = link_to t('layouts.header.view_profile'), person_path(@person)
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dafc4743b..79b94fe4b 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -406,7 +406,7 @@ en:
           recent_public_posts: "Recent Public Posts"
           similar_contacts: "similar contacts"
           start_sharing: "start sharing"
-
+          message: "Message"
       profile_sidebar:
           remove_contact: "remove contact"
           edit_my_profile: "Edit my profile"
@@ -527,7 +527,6 @@ en:
           fullmonth_day: "%B %d"
           birthday: "%B %d"
           birthday_with_year: "%B %d %Y"
-
   conversations:
       index:
           message_inbox: "Message Inbox"
@@ -536,8 +535,9 @@ en:
           create_a_new_message: "create a new message"
           no_messages: "no messages"
       show:
-          reply: 'reply'
+          reply: "reply"
       new:
-          to: 'to'
-          subject: 'subject'
-          send: 'Send'
+          to: "to"
+          subject: "subject"
+          send: "Send"
+          no_results: "No Results Found"