From 76073d45ed86dae9a371b5c83a72406dbda61b30 Mon Sep 17 00:00:00 2001
From: matze <matze@v14705.1blu.de>
Date: Mon, 9 Apr 2012 00:25:08 +0200
Subject: [PATCH] ~FIX: changed the translate pattern inside notifier.rb:
 correct mail subject will be translated ~Translate: changed the mail contents
 of the invitation mail: no weird html string below the invitecode url.

- M
---
 app/mailers/notifier.rb        | 2 +-
 config/locales/diaspora/de.yml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/mailers/notifier.rb b/app/mailers/notifier.rb
index 5b5ea9ee6d..834bb6ec5e 100644
--- a/app/mailers/notifier.rb
+++ b/app/mailers/notifier.rb
@@ -40,7 +40,7 @@ class Notifier < ActionMailer::Base
     @invitation_code = invitation_code
 
     mail_opts = {:to => email, :from => AppConfig[:smtp_sender_address],
-                 :subject => I18n.t('notifier.invited!'),  
+                 :subject => I18n.t('notifier.invited_you', :name => @inviter.person.name),  
                  :host => AppConfig[:pod_uri].host}
 
     I18n.with_locale(locale) do
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index 0f450cf10a..82c37d95e4 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -488,7 +488,6 @@ de:
           Klick auf diesen Link um loszulegen
 
           %{invite_url}
-          <%= invite_code_url(@invitation_code)%>
 
 
           Alles Liebe,
@@ -1016,4 +1015,4 @@ de:
   welcome: "Willkommen!"
   will_paginate:
     next_label: "nächstes &raquo;"
-    previous_label: "&laquo; voriges"
\ No newline at end of file
+    previous_label: "&laquo; voriges"
-- 
GitLab