From 0f4f14b56e53f5684ee6839c7576103100bb1d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Tue, 23 Sep 2014 15:03:35 +0200 Subject: [PATCH] #100 --- app/Controller/JobController.php | 5 +++-- app/Locale/default.pot | 22 +++++++++++++++++++ app/Locale/deu/LC_MESSAGES/default.mo | Bin 16793 -> 17196 bytes app/Locale/deu/LC_MESSAGES/default.po | 27 ++++++++++++++++++++++-- app/View/Elements/navbar.ctp | 2 +- app/View/Job/applicationWorker_list.ctp | 2 +- app/View/Job/application_send_ext.ctp | 2 +- app/View/Pdf/application_ext.ctp | 6 +++--- 8 files changed, 56 insertions(+), 10 deletions(-) diff --git a/app/Controller/JobController.php b/app/Controller/JobController.php index 4bf7b7c..e67daca 100644 --- a/app/Controller/JobController.php +++ b/app/Controller/JobController.php @@ -413,13 +413,14 @@ class JobController extends AppController { $pdf = $view->render('/Pdf/application_ext','pdf'); $Email = new CakeEmail('dreamjobMain'); - + $Email->from(array('noreply@dream-job.eu'=> $w['AppUser']['first_name'] .' '. $w['AppUser']['last_name'])); $Email->to($this->request->data['DreamjobUser']['mail']); + $Email->replyTo(array($w['User']['mail'])); $Email->bcc(array($w['User']['mail'])); $Email->subject('Bewerbung von '. $w['AppUser']['first_name'] .' '. $w['AppUser']['last_name']); $Email->template('job_application_ext'); $Email->viewVars(array('w'=>$w)); - $Email->attachments(array('filename.pdf'=>array('data' =>$pdf,'mimetype' => 'application/pdf'))); + $Email->attachments(array(__('dreamjob.applications.extern.filename.pdf')=>array('data' =>$pdf,'mimetype' => 'application/pdf'))); if ($Email->send()) { $this->MiconwareSession->setFlash(__('dreamjob.application.send.success'), 'flash', array('alert' => 'success')); diff --git a/app/Locale/default.pot b/app/Locale/default.pot index e9ef0bb..a2dd5ef 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -733,6 +733,28 @@ msgstr "" msgid "dreamjob.application.extern" msgstr "" +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.pdf" +msgstr "" + + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.why" +msgstr "" + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.to.doing" +msgstr "" + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.title" +msgstr "" + + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.filename.pdf" +msgstr "" + #: View/Job/application_send.ctp:13 msgid "dreamjob.application.extern.to" msgstr "" diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo index 620f6c4ba519c889bb43f93cce70354fe8643320..335a38fbface8a0939fdaafc903106e0e73a7180 100644 GIT binary patch delta 5414 zcmYk=3tZLZ9mnwpF)kr;Q$SHUUQj_XP0Cv;Vt8w&d8L*!zym`R9fH^9k(j2dNy?nL z6g6#@HE#&b%QP=Tr-YZG+d@e#)6kYRx4q`l`h5TAq4t0AJMZUt{{QFx{Liu075lum z%*Rt7-gJ%OxQ*N5XXfzH5|^Xymth$0#Be-< z&9D|D@G7dGe|hhFOgOc5BMu|6A9Bx(#kT0i7%ay2xDjLVh|OQcj^ur*+#0)J2TVcL zb7NO5Le<-jYUdQTGah4ZljuZ2P?Yz9o)}GjEVjZNRKvxn0hM7pJcur=v*q8Qo^MTM zb(DnaXacIexqL8IQ-WH-w=kIgO$7-p-7)(>t$m;YHG_MorHrI?`Y`brj6+Zzj^U#@ z=Ahb{k9uwe@@F>l!5qy2)Y6|vP3TMXDDf~K&K95==!YsF#fK`mQCsp7s-d;0CEkI0 z{v7JLYp9OD#UPAg^t#^>HQ*%F*+@a=WG2M0{tUv*q(BY4j9TKY)}yGUzJglPZ_$OZ zJgn!F`Ox!IP+PbN<8Tx5XR7$nfImSk{XJC2p;V$N6W^Bg*UVEXPzTSVX0QM?<5j4J zeut`X47C*>qXzahs$Liwo$_9&4hEsxos4=u*WO=j^RHOTJS6xtyZKPZXHhG1)7pgA z)o~lt9`{8Zp5dq^os6298&z)+Y5;3cOTWY3Ka6Vs0%~Gkpa$q^;v7Zy)S+hd05#(l@!kQ%p=L1H=F?CU$w%ibp!R+6{}GlUqUU>T~vkW?z~by{JLQP`6QN2D>D!^h z(WrqXpthvD%@48pp{N0+q1wwtO*j`l;Uo%4^v2~Fh6k}f)}T&xAU6kK9Ja@F)L|>e zaNLJUSZ(t@WOTm;#^Wf|Ru!NoT7o(Qo053{^+x z^HKDo@_1AS15ouQq1s8qC-4Pqfg4aW--FIXA7lOfD5#-8r~d+~fqEQ?S5N~>c$|N& zU(;MO1Gw)Yp}h|2<9!WdQ4cNmr`uXhEyqxL=twN-;rZ_7B0M9%^edM#coI*uL{TsW zHPS-V(k`*(%dBOnZ^TN}7JP)7(Ko1>gm6N&*PT%-l8O2Pnt>5mf|}44)bkY>O8=&s zL`w=Tqh|O|YinB5QVzjxn1y;hSEIfkcA;jz7qt?VsFkcjo$}kLQ+^*?VbDN+*f0)b zumKbG{`(E`jw}gVlOKj!x^&b`a#1T%VDB$P&1em_!FNz+rV6!!=TS4fjLq>b>QMR) z<|i0KQ3H%Xj~?tqLNgqI+M8_qz$(-dzloY@1t#G8sDWKW58gs`kelosz>KyIOC{y)@KbROz$@F%3% zUUP|Pyq+fU7O~A19L4s8CaCLY#AGMMhnDZp#2I2Uafg^mtS6Y9a~}+EpL5mnsY7{z zSWIY;uM<~^Cd3TlHjzx|dYhOcwZTNX{L?W<0O7= zGi)IM7_37;f>MSNn*-qiedlKHhQ_${s?{zjzRGQNSG zYaySR#4K<2`_I3Ux@>dLT7Q9sHvRt$CsRz!BSsRRH?Hq_GINL@6Ymke#C+l}gsySK zZeofuTn&UD@e*;8h$dqV3B~}oP*G&?CAoRxQnoF#7QvAZAzU-X;{#RMNKDfpZFA|H0 za6(s#7cou>0m>ihzCexBQv;-2Tu&nV2xc6H5j&x<#1r`(m{6ua|G W`SrxyP`~l+{JA-qH8g-R6QvG delta 5120 zcmYk;3tW}u0mtzNubA8~9&hMDAOtf}5K}Pll0BS6hMz{CrrY|A*zbSd$3DFu|9+qM^1RRWJ-Ty^-{zHm zp3lQNylgm{NpDi#*_h#e#(W&4tH$gOH^v|LUFdoAQyoiz5V()k2VkqY>48sHr zz;xshlZ|R;x^v%Smf9N?*o_;nA%DyP{))l|?1jx3jh$(&FD9VQvoQvXu_wNO{jeHU zuL1kuHSCW5G|~g3v8VAElSV-e<)I!dM>l%y^}VPHpP(APj%ql-<-G7tWv~P}6;E%b?U#j?DRD+%Au2vx$^`a!ybE8oA3y{8;$5B)I z9BKyMuzrY|@=K`t-`VT!sI2Fs(4(myK|wE?gqpfJs0!;)4_2ZY-j7|e(cZs^>hN{c zn*V^bVFKs{MH7drpMjd;hpkIdGrdXkuPNQn1vj2WRrrs6Fp_zS6O{|aj4t*Ck-w5sc|*dH@c@1KWJ`uzzx($BKb6QeK4xtBvgmyq4v^h)C_o0d+cpg$KOZa z_kV_hM$~L?biCbJ(}uylQH0phn#F4r7L56i&n`*cq#=)u;w*umgT%&yS!w za31yEo2b3eW({QB^i%HXML`e5qZ&>^&A>R+i>IO1ZUJf!tVFHhtEdhh!Y=r!J->vS z`hTJt2xMbu26~|CCm`Fzj79A~Q%vDDF1(29$QESz%{J!&(|~%>_trL4gIxzX^&+u7 z=Wc5(YKHnF6Kj&JL#!#-k?X0xbJjndf;wru$LsW*Eu{EfUZNdoJHcvg*6Ip|U@Hb<5UuKS z>y6sYLs1=^fErP*^+62fyZ|)=#rAx)btCHiJCa#{RjlWNUUV4K@i=NGy3$RJ+>Lr+ zB6h-b)Lt2bsy`mHaU!Z?n{X=bM$JG+MyEB8N7WmMdQa+5=0AYKNG|9__t_icQF~#E zbtb9<#i+Gjj{3YR?EPv~{e2jL2ariK4XEE0lj_VwUsMN%qwbIPP~d0WJb{{lO4Qm{ zVHm!J`dkiTH~bp;Y|M|SwT>O;G?+1jcQgW8NEFcNc6Bb;Sji<-$@H~>$fK2LoL`hDnw8hJm|OvGXw z?VA(|dhtW3U0#em@JXykFZRNGy33E6DMxjz3VY&S)XX)a267%XBUkMGCe(o1k978o z3$?dW@HTz_nG`g_91OzQs7?78w!;;u4nB=~?j_U+cc7N$w7uVkn&ObVosq_1BIj|a zy>&mTy?oUB&*@xi_$383+=7~cHq?s)Gn_RahMKbJScE0W>X@^r=Rz}``)SyP^BmMn zWji{b}g<7j`u>-bXU%Y`)7&*#$K{D#OQK-*u z4638~sFBY@Erl2TFqeEuipbk!zHdG#oFRW8Yltd%h>n?LI$2BB6CH0l_!{87W)E3F zv?Tgs?j?NoKOM^`og#aGy5bbHcgCurB_z(d=G%BGY811{qa>P?kQ(wjIZGxJ9ZQL( zRvT(1;p;Q+k=IhAHIqj=kyLU&d64{yJVbhvIi!N*lN8cO zn#co0#|WY?#os$QJlvB_X&=cTI<}K8z7qe_wBBM81?@oX9&KqI=g5=f5Sc(06CJ;C zFoUqzmY3rJ@)^<2+^W5EmBK-?pL{}e%yTebV;%Vi`K!Gqx{+U#+sV`9)^UWwi{$Ub zOLY8+bSLSgnT#ec5$CXbw}7*8B%C}?O35tp8qu+V^!JsVk66WltNr z{(kId4O6`jIb)ejN^zuZWJmq@HXf z0pz#j*0IPIPU7!uc{6(A?a4HZBp1jwGL`7qK`xP_#7%xd8i@@Jg7LNV^(SD M+y%8w8Drc3A1t)`T>t<8 diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index d1eab7e..6ae8ac1 100644 --- a/app/Locale/deu/LC_MESSAGES/default.po +++ b/app/Locale/deu/LC_MESSAGES/default.po @@ -420,7 +420,7 @@ msgstr "Suche" #: View/Elements/navbar.ctp:9 msgid "dreamjob.service" -msgstr "Google+" +msgstr "Service+" #: View/Elements/navbar.ctp:11 msgid "dreamjob.logout" @@ -1205,7 +1205,30 @@ msgstr "Bewerbung" #: View/Job/application_send.ctp:13 msgid "dreamjob.application.extern.to" -msgstr "Externe Bewerbung" +msgstr "Externe Bewerbung (new)" + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.pdf" +msgstr "Bewerbung" + + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.why" +msgstr "Bewerbung" + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.to.doing" +msgstr "extern bewerben" + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.title" +msgstr "Bewerbungs-Mailer" + + +#: View/Job/application_send.ctp:13 +msgid "dreamjob.application.extern.filename.pdf" +msgstr "Bewerbung.pdf" + #: View/Job/application_send.ctp:13 msgid "dreamjob.application.receiver" diff --git a/app/View/Elements/navbar.ctp b/app/View/Elements/navbar.ctp index 2edb17b..a90c2e6 100755 --- a/app/View/Elements/navbar.ctp +++ b/app/View/Elements/navbar.ctp @@ -7,7 +7,7 @@ class="active">Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?> class="active">Html->link(__('dreamjob.service'),array('controller'=>'service','action'=>'index'));?> - + class="active">Html->link(__('dreamjob.application.extern.to'),array('controller'=>'job','action'=>'applicationSendExt'));?> diff --git a/app/View/Job/applicationWorker_list.ctp b/app/View/Job/applicationWorker_list.ctp index 53ca887..cdca15b 100644 --- a/app/View/Job/applicationWorker_list.ctp +++ b/app/View/Job/applicationWorker_list.ctp @@ -6,7 +6,7 @@

- Html->link('  '.__('dreamjob.application.extern.to'),array('controller'=>'job','action'=>'applicationSendExt'),array('class'=>'btn btn-default','escape'=>false));?> + Html->link('  '.__('dreamjob.application.extern.to.doing'),array('controller'=>'job','action'=>'applicationSendExt'),array('class'=>'btn btn-default','escape'=>false));?>
diff --git a/app/View/Job/application_send_ext.ctp b/app/View/Job/application_send_ext.ctp index 4d4a5a4..6131007 100644 --- a/app/View/Job/application_send_ext.ctp +++ b/app/View/Job/application_send_ext.ctp @@ -4,7 +4,7 @@ */ ?>
-

+

Form->create('DreamjobJobApplication',$default_Form); ?>
diff --git a/app/View/Pdf/application_ext.ctp b/app/View/Pdf/application_ext.ctp index 130cdfd..0a02f5e 100644 --- a/app/View/Pdf/application_ext.ctp +++ b/app/View/Pdf/application_ext.ctp @@ -36,7 +36,7 @@ $tcpdf->SetY(185); //$tcpdf->SetFont($tcpdf->font,'B',$tcpdf->fontsize+4); //$tcpdf->Cell(0,0, , 0,1,'L'); //$tcpdf->SetFont($tcpdf->font,'',$tcpdf->fontsize); -$tcpdf->writeHTML('

'.__('dreamjob.application.extern').'

'); +$tcpdf->writeHTML('

'.__('dreamjob.application.extern.pdf').'

'); $tcpdf->SetY(255); $tcpdf->Cell(0,0, $application['Mannerofaddress']['name'].' '.$application['AppUserWorker']['first_name'].' '.$application['AppUserWorker']['last_name'], 0,1,'R'); @@ -45,7 +45,7 @@ $tcpdf->Cell(0,0, $application['DreamjobUserWorker']['postcode'].' '.$applicatio //Anschreiben $tcpdf->SetAutoPageBreak( true, 20); -$tcpdf->title=__('dreamjob.application.why'); +$tcpdf->title=__('dreamjob.application.extern.why'); $tcpdf->AddPage(); $tcpdf->SetY(35); $tcpdf->SetTextColor(0, 0, 0); @@ -108,7 +108,7 @@ foreach($application['Page'] as $page){ //$tcpdf->Output('filename.pdf','I'); // TO Download -echo $tcpdf->Output('filename.pdf','S'); +echo $tcpdf->Output(__('dreamjob.applications.extern.filename.pdf'),'S'); //return null; //ob_start(); ?>