From 615a1b5c0d647817727778bbf0cc35b542c97ec6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Tue, 12 Aug 2014 11:37:37 +0200 Subject: [PATCH] t#1: Mailtexte --- .gitignore | 1 + app/Locale/cake.pot | 2 +- app/Locale/cake_dev.pot | 2 +- app/Locale/default.pot | 21 ++++++------- app/Locale/deu/LC_MESSAGES/default.mo | Bin 16329 -> 16262 bytes app/Locale/deu/LC_MESSAGES/default.po | 21 +++++++------ app/Model/User.php | 3 +- app/View/Elements/user_worker_cv_edit.ctp | 2 +- app/View/Emails/html/delete_order.ctp | 28 ++++++++++++++++-- app/View/Emails/html/job_application.ctp | 3 ++ .../html/job_application_msg_company.ctp | 2 ++ app/View/Emails/html/password_reset.ctp | 4 --- app/View/Emails/text/delete_order.ctp | 27 +++++++++++++++++ app/View/Emails/text/job_application.ctp | 6 +--- app/View/Emails/text/password_reset.ctp | 4 --- 15 files changed, 83 insertions(+), 43 deletions(-) diff --git a/.gitignore b/.gitignore index 6ba5023..07e38c1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ /tags upload.sh upload-produktiv.sh +.*.swp *daten.sql *~ diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot index 35659f7..a86339e 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 01:17+0200\n" +"POT-Creation-Date: 2014-06-16 11:01+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 90716dc..c905661 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 01:17+0200\n" +"POT-Creation-Date: 2014-06-16 11:01+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 f003262..d05fbad 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 01:17+0200\n" +"POT-Creation-Date: 2014-06-16 11:01+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -591,7 +591,14 @@ msgid "dreamjob.between.till" msgstr "" #: View/Elements/user_worker_cv_edit.ctp:183 -msgid "dreamjob.settings.save" +#: View/Job/application.ctp:134 +#: View/Job/opening_edit.ctp:49 +#: 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" msgstr "" #: View/Elements/user_worker_header.ctp:22;23 @@ -686,16 +693,6 @@ msgstr "" msgid "dreamjob.message" msgstr "" -#: View/Job/application.ctp:134 -#: View/Job/opening_edit.ctp:49 -#: 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" -msgstr "" - #: View/Job/applicationCompany_list.ctp:13 msgid "dreamjob.application.archiv.activ" msgstr "" diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo index 522507fdf5582fed63f010ca0bf7cbf5999679eb..ad6aef8812f9db756c60c25b4a32ed8e0d4c2eab 100644 GIT binary patch delta 3873 zcmXZe3vAWZ9l-H(fv$yOAD0%XEpRXLD0G%WJ3tFaP+W8wQ$U@{!)XRA*$iX>8YlaY zWfdlmg@J95v1-g>g zqZiQBUPt?v5v}!E?A=l%IpHC6oF~u>wPIq2=PB6m*T@**1Qz3mX#F)b;$ot4Z>x}7 zp$-l3PJZma5KZkjqFZqo*S|tDdIB@}5!(L7o5;T%nh19!&cRW*3T^OXG~(Z&sXvBJ z{63mme_VMDIza=vfP2vuFGa^$jeNp3e%y)!Xkdq{$-f;hal=zuL~AFgLX#1!nUFYooE`m zB@dvfT!w68SceX@6Ion1h2{fE(vtV18y=g^F_p$j^WuK2HLCa$AfTQY|H zXDHkC&a(UomN2i}bax(8Poe;3Wb$LP3apU!Vh z7Tw}0=oTe&DH!2OG}Y^{73nh%tXQl!TY&4qE+IT%JUf+%eG!I?KB6P(|(8ISJ z8}U16rVrw6cm)0X6ABtaXvQpNaRGW*5_Eu9~(&tlDjkcSD_P?`<{8v!8iyH(L9zkCqo6t<`MFV&v)*nUQqMGxYHlt6;Z1hdI0(~krpf8{{tiZR?0DBS&Gbmg^J5HLEpKt*h`C>HEmC=@X|4B5} z&)`ga7TL9M5W&~%_Fd>dV17na~Z&_nq@?1KY&Bn+?=ZI?k8I2qlV$7B6QO#A%*gn}#GhvTpv zUD>(l-_VZN&6me0sN_!X`nMv@RZ(RTlh^|jOUE1iOF*-SLh&mr%)@I_3jDXgX7 zggej`?n5L09eT?Dga&v9{o~Y)!|@^x#Xh&^`)AO0_2?;YK(}rdy0H7vOn(b)M=&M5 zr}t}Iyw3N0ZcWMDRCoLFlD?^ebKH0**IhcM@-(HjeEqkIuiJSdS5>w?buzcJ?B>*| z+~KmuR8Q^`%3Zl^d2{MwZb5lnD&)Rfo}~Vg>z}Spoym<#4^Lgl%}O_?j_1~->r!Xi n_onw&wlA+;ohq0x;kJee?U%=HE>F#EZ*9KTr~SF<^{M{@tsI>D delta 3897 zcmXZe3vAWZ9l-JPrxa)@ZEtCLv`8;6OKGjN<)L&?gUn$DLx+ZiMIiWC*o1&Y#kp~P zAapu0%MELj(Glk~^OXe(8xEKGWJ)BaQ-lhLbr#nV=a3n2i@5K%_mJEBIsbG1|8su7 z-#P!QTQhHFG9Q!;-VylM$KN>q77PucISJwRVtYflVq^%z@JcMj`B;KWu^ey43fvUO zw_}RyU08;@u?Sy7KB1d0*XcvXGhq<3I8cG3uoj*8D!wkk8?g#E;sksQt8sU{?#4-6 zpTkNVO*9j+3CG}#I2PBT<8A1?PvCgg4=>Y5)A1pCV?q=zP=zkof=+Z3a!a@it-#N5 z1nxvD^GqB+5XZaGz(F*Orj1TOm;f-%1bA{759515dg+yV*Rp{Q< zB154C`Ggzz^7(aWX&;F`jpMogD_YUhn8qPQ=lwO6)ZYgd&@mZT;}qN$Z+IS!_z+t9 zUUcE}XlYCNGV^+LfveC2R-qYhLKk`z`GjZqaw`s^f%Q~Te;>R+ho^K5ce}t8bmDpF z1K&l*Z;jV?L?1#Y>OdF%Ba&ozJKB#foJW>!aW#5&8qkW)%g`{hMd*X8(ExsemVQSZ ze+pgTMKrT_(E$5#;BX}oWlAD|OFi0npq9Noef(Zkgn`v<3U0ac?Fn2z4xip-M<%V~J1?m{zaLl@YI z#1Qr)pKz2f1G<1tkmB7m^Lq5TRob^LK;Tk|CI#7=; zv>4rz+t5(Y(ux`NgTua;SV&@ z_%>Slf1@`J;b|9`jApU`?O%lkxET$o9X(8Y(F(kR9FA#~vdXhpt{o}Eo-=Iv;J&!Lt4 z3tFM$Q>nilXXvnmLu+$Zpr>^b8hH~s@zv;qtIz<}qZMpJ?|%-965b{p#`PQ1auw)C zGyeo<;+OaxygWmFhtk*_-HI-_9S7sCc>P;6fPLu1e?tR49_`2BT%SkB^XhX87oioH zh|W73t<*wvt1~NUxK}?$BkV*={(E%7!)V4m=mY)8Hip4$JjWr_p$lG*>`GW3`yW7` z|6O!17I6I%7UChy^Zh@PYlI%O5+{)ghQ8=0(SFRQ|4h6-i%xV7UFaejXdx%mOe^tv ztiv?^H1_`*2NJ{*-~Yoj1{Ov$=tB?Lh|6<7EH!9lTF}52qa|GuuWyOhx1j;ui_W(d z&3HQwydBug^|R=Fr*IDIhqE+1g!R)|1Q+52+=3pKr_c#b;0*jMUQce!jn78TTUd*3 zQ9G969vp$MqHk9>dT9TN1~{mR`kPT94K2bH7NZqN$Ll%KMd$)6(EIN}C%PBEfe)gU zc?r$@2s+;>9D--jvvL7_K53@@*V4$NE=IN(Z@^n|0{#iz^AqTUAE6VS!6N(|o#^Y> zpHLpp!mwyL8bBILunB#O=Ew1sGpN54{D_WnT#E!39zcIU_Mw${7Y*QFar`{;s~V=U zKUQD~y7$Yl3|FIX$(`uywiA6@y3noe!E*c}L&FFQXYqe8I1YXACUn6qXylKgfp$iB z#s0_9Qt!t3cmNymB6=pK&(1Bp9IfzuXrLWvWiwC2fv2M{qrYf9=oWm1W>kGeE|Vs7 zudhV|+=~8wJcc8251Pjr!c7ow#e!7Ig2L#RaqTZWam1`B-ux6m+??Py8b;|-l? zM*Go2^A>uz`q2`8fo5nqieWT*C@;l9*o+1^3%&1KXo4%yt$EmS-~YWdEb;4TrpIs^ zzK_1Y`EzrQL?4`hR^Z!cMK<6XydNn_ID_6dWnON42^Mg@5>0ds8t5IEsiKjg!H-_} z6?%OLUHCMb>3`4+zD7^`sMcJd}rLh{P;3fD?^!c07gf^h3eIpuh8=7E8D=(QP ze>L7{RG#9s{2k=)NOnW<(&U4#*NgL#{8M!FWe=CsR2-+ZjX(e0&7a$PG+R*mNOCN@ zqjXZzlYODIIr%vIDed>OsZ>ky_w3?SUDBJqCzVM)%zl}wN={@e%Bqu(vNOwClJ~M3 z%IcDnU7cmmS7du@Ms{5@_5LJ(dgGkN*{`+C-$B_uGsks(Z(c+4e}+k) AhX4Qo diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index 5bf8c36..f536b5b 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 01:17+0200\n" +"POT-Creation-Date: 2014-06-16 11:01+0200\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -532,9 +532,12 @@ msgstr " " msgid "dreamjob.between.till" msgstr "bis" -#: View/Elements/user_worker_cv_edit.ctp:183 -msgid "dreamjob.settings.save" -msgstr "Änderung wurde gespeichert" +#: View/Elements/user_worker_cv_edit.ctp:183 View/Job/application.ctp:134 +#: View/Job/opening_edit.ctp:49 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" +msgstr "Speichern" #: View/Elements/user_worker_header.ctp:22;23 View/User/company.ctp:30;31 #: View/User/settings_imageUpload.ctp:7 @@ -616,13 +619,6 @@ msgstr "Anschreiben" msgid "dreamjob.message" msgstr "Nachrichten" -#: View/Job/application.ctp:134 View/Job/opening_edit.ctp:49 -#: 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" -msgstr "speichern" - #: View/Job/applicationCompany_list.ctp:13 msgid "dreamjob.application.archiv.activ" msgstr "aktuelle Bewerbungen" @@ -1153,6 +1149,9 @@ msgstr "" msgid "Debug setting does not allow access to this url." msgstr "" +#~ msgid "dreamjob.settings.save" +#~ msgstr "Änderung wurde gespeichert" + #~ msgid "dreamjob.password.reset.link" #~ msgstr "Passwort zurücksetzen" diff --git a/app/Model/User.php b/app/Model/User.php index c8a852a..bdb2fd2 100755 --- a/app/Model/User.php +++ b/app/Model/User.php @@ -37,10 +37,11 @@ class User extends AppModel { public static function sendDeleteMail($data){ $Email = new CakeEmail('dreamjobMain'); $Email->to($data['User']['mail']); - $Email->subject('Welcome to our really cool thing'); + $Email->subject('Profillöschung'); $Email->template('delete_order'); $key = substr($data['User']['code'],2); $Email->viewVars(array('data'=>$data,'key'=>$key)); + $Email->attachments(array('dak.jpg' => WWW_ROOT.DS.'mail'.DS.'dak.jpg')); return $Email->send(); } public static function sendPasswortResetMail($data){ diff --git a/app/View/Elements/user_worker_cv_edit.ctp b/app/View/Elements/user_worker_cv_edit.ctp index f9af1ef..d14da7c 100644 --- a/app/View/Elements/user_worker_cv_edit.ctp +++ b/app/View/Elements/user_worker_cv_edit.ctp @@ -180,7 +180,7 @@ echo $this->Html->link($text,array('controller'=>'user','action'=>'profil'),arra } ?>
- Form->button(' '.__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(' '.__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
Form->end(); diff --git a/app/View/Emails/html/delete_order.ctp b/app/View/Emails/html/delete_order.ctp index de28f76..7630ad6 100644 --- a/app/View/Emails/html/delete_order.ctp +++ b/app/View/Emails/html/delete_order.ctp @@ -1,4 +1,26 @@ +Sehr geehrter dreamJOB Kunde,
+
+ihr Profil wurde soeben gesperrt und wird unter Berücksichtigung der AGBs gelöscht.
+
+Innerhalb der nächsten 12 Stunden haben Sie die Möglichkeit, die Profillöschung Rückgängig zu machen.
+
+Sofern Sie dies möchten, klicken Sie hierfür auf den folgenden Link:
+ Html->link(__('dreamjob.regisration.active.link'),array('controller' => 'registration', 'action' => 'active','code'=>$key, - '?'=>array('mail'=>$data['User']['mail']),'full_base' => true) ); -?> + $url = $this->Html->url(array('controller'=>'registration','action'=>'active','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

+ +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/html/job_application.ctp b/app/View/Emails/html/job_application.ctp index a31c603..fd6d5b5 100644 --- a/app/View/Emails/html/job_application.ctp +++ b/app/View/Emails/html/job_application.ctp @@ -8,10 +8,13 @@ Sehen Sie diese unter folgendem Link ein:
?>

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

+ + Mit unserem dreamJOB Premium-Account
hier mehr infos

+*/ ?> Mit freundlichen Grüßen
Ihr dreamJOB Team
diff --git a/app/View/Emails/html/job_application_msg_company.ctp b/app/View/Emails/html/job_application_msg_company.ctp index 492fc8e..6d10a3a 100644 --- a/app/View/Emails/html/job_application_msg_company.ctp +++ b/app/View/Emails/html/job_application_msg_company.ctp @@ -8,9 +8,11 @@ Sehe diese unter folgendem Link ein:


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

+ Mit unserem dreamJOB Premium-Account
hier mehr infos

+*/ ?> Mit freundlichen Grüßen
Ihr dreamJOB Team






diff --git a/app/View/Emails/html/password_reset.ctp b/app/View/Emails/html/password_reset.ctp index 0abaf67..566f402 100644 --- a/app/View/Emails/html/password_reset.ctp +++ b/app/View/Emails/html/password_reset.ctp @@ -8,10 +8,6 @@ Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen


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
diff --git a/app/View/Emails/text/delete_order.ctp b/app/View/Emails/text/delete_order.ctp index 66b9ea8..01950be 100644 --- a/app/View/Emails/text/delete_order.ctp +++ b/app/View/Emails/text/delete_order.ctp @@ -1,4 +1,31 @@ +Sehr geehrter dreamJOB Kunde, + +ihr Profil wurde soeben gesperrt und wird unter Berücksichtigung der AGBs gelöscht. + +Innerhalb der nächsten 12 Stunden haben Sie die Möglichkeit, die Profillöschung Rückgängig zu machen. + +Sofern Sie dies möchten, klicken Sie hierfür auf den folgenden Link: Html->url(array('controller'=>'registration','action'=>'active','code'=>$key, '?'=>array('mail'=>$data['User']['mail'])),true); ?> + + +--- +Bei Fragen wenden Sie sich gerne an unser Team: +service@dream-job.eu + +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/Emails/text/job_application.ctp b/app/View/Emails/text/job_application.ctp index d80a6c6..7fab776 100644 --- a/app/View/Emails/text/job_application.ctp +++ b/app/View/Emails/text/job_application.ctp @@ -9,10 +9,6 @@ Sehen Sie diese unter folgendem Link ein: 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 @@ -26,4 +22,4 @@ Ausgezeichnete Leistungen, bester Service: Herzlich willkommen bei der DAK-Gesundheit. https://dream-job.eu/agb -https://dream-job.eu/impressum \ No newline at end of file +https://dream-job.eu/impressum diff --git a/app/View/Emails/text/password_reset.ctp b/app/View/Emails/text/password_reset.ctp index 5500505..80d4476 100644 --- a/app/View/Emails/text/password_reset.ctp +++ b/app/View/Emails/text/password_reset.ctp @@ -11,10 +11,6 @@ Klicken Sie auf folgenden Link um Ihr Passwort zurückzusetzen 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