diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot index 1440243..35659f7 100644 --- a/app/Locale/cake.pot +++ b/app/Locale/cake.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2014-06-16 00:35+0200\n" +"POT-Creation-Date: 2014-06-16 01:17+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" diff --git a/app/Locale/cake_dev.pot b/app/Locale/cake_dev.pot index 63ca261..90716dc 100644 --- a/app/Locale/cake_dev.pot +++ b/app/Locale/cake_dev.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2014-06-16 00:35+0200\n" +"POT-Creation-Date: 2014-06-16 01:17+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" diff --git a/app/Locale/default.pot b/app/Locale/default.pot index 247908e..f003262 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2014-06-16 00:35+0200\n" +"POT-Creation-Date: 2014-06-16 01:17+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -651,10 +651,6 @@ msgstr "" msgid "dreamjob.regisration.active.link" msgstr "" -#: View/Emails/html/password_reset.ctp:2 -msgid "dreamjob.password.reset.link" -msgstr "" - #: View/Home/company.ctp:11 #: View/Home/home.ctp:22 msgid "dreamjob.registration.to" @@ -692,9 +688,7 @@ msgstr "" #: View/Job/application.ctp:134 #: View/Job/opening_edit.ctp:49 -#: View/Registration/company.ctp:41 #: View/Registration/password_replace.ctp:12 -#: View/Registration/worker.ctp:44 #: View/User/settings_account.ctp:88 #: View/User/settings_imageUpload.ctp:14 #: View/User/settings_isearch.ctp:60 @@ -906,6 +900,11 @@ msgstr "" msgid "dreamjob.addresse" msgstr "" +#: View/Registration/company.ctp:41 +#: View/Registration/worker.ctp:44 +msgid "dreamjob.save.registration" +msgstr "" + #: View/Registration/company.ctp:47 #: View/Registration/worker.ctp:50 msgid "dreamjob.registration.done.text" diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo index ba3578d..dbfefd6 100644 Binary files a/app/Locale/deu/LC_MESSAGES/default.mo and b/app/Locale/deu/LC_MESSAGES/default.mo differ diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index 6f06514..6ae4a28 100644 --- a/app/Locale/deu/LC_MESSAGES/default.po +++ b/app/Locale/deu/LC_MESSAGES/default.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2014-06-16 00:35+0200\n" +"POT-Creation-Date: 2014-06-16 01:09+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -206,11 +206,11 @@ msgstr "Passwörter stimmen nicht überein" #: Controller/RegistrationController.php:163 msgid "dreamjob.password_reset.send.success" -msgstr "Passwort wurde erfolgreich geändert" +msgstr "E-Mail wurde an Sie versendet" #: Controller/RegistrationController.php:166 msgid "dreamjob.password_reset.send.error" -msgstr "Passwort konnte nicht geändert werden" +msgstr "E-Mail konnte nicht an Sie versendet werden" #: Controller/RegistrationController.php:183 msgid "dreamjob.password_replace.notFound" @@ -621,8 +621,7 @@ msgid "dreamjob.message" msgstr "Nachrichten" #: View/Job/application.ctp:134 View/Job/opening_edit.ctp:49 -#: View/Registration/company.ctp:41 View/Registration/password_replace.ctp:12 -#: View/Registration/worker.ctp:44 View/User/settings_account.ctp:88 +#: View/Registration/password_replace.ctp:12 View/User/settings_account.ctp:88 #: View/User/settings_imageUpload.ctp:14 View/User/settings_isearch.ctp:60 #: View/User/settings_pages.ctp:113 msgid "dreamjob.save" @@ -813,6 +812,10 @@ msgstr "Internetseite" msgid "dreamjob.addresse" msgstr "Adresse" +#: View/Registration/company.ctp:41 View/Registration/worker.ctp:44 +msgid "dreamjob.save.registration" +msgstr "anmelden" + #: View/Registration/company.ctp:47 View/Registration/worker.ctp:50 msgid "dreamjob.registration.done.text" msgstr "" @@ -838,7 +841,7 @@ msgstr "Passwort zurücksetzen" #: View/Registration/password_reset.ctp:11 msgid "dreamjob.password.reset.send" -msgstr "Passwort zurücksetzen" +msgstr "Passwort ändern" #: View/Registration/worker.ctp:19 View/User/settings_account.ctp:46 msgid "dreamjob.worker" diff --git a/app/Model/User.php b/app/Model/User.php index a0f2215..576c699 100755 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -41,12 +41,12 @@ class User extends AppModel { $Email->template('delete_order'); $key = substr($data['User']['code'],2); $Email->viewVars(array('data'=>$data,'key'=>$key)); - return $Email->send(); - } - public static function sendPasswortResetMail($data){ + return $Email->send(); + } + public static function sendPasswortResetMail($data){ $Email = new CakeEmail('dreamjobMain'); $Email->to($data['User']['mail']); - $Email->subject('Welcome to our really cool thing'); + $Email->subject('Passwort zurücksetzen'); $Email->template('password_reset'); $key = substr($data['User']['code'],2); $Email->viewVars(array('data'=>$data,'key'=>$key)); diff --git a/app/View/Emails/html/password_reset.ctp b/app/View/Emails/html/password_reset.ctp index 2333a5d..0abaf67 100644 --- a/app/View/Emails/html/password_reset.ctp +++ b/app/View/Emails/html/password_reset.ctp @@ -1,4 +1,23 @@ + +Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen
+ Html->link(__('dreamjob.password.reset.link'),array('controller' => 'registration', 'action' => 'password_replace','code'=>$key, - '?'=>array('mail'=>$data['User']['mail']),'full_base' => true) ); + $url = $this->Html->url(array('controller'=>'registration','action'=>'password_replace','code'=>$key,'?'=>array('mail'=>$data['User']['mail'])),true); + echo $this->Html->link($url,$url); ?> +

+Bei Fragen wenden Sie sich gerne an unser Team:
+service@dream-job.eu

+Jetzt noch mehr Funktionen!
+ +Mit unserem dreamJOB Premium-Account
+hier mehr infos

+ +Mit freundlichen Grüßen
+Ihr dreamJOB Team
+





+Ausgezeichnete Leistungen, bester Service:
+Herzlich willkommen bei der DAK-Gesundheit.
+

+AGBs
+Impressum diff --git a/app/View/Emails/text/password_reset.ctp b/app/View/Emails/text/password_reset.ctp index 41f88d0..5500505 100644 --- a/app/View/Emails/text/password_reset.ctp +++ b/app/View/Emails/text/password_reset.ctp @@ -1,4 +1,31 @@ + +Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen + Html->url(array('controller'=>'registration','action'=>'password_replace','code'=>$key, '?'=>array('mail'=>$data['User']['mail'])),true); ?> + + +--- +Bei Fragen wenden Sie sich gerne an unser Team: +service@dream-job.eu + +Jetzt noch mehr Funktionen! +Mit unserem dreamJOB Premium-Account +https://dream-job.eu/premiumAccount + +Mit freundlichen Grüßen +Ihr dreamJOB Team + + + + + + + +Ausgezeichnete Leistungen, bester Service: +Herzlich willkommen bei der DAK-Gesundheit. + +https://dream-job.eu/agb +https://dream-job.eu/impressum diff --git a/app/View/Registration/company.ctp b/app/View/Registration/company.ctp index cb5b2b9..9eee162 100644 --- a/app/View/Registration/company.ctp +++ b/app/View/Registration/company.ctp @@ -38,7 +38,7 @@ Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
- Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(__('dreamjob.save.registration'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
- Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(__('dreamjob.save.registration'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>