From e759b2098f3fdb2b9e384a7a13dd0395e003e5ae Mon Sep 17 00:00:00 2001
From: iBart van Irsel <bart@30.nl>
Date: Thu, 27 Jun 2013 16:09:55 +0200
Subject: [PATCH] ready for 3.1

---
 README.md                     |  6 -----
 _config.php                   |  4 ++--
 code/SendFriendController.php |  5 ++--
 code/SendFriendDecorator.php  |  1 +
 lang/_manifest_exclude        |  0
 lang/de.yml                   | 20 ++++++++++++++++
 lang/de_DE.php                | 43 ++++++++++++++++-------------------
 lang/en.yml                   | 20 ++++++++++++++++
 lang/nl.yml                   | 20 ++++++++++++++++
 9 files changed, 85 insertions(+), 34 deletions(-)
 create mode 100644 lang/_manifest_exclude
 create mode 100644 lang/de.yml
 create mode 100755 lang/en.yml
 create mode 100755 lang/nl.yml

diff --git a/README.md b/README.md
index ee215c9..36594ba 100755
--- a/README.md
+++ b/README.md
@@ -11,10 +11,6 @@ Requirements
 
 Check 2.4 branch for older version of silverstripe 
 
-Documentation
--------------
-[GitHub Wiki](http://wiki.github.com/hubertusanton/silverstripe-sendfriend)
-
 Installation Instructions
 -------------------------
 
@@ -27,8 +23,6 @@ Usage
 This is a very simple module for adding a Send a friend functionality to your Silverstripe website.
 In The overall Page.ss you can add $SendFriendLink to create the link to the sendfriend form greybox popup.
 
-Known Issues
-------------
 
 ## License
 
diff --git a/_config.php b/_config.php
index 9b8b91d..d845d11 100755
--- a/_config.php
+++ b/_config.php
@@ -15,5 +15,5 @@
 Object::add_extension('Page_Controller', 'SendFriendDecorator');
 //
 
-//if you would like to use a jquery functionality, uncomment this in your config
-#SendFriendDecorator::$JSMode = 'Jquery';
+// if you would like to use a jquery functionality, uncomment this in your config
+// SendFriendDecorator::$JSMode = 'Jquery';
diff --git a/code/SendFriendController.php b/code/SendFriendController.php
index d9d2953..ac0d1f8 100755
--- a/code/SendFriendController.php
+++ b/code/SendFriendController.php
@@ -1,7 +1,7 @@
 <?php 
 
-class SendFriendController extends Page_Controller
-{
+class SendFriendController extends Page_Controller {
+	
 	const URLSegment = SENDFRIEND_DIR;
 
 	public function getURLSegment() {
@@ -100,7 +100,6 @@ function doSendFriend($data, $form)	{
 		$this->spamCheck($toemail);
 		$this->spamCheck($youremail);
 
-
 		$from = $yourname . '<' . $youremail . '>';
 		$to = $toname . '<' . $toemail . '>';
 		
diff --git a/code/SendFriendDecorator.php b/code/SendFriendDecorator.php
index ec37649..690d1a6 100755
--- a/code/SendFriendDecorator.php
+++ b/code/SendFriendDecorator.php
@@ -8,6 +8,7 @@ class SendFriendDecorator extends Extension {
 	function SendFriendLink() {
 
 		if (self::$JSMode == 'Jquery') {
+			Requirements::javascript(FRAMEWORK_DIR . '/thirdparty/jquery/jquery.min.js');
 			Requirements::javascript(SENDFRIEND_DIR . '/thirdparty/jquery.simplemodal/jquery.simplemodal.1.4.2.min.js');
 			Requirements::javascript(SENDFRIEND_DIR . '/thirdparty/jquery.simplemodal/popup.js');
 			Requirements::css(SENDFRIEND_DIR . '/thirdparty/jquery.simplemodal/css/basic.css', 'screen');
diff --git a/lang/_manifest_exclude b/lang/_manifest_exclude
new file mode 100644
index 0000000..e69de29
diff --git a/lang/de.yml b/lang/de.yml
new file mode 100644
index 0000000..954594d
--- /dev/null
+++ b/lang/de.yml
@@ -0,0 +1,20 @@
+de:
+  SendFriend:
+    THANKYOU: 'Vielen Dank'
+    FORM_INTRO_TITLE: 'Sende diese Seite einem Freund.'
+    FORM_INTRO_TEXT: 'Bitte fülle das Formular aus.'
+    SENT_TEXT: 'Die Nachricht wurde versendet.'
+    BACKTO_PAGE: 'Zurück zur Seite.'
+    SENDFRIENDLINK: 'Seite empfehlen'
+    FORM_LABEL_YOURNAME: 'Ihr Name'
+    FORM_LABEL_YOUREMAIL: 'Ihre Email-Adresse'
+    FORM_LABEL_TONAME: 'Name des Empfänger'
+    FORM_LABEL_TOMAIL: 'Email des Empfänger'
+    FORM_LABEL_REMARKS: 'Bemerkungen'
+    FORM_LABEL_COPYSELF: 'Kopie an mich versenden'       
+    FORM_LABEL_SENDBUTTON: 'Versenden'
+    SUBJECT: 'Interessante Seite auf '
+    DEAR: 'Liebe(r) '
+    MESSAGEFROM: 'Nachricht von '  
+    COPYOFMESSAGE: '---- Kopie der Nachricht von '
+    TEXT: ' würde Dir gerne folgende Seite empfehlen: '    
\ No newline at end of file
diff --git a/lang/de_DE.php b/lang/de_DE.php
index e6cf341..c93ed03 100644
--- a/lang/de_DE.php
+++ b/lang/de_DE.php
@@ -1,23 +1,20 @@
-<?php
-global $lang;
-
-$lang['de_DE']['SendFriend']['THANKYOU'] = 'Vielen Dank';
-$lang['de_DE']['SendFriend']['FORM_INTRO_TITLE'] = 'Sende diese Seite einem Freund.';
-$lang['de_DE']['SendFriend']['FORM_INTRO_TEXT'] = 'Bitte fülle das Formular aus.';
-$lang['de_DE']['SendFriend']['SENT_TEXT'] = 'Die Nachricht wurde versendet.';
-$lang['de_DE']['SendFriend']['BACKTO_PAGE'] = 'Zurück zur Seite.';
-$lang['de_DE']['SendFriend']['SENDFRIENDLINK'] = 'Seite empfehlen';
-
-$lang['de_DE']['SendFriend']['FORM_LABEL_YOURNAME'] = 'Ihr Name';
-$lang['de_DE']['SendFriend']['FORM_LABEL_YOUREMAIL'] = 'Ihre Email-Adresse';
-$lang['de_DE']['SendFriend']['FORM_LABEL_TONAME'] = 'Name des Empfänger';
-$lang['de_DE']['SendFriend']['FORM_LABEL_TOMAIL'] = 'Email des Empfänger';
-$lang['de_DE']['SendFriend']['FORM_LABEL_REMARKS'] = 'Bemerkungen';
-$lang['de_DE']['SendFriend']['FORM_LABEL_COPYSELF'] = 'Kopie an mich versenden';
-$lang['de_DE']['SendFriend']['FORM_LABEL_SENDBUTTON'] = 'Versenden';
-
-$lang['de_DE']['SendFriend']['SUBJECT'] = 'Interessante Seite auf ';
-$lang['de_DE']['SendFriend']['DEAR'] = 'Liebe(r) ';
-$lang['de_DE']['SendFriend']['MESSAGEFROM'] = 'Nachricht von ';
-$lang['de_DE']['SendFriend']['COPYOFMESSAGE'] = '---- Kopie der Nachricht von ';
-$lang['de_DE']['SendFriend']['TEXT'] = ' würde Dir gerne folgende Seite empfehlen: ';
+de:
+  SendFriend:
+    THANKYOU: 'Vielen Dank'
+    FORM_INTRO_TITLE: 'Sende diese Seite einem Freund.'
+    FORM_INTRO_TEXT: 'Bitte fülle das Formular aus.'
+    SENT_TEXT: 'Die Nachricht wurde versendet.'
+    BACKTO_PAGE: 'Zurück zur Seite.'
+    SENDFRIENDLINK: 'Seite empfehlen'
+    FORM_LABEL_YOURNAME: 'Ihr Name'
+    FORM_LABEL_YOUREMAIL: 'Ihre Email-Adresse'
+    FORM_LABEL_TONAME: 'Name des Empfänger'
+    FORM_LABEL_TOMAIL: 'Email des Empfänger'
+    FORM_LABEL_REMARKS: 'Bemerkungen'
+    FORM_LABEL_COPYSELF: 'Kopie an mich versenden'       
+    FORM_LABEL_SENDBUTTON: 'Versenden'
+    SUBJECT: 'Interessante Seite auf '
+    DEAR: 'Liebe(r) '
+    MESSAGEFROM: 'Nachricht von '  
+    COPYOFMESSAGE: '---- Kopie der Nachricht an '
+    TEXT: ' würde Dir gerne folgende Seite empfehlen: '    
\ No newline at end of file
diff --git a/lang/en.yml b/lang/en.yml
new file mode 100755
index 0000000..7684dc3
--- /dev/null
+++ b/lang/en.yml
@@ -0,0 +1,20 @@
+en:
+  SendFriend:
+    THANKYOU: 'Thank you'
+    FORM_INTRO_TITLE: 'Send this page to a friend'
+    FORM_INTRO_TEXT: 'Please fill out the form.'
+    SENT_TEXT: 'Your message has been sent.'
+    BACKTO_PAGE: 'Back to the page.'
+    SENDFRIENDLINK: 'Send to friend'
+    FORM_LABEL_YOURNAME: 'Your name'
+    FORM_LABEL_YOUREMAIL: 'Your e-mail address'
+    FORM_LABEL_TONAME: 'Name receiver'
+    FORM_LABEL_TOMAIL: 'E-mail receiver'
+    FORM_LABEL_REMARKS: 'Remarks'
+    FORM_LABEL_COPYSELF: 'Copy to self'       
+    FORM_LABEL_SENDBUTTON: 'Send'
+    SUBJECT: 'Interseting page on '
+    DEAR: 'Dear '
+    MESSAGEFROM: 'Message from '  
+    COPYOFMESSAGE: '---- Copy of message to '
+    TEXT: ' would like to show you the following page: '    
\ No newline at end of file
diff --git a/lang/nl.yml b/lang/nl.yml
new file mode 100755
index 0000000..e507afa
--- /dev/null
+++ b/lang/nl.yml
@@ -0,0 +1,20 @@
+nl:
+  SendFriend:
+    THANKYOU: 'Bedankt'
+    FORM_INTRO_TITLE: 'Verstuur deze pagina naar een vriend.'
+    FORM_INTRO_TEXT: 'Vul aub onderstaand formulier in.'
+    SENT_TEXT: 'Uw bericht is verzonden.'
+    BACKTO_PAGE: 'Terug naar de pagina.'
+    SENDFRIENDLINK: 'Stuur door'
+    FORM_LABEL_YOURNAME: 'Uw naam'
+    FORM_LABEL_YOUREMAIL: 'Uw e-mail adres'
+    FORM_LABEL_TONAME: 'Naam ontvanger'
+    FORM_LABEL_TOMAIL: 'E-mail ontvanger'
+    FORM_LABEL_REMARKS: 'Opmerkingen'
+    FORM_LABEL_COPYSELF: 'Kopie naar jezelf versturen'       
+    FORM_LABEL_SENDBUTTON: 'Versturen'
+    SUBJECT: 'Interessante pagina op '
+    DEAR: 'Beste '
+    MESSAGEFROM: 'Bericht van '  
+    COPYOFMESSAGE: '---- Kopie van bericht aan '
+    TEXT: ' wil je wijzen op de volgende pagina: '    
\ No newline at end of file