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 620f6c4..335a38f 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 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(); ?>