diff --git a/app/Controller/ExtraController.php b/app/Controller/ExtraController.php index f15b867..1307886 100644 --- a/app/Controller/ExtraController.php +++ b/app/Controller/ExtraController.php @@ -16,37 +16,37 @@ class ExtraController extends AppController { $Email->template('contact'); $Email->viewVars(array('text' => $this->request->data, 'strip_tags' => $this->MiconwareSession->strip_tags)); if ($Email->send()) - $this->MiconwareSession->setFlash(__('dreamjob.contactSend'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.contactSend.success'), 'flash', array('alert' => 'success')); else $this->MiconwareSession->setFlash(__('dreamjob.contactSend.error'), 'flash', array('alert' => 'danger')); } $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title', 'dreamjob.contact'); + $this->set('title', __('dreamjob.contact')); $this->render('/Extra/contact'); } public function cooperators(){ $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title','dreamjob.cooperators'); + $this->set('title',__('dreamjob.cooperators')); $this->render('/Extra/cooperators'); } public function team(){ $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title','dreamjob.team'); + $this->set('title',__('dreamjob.team')); $this->render('/Extra/team'); } public function company(){ $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title','dreamjob.extra.company'); + $this->set('title',__('dreamjob.extra.company')); $this->render('/Extra/company'); } public function worker(){ $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title','dreamjob.extra.worker'); + $this->set('title',__('dreamjob.extra.worker')); $this->render('/Extra/worker'); } public function premium(){ @@ -58,13 +58,13 @@ class ExtraController extends AppController { $Email->template('contact'); $Email->viewVars(array('text' => $this->request->data, 'strip_tags' => $this->MiconwareSession->strip_tags)); if ($Email->send()) - $this->MiconwareSession->setFlash(__('dreamjob.contactSend'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.contactSend.success'), 'flash', array('alert' => 'success')); else $this->MiconwareSession->setFlash(__('dreamjob.contactSend.error'), 'flash', array('alert' => 'danger')); } $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title','dreamjob.premium'); + $this->set('title',__('dreamjob.premium')); $this->render('/Extra/premium'); } public function advertise(){ @@ -76,13 +76,13 @@ class ExtraController extends AppController { $Email->template('contact'); $Email->viewVars(array('text' => $this->request->data, 'strip_tags' => $this->MiconwareSession->strip_tags)); if ($Email->send()) - $this->MiconwareSession->setFlash(__('dreamjob.contactSend'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.contactSend.success'), 'flash', array('alert' => 'success')); else $this->MiconwareSession->setFlash(__('dreamjob.contactSend.error'), 'flash', array('alert' => 'danger')); } $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title','dreamjob.advertise'); + $this->set('title',__('dreamjob.advertise')); $this->render('/Extra/advertise'); } } \ No newline at end of file diff --git a/app/Controller/HomeController.php b/app/Controller/HomeController.php index ad065dc..65ee90e 100755 --- a/app/Controller/HomeController.php +++ b/app/Controller/HomeController.php @@ -38,7 +38,7 @@ class HomeController extends AppController { $openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(), 'order'=>'DreamjobJobOpening.id DESC','limit'=> self::$opening_limit)); $this->set('openings',$openings); - $this->set('title', 'dreamjob.startpage'); + $this->set('title', __('dreamjob.startpage')); $this->set('MENU_START', true); $this->render('/Home/home'); } @@ -53,12 +53,12 @@ class HomeController extends AppController { $this->request->data['User']['password']) ){ $this->MiconwareSession->refreshCache(); - $this->MiconwareSession->setFlash(__('dreamjob.loggedin'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.loggedin.success'),'flash',array('alert'=>'success')); }else{ - $this->MiconwareSession->setFlash(__('dreamjob.loggedinError'),'flash',array('alert'=>'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.loggedin.error'),'flash',array('alert'=>'danger')); } }else{ - $this->MiconwareSession->setFlash(__('dreamjob.loggedinError'),'flash',array('alert'=>'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.loggedin.error'),'flash',array('alert'=>'danger')); } @@ -66,7 +66,7 @@ class HomeController extends AppController { $openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(), 'order'=>'DreamjobJobOpening.id DESC','limit'=> self::$opening_limit)); $this->set('openings',$openings); - $this->set('title', 'dreamjob.startpage'); + $this->set('title', __('dreamjob.startpage')); $this->set('MENU_START', true); $this->render('/Home/home'); } @@ -75,15 +75,15 @@ class HomeController extends AppController { $this->MiconwareSession->init($this); if($this->MiconwareSession->logout()) - $this->MiconwareSession->setFlash(__('dreamjob.loggingoutSucess'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.loggingout.success'),'flash',array('alert'=>'success')); else - $this->MiconwareSession->setFlash(__('dreamjob.loggingoutError'),'flash',array('alert'=>'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.loggingout.error'),'flash',array('alert'=>'danger')); $this->MiconwareSession->initWeb($this); $openings = $this->DreamjobJobOpening->find('all',array('conditions'=>$this->MiconwareSession->getOpeningCondition(), 'order'=>'DreamjobJobOpening.id DESC','limit'=> self::$opening_limit)); $this->set('openings',$openings); - $this->set('title', 'dreamjob.startpage'); + $this->set('title', __('dreamjob.startpage')); $this->set('MENU_START', true); $this->render('/Home/home'); } @@ -92,7 +92,7 @@ class HomeController extends AppController { public function impressum() { $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title', 'dreamjob.impressum'); + $this->set('title', __('dreamjob.impressum')); $this->render('/Home/impressum'); } @@ -100,7 +100,7 @@ class HomeController extends AppController { public function agb() { $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); - $this->set('title', 'dreamjob.agb'); + $this->set('title', __('dreamjob.agb')); $this->render('/Home/agb'); } @@ -113,14 +113,14 @@ class HomeController extends AppController { $Email->template('contact'); $Email->viewVars(array('text'=>$this->request->data,'strip_tags'=>$this->MiconwareSession->strip_tags)); if($Email->send()) - $this->MiconwareSession->setFlash(__('dreamjob.contactSend'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.contactSend.success'),'flash',array('alert'=>'success')); else $this->MiconwareSession->setFlash(__('dreamjob.contactSend.error'),'flash',array('alert'=>'danger')); } $this->MiconwareSession->init($this); $this->MiconwareSession->initWeb($this); $this->set('MENU_START_company', true); - $this->set('title', 'dreamjob.company'); + $this->set('title', __('dreamjob.company')); $this->render('/Home/company'); } } diff --git a/app/Controller/JobController.php b/app/Controller/JobController.php index a64b2ea..f48f612 100644 --- a/app/Controller/JobController.php +++ b/app/Controller/JobController.php @@ -26,14 +26,14 @@ class JobController extends AppController { $self = $this->MiconwareSession->getCompany(); if (!is_array($self) or count($self) <= 0) { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } else { if (!empty($this->request->query['del'])) { $o = $this->DreamjobJobOpening->findById($this->request->query['del']); if ($o['AppUser']['id'] == $self['AppUser']['id']) { $this->DreamjobJobOpening->delete($this->request->query['del'], false); - $this->MiconwareSession->setFlash(__('dreamjob.opening.delete'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.opening.delete.success'), 'flash', array('alert' => 'success')); } else { $this->MiconwareSession->setFlash(__('dreamjob.opening.delete.error'), 'flash', array('alert' => 'danger')); } @@ -53,7 +53,7 @@ class JobController extends AppController { $this->DreamjobJobOpening->create($this->request->data); $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $c['AppUser']['id']; if ($this->DreamjobJobOpening->save()) { - $this->MiconwareSession->setFlash(__('dreamjob.opening.save.add'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.opening.save.success'), 'flash', array('alert' => 'success')); if($this->request->data['DreamjobJobOpening']['active'] and $this->request->data['DreamjobJobOpening']['startdate'] <= date("Y-m-d") and $this->request->data['DreamjobJobOpening']['enddate'] >= date("Y-m-d", strtotime("+1 day") ) ) return $this->redirect(array('action' => 'openingGet','id'=>$this->DreamjobJobOpening->id)); } else { @@ -68,7 +68,7 @@ class JobController extends AppController { $this->set('cities', $this->DreamjobListCity->find('list')); $this->render('/Job/opening_edit'); } else { - $this->set('error', 'dreamjob.error.noCompany'); + $this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text'))); $this->render('/Home/error'); } } @@ -79,7 +79,7 @@ class JobController extends AppController { $a = $this->MiconwareSession->getCompany(); if (empty($a)) { - $this->set('error', 'dreamjob.error.noCompany'); + $this->set('error', array('title'=>__('dreamjob.error.noCompany.title'),'text'=>__('dreamjob.error.noCompany.text'))); $this->render('/Home/error'); return null; } @@ -92,7 +92,7 @@ class JobController extends AppController { $this->DreamjobJobOpening->data['DreamjobJobOpening']['id'] = $this->request->params['id']; $this->DreamjobJobOpening->data['DreamjobJobOpening']['company_id'] = $cid; if ($this->DreamjobJobOpening->save($this->DreamjobJobOpening->data)) { - $this->MiconwareSession->setFlash(__('dreamjob.opening.save'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.opening.save.success'), 'flash', array('alert' => 'success')); if($this->request->data['DreamjobJobOpening']['active'] and $this->request->data['DreamjobJobOpening']['startdate'] <= date("Y-m-d") and $this->request->data['DreamjobJobOpening']['enddate'] >= date("Y-m-d", strtotime("+1 day") ) ) return $this->redirect(array('action' => 'openingGet','id'=>$this->request->params['id'])); } else @@ -107,10 +107,10 @@ class JobController extends AppController { } if (empty($this->request->data['DreamjobJobOpening'])) { - $this->set('error', 'dreamjob.error.opening.notFound'); + $this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text'))); $this->render('/Home/error'); } elseif ($this->request->data['DreamjobJobOpening']['company_id'] != $a['AppUser']['id']) { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } else { $this->render('/Job/opening_edit'); @@ -134,12 +134,12 @@ class JobController extends AppController { $data = array('DreamjobJobFavority' => array('opening_id' => $this->request->params['id'], 'worker_id' => $WORKER['AppUser']['id']), 'modified' => false); $data2 = array('DreamjobJobFavority.opening_id' => $this->request->params['id'], 'DreamjobJobFavority.worker_id' => $WORKER['AppUser']['id']); if ($fav) { - $this->MiconwareSession->setFlash(__('dreamjob.opening.fav.delete'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.opening.fav.delete.success'), 'flash', array('alert' => 'success')); $this->DreamjobJobFavority->deleteAll($data2, false); } else { $this->DreamjobJobFavority->create(); $this->DreamjobJobFavority->save($data); - $this->MiconwareSession->setFlash(__('dreamjob.opening.fav.add'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.opening.fav.add.success'), 'flash', array('alert' => 'success')); } } $con = $this->MiconwareSession->getOpeningCondition(); @@ -152,7 +152,7 @@ class JobController extends AppController { $this->MiconwareSession->initWeb($this); if (!is_array($opening) or count($opening) <= 0) { - $this->set('error', 'dreamjob.error.opening.notFound'); + $this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text'))); $this->render('/Home/error'); } else { $this->set('opening', $opening); @@ -166,7 +166,7 @@ class JobController extends AppController { $this->MiconwareSession->initWeb($this); $self = $this->MiconwareSession->getWorker(); if (!is_array($self) or count($self) <= 0) { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } else { $fav_id = array(); @@ -188,7 +188,7 @@ class JobController extends AppController { $self = $this->MiconwareSession->getWorker(); if (!is_array($self) or count($self) <= 0) { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } else { $applications = $this->DreamjobJobApplication->find('all', array('conditions' => array('DreamjobJobApplication.worker_id' => $self['AppUser']['id']))); @@ -213,7 +213,7 @@ class JobController extends AppController { } if (!is_array($application) or count($application) <= 0) { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } else { $this->set('page', null); @@ -222,7 +222,7 @@ class JobController extends AppController { $this->DreamjobJobApplication->id = $application['DreamjobJobApplication']['id']; if ($this->DreamjobJobApplication->saveField('closed', !$application['DreamjobJobApplication']['closed'])) { $application = $this->DreamjobJobApplication->find('first', array('conditions' => array('DreamjobJobApplication.id' => $this->request->params['id']))); - $this->MiconwareSession->setFlash(__('dreamjob.application.archiv'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.application.archiv.success'), 'flash', array('alert' => 'success')); } else { $this->MiconwareSession->setFlash(__('dreamjob.application.archiv.error'), 'flash', array('alert' => 'danger')); } @@ -236,7 +236,7 @@ class JobController extends AppController { $this->DreamjobJobMsg->data['DreamjobJobMsg']['fromcompany'] = is_array($COMPANY) and count($COMPANY) > 0; if ($this->DreamjobJobMsg->sendMessage()) { $application = $this->DreamjobJobApplication->find('first', array('conditions' => array('DreamjobJobApplication.id' => $this->request->params['id']))); - $this->MiconwareSession->setFlash(__('dreamjob.application.msg.add'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.application.msg.success'), 'flash', array('alert' => 'success')); } else { $this->MiconwareSession->setFlash(__('dreamjob.application.msg.error'), 'flash', array('alert' => 'danger')); } @@ -287,7 +287,7 @@ class JobController extends AppController { $this->DreamjobJobApplication->id = $this->request->query['archiv']; if ($this->DreamjobJobApplication->saveField('closed', !$application['DreamjobJobApplication']['closed'])) { $application = $this->DreamjobJobApplication->find('first', array('conditions' => array('DreamjobJobApplication.id' => $this->request->params['id']))); - $this->MiconwareSession->setFlash(__('dreamjob.application.archiv'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.application.archiv.success'), 'flash', array('alert' => 'success')); } else { $this->MiconwareSession->setFlash(__('dreamjob.application.archiv.error'), 'flash', array('alert' => 'danger')); } @@ -312,7 +312,7 @@ class JobController extends AppController { $this->set("filter_current", $filter_current); } if (!is_array($opening) or count($opening) <= 0) { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } else { $this->set('opening', $opening); @@ -333,7 +333,7 @@ class JobController extends AppController { $opening = $this->DreamjobJobOpening->find('first', array('conditions' => $con)); } if (!is_array($opening) or count($opening) <= 0) { - $this->set('error', 'dreamjob.error.opening.notFound'); + $this->set('error', array('title'=>__('dreamjob.error.opening.notFound.title'),'text'=>__('dreamjob.error.opening.notFound.text'))); $this->render('/Home/error'); } else { if ($this->request->is('post')) { @@ -362,7 +362,7 @@ class JobController extends AppController { $this->render('/Job/application_send'); } } else { - $this->set('error', 'dreamjob.error.noWorker'); + $this->set('error', array('title'=>__('dreamjob.error.noWorker.title'),'text'=>__('dreamjob.error.noWorker.text'))); $this->render('/Home/error'); } } diff --git a/app/Controller/PdfController.php b/app/Controller/PdfController.php index cb67553..2d95dc8 100644 --- a/app/Controller/PdfController.php +++ b/app/Controller/PdfController.php @@ -22,7 +22,7 @@ class PdfController extends AppController { } if(!is_array($application) or count($application) <= 0){ - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ $this->response->type('application/pdf'); @@ -43,7 +43,7 @@ class PdfController extends AppController { $WORKER = $this->MiconwareSession->getWorker(); if(!is_array($WORKER) or count($WORKER) <= 0){ - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ $this->response->type('application/pdf'); diff --git a/app/Controller/RegistrationController.php b/app/Controller/RegistrationController.php index b084613..a5ff110 100644 --- a/app/Controller/RegistrationController.php +++ b/app/Controller/RegistrationController.php @@ -18,7 +18,7 @@ class RegistrationController extends AppController { if (!$this->MiconwareSession->isLoggedin()) { $this->render('/Registration/main'); } else { - $this->set('error', 'dreamjob.error.loggedin'); + $this->set('error', array('title'=>__('dreamjob.error.loggedin.title'),'text'=>__('dreamjob.error.loggedin.text'))); $this->render('/Home/error'); } } @@ -55,12 +55,12 @@ class RegistrationController extends AppController { $result = $this->DreamjobCompany->registration($data); if ($result) { $regResult = true; - $this->MiconwareSession->setFlash(__('dreamjob.registration.done'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.registration.success'), 'flash', array('alert' => 'success')); } else { $this->MiconwareSession->setFlash(__('dreamjob.registration.error'), 'flash', array('alert' => 'danger')); } } else if ($this->request->data['User']['password1'] != '' or $this->request->data['User']['password2'] != '') { - $this->MiconwareSession->setFlash(__('dreamjob.error.password.notEqual'), 'flash', array('alert' => 'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.password.error.notEqual'), 'flash', array('alert' => 'danger')); } } else { $this->MiconwareSession->setFlash(__('dreamjob.agb.error.notAccept'), 'flash', array('alert' => 'danger')); @@ -73,7 +73,7 @@ class RegistrationController extends AppController { $this->set('branches', $this->DreamjobListBranch->find('list')); $this->render('/Registration/company'); }else { - $this->set('error', 'dreamjob.error.loggedin'); + $this->set('error', array('title'=>__('dreamjob.error.loggedin.title'),'text'=>__('dreamjob.error.loggedin.text'))); $this->render('/Home/error'); } } @@ -114,12 +114,12 @@ class RegistrationController extends AppController { if ($result) { $regResult = true; - $this->MiconwareSession->setFlash(__('dreamjob.registration.done'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.registration.success'), 'flash', array('alert' => 'success')); } else { $this->MiconwareSession->setFlash(__('dreamjob.registration.error'), 'flash', array('alert' => 'danger')); } } else if ($this->request->data['User']['password1'] != '' or $this->request->data['User']['password2'] != '') { - $this->MiconwareSession->setFlash(__('dreamjob.error.password.notEqual'), 'flash', array('alert' => 'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.password.error.notEqual'), 'flash', array('alert' => 'danger')); } } else { $this->MiconwareSession->setFlash(__('dreamjob.agb.error.notAccept'), 'flash', array('alert' => 'danger')); @@ -131,7 +131,7 @@ class RegistrationController extends AppController { $this->set('graducations', $this->DreamjobListGraducation->find('list')); $this->render('/Registration/worker'); } else { - $this->set('error', 'dreamjob.error.loggedin'); + $this->set('error', array('title'=>__('dreamjob.error.loggedin.title'),'text'=>__('dreamjob.error.loggedin.text'))); $this->render('/Home/error'); } } @@ -144,7 +144,7 @@ class RegistrationController extends AppController { $this->set("result", $result); $this->render('/Registration/active'); } else { - $this->set('error', 'dreamjob.error.loggedin'); + $this->set('error', array('title'=>__('dreamjob.error.loggedin.title'),'text'=>__('dreamjob.error.loggedin.text'))); $this->render('/Home/error'); } } @@ -160,7 +160,7 @@ class RegistrationController extends AppController { $result = $this->User->sendPasswortReset($profil); if ($result) { - $this->MiconwareSession->setFlash(__('dreamjob.password_reset.send'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.password_reset.send.success'), 'flash', array('alert' => 'success')); return $this->redirect(array('controller'=>'home','action' => 'home')); } else { $this->MiconwareSession->setFlash(__('dreamjob.password_reset.send.error'), 'flash', array('alert' => 'danger')); @@ -168,7 +168,7 @@ class RegistrationController extends AppController { } $this->render('/Registration/password_reset'); } else { - $this->set('error', 'dreamjob.error.loggedin'); + $this->set('error', array('title'=>__('dreamjob.error.loggedin.title'),'text'=>__('dreamjob.error.loggedin.text'))); $this->render('/Home/error'); } } @@ -188,17 +188,17 @@ class RegistrationController extends AppController { $password = $this->MiconwareSession->create_hash($this->request->data['User']['password1']); $result = $this->User->replace_password($try,$password); if ($result) { - $this->MiconwareSession->setFlash(__('dreamjob.password_replace.done'), 'flash', array('alert' => 'success')); + $this->MiconwareSession->setFlash(__('dreamjob.password_replace.success'), 'flash', array('alert' => 'success')); return $this->redirect(array('controller'=>'home','action' => 'home')); } else { $this->MiconwareSession->setFlash(__('dreamjob.password_replace.error'), 'flash', array('alert' => 'danger')); } }else - $this->MiconwareSession->setFlash(__('dreamjob.error.password.notEqual'), 'flash', array('alert' => 'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.password.error.notEqual'), 'flash', array('alert' => 'danger')); } $this->render('/Registration/password_replace'); } else { - $this->set('error', 'dreamjob.error.link'); + $this->set('error', array('title'=>__('dreamjob.error.link.title'),'text'=>__('dreamjob.error.link.text'))); $this->render('/Home/error'); } } diff --git a/app/Controller/SearchController.php b/app/Controller/SearchController.php index 4704ba8..e36f75e 100644 --- a/app/Controller/SearchController.php +++ b/app/Controller/SearchController.php @@ -71,7 +71,7 @@ class SearchController extends AppController { $this->set("openings", $openings); $this->render('/Search/' . $type); } else { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } } @@ -151,7 +151,7 @@ class SearchController extends AppController { $this->set("openings", $openings); $this->render('/Search/auto'); } else { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } } @@ -189,7 +189,7 @@ class SearchController extends AppController { $this->set("kindofjobs", $this->DreamjobListKindofjob->find('list')); $this->render('/Search/worker'); }else { - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } } diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php index e3ff1c1..25ae989 100755 --- a/app/Controller/UserController.php +++ b/app/Controller/UserController.php @@ -97,7 +97,7 @@ class UserController extends AppController { if(($company == $self_company) and !($this->MiconwareSession->isStaff()) or $hard_error){ $hard_error = true; $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } }elseif($profil['AppUser']['id'] == $self['AppUser']['id']){ @@ -137,7 +137,7 @@ class UserController extends AppController { } $result = $this->DreamjobCvEntry->saveAndDelete($tosave,$self['DreamjobCvEntry']); if($result){ - $this->MiconwareSession->setFlash(__('dreamjob.settings.save'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.settings.save.success'),'flash',array('alert'=>'success')); }else{ $this->MiconwareSession->setFlash(__('dreamjob.settings.save.error'),'flash',array('alert'=>'danger')); } @@ -154,7 +154,7 @@ class UserController extends AppController { $this->set('edit_show',true); $this->render('/User/worker'); }else{ - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); } } @@ -200,7 +200,7 @@ class UserController extends AppController { } if(empty($profil) or count($profil) <= 0){ $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ if(isset($this->request->query['list']) and is_array($this->request->query['list'])){ @@ -217,10 +217,10 @@ class UserController extends AppController { $profil = $this->MiconwareSession->getCompany(); else $profil = $this->MiconwareSession->getWorker(); - $this->MiconwareSession->setFlash(__('dreamjob.error.page.order.saved'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.page.order.save.success'),'flash',array('alert'=>'success')); } else - $this->MiconwareSession->setFlash(__('dreamjob.error.page.order.error'),'flash',array('alert'=>'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.page.order.save.error'),'flash',array('alert'=>'danger')); } $this->set('profil',$profil); @@ -247,7 +247,7 @@ class UserController extends AppController { if(empty($profil) or count($profil) <= 0){ $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ if ($this->request->is('post')){ @@ -285,13 +285,13 @@ class UserController extends AppController { if($result){ - $this->MiconwareSession->setFlash(__('dreamjob.settings.save'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.settings.save.success'),'flash',array('alert'=>'success')); }else{ $this->MiconwareSession->setFlash(__('dreamjob.settings.save.error'),'flash',array('alert'=>'danger')); } }else if($this->request->data['User']['password1']!='' or $this->request->data['User']['password2']!=''){ - $this->MiconwareSession->setFlash(__('dreamjob.error.password.notEqual'),'flash',array('alert'=>'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.password.error.notEqual'),'flash',array('alert'=>'danger')); } } @@ -323,7 +323,7 @@ class UserController extends AppController { if(empty($profil) or count($profil) <= 0){ $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ //PAGE BEARBEITEN @@ -386,7 +386,7 @@ class UserController extends AppController { $profil = $this->MiconwareSession->getWorker(); else $profil = $this->MiconwareSession->getCompany(); - $this->MiconwareSession->setFlash(__('dreamjob.pages.delete'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.pages.delete.success'),'flash',array('alert'=>'success')); }else{ $this->MiconwareSession->setFlash(__('dreamjob.pages.delete.error'),'flash',array('alert'=>'danger')); } @@ -396,7 +396,7 @@ class UserController extends AppController { // NEW PAGE if($this->request->is('post')){ if(!empty($this->request->data['DreamjobPageText']['text']) and $this->request->data['DreamjobPageImage']['image']['error']==0){ - $this->MiconwareSession->setFlash(__('dreamjob.page.oneType'),'flash',array('alert'=>'danger')); + $this->MiconwareSession->setFlash(__('dreamjob.page.oneType.error'),'flash',array('alert'=>'danger')); }else{ $this->request->data['DreamjobPageInh']['user_id']=$profil['AppUser']['id']; if($this->request->data['DreamjobPageImage']['image']['error']==0){ @@ -416,7 +416,7 @@ class UserController extends AppController { } if($result){ $this->MiconwareSession->refreshCache(); - $this->MiconwareSession->setFlash(__('dreamjob.page.save'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.page.save.success'),'flash',array('alert'=>'success')); $profil = $this->MiconwareSession->getWorker(); if(empty($profil) or count($profil) <= 0) $profil = $this->MiconwareSession->getCompany(); @@ -439,7 +439,7 @@ class UserController extends AppController { if(empty($profil) or count($profil) <= 0){ $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ if($this->request->is('post')){ @@ -453,7 +453,7 @@ class UserController extends AppController { if($result){ $this->MiconwareSession->refreshCache(); $profil = $this->MiconwareSession->getWorker(); - $this->MiconwareSession->setFlash(__('dreamjob.settings.save'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.settings.save.success'),'flash',array('alert'=>'success')); }else{ $this->MiconwareSession->setFlash(__('dreamjob.settings.save.error'),'flash',array('alert'=>'danger')); } @@ -485,7 +485,7 @@ class UserController extends AppController { if(empty($profil) or count($profil) <= 0){ $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ if ($this->request->is('post')){ @@ -514,7 +514,7 @@ class UserController extends AppController { if(empty($profil) or count($profil) <= 0){ $this->MiconwareSession->setFlash(__('dreamjob.error.page.notFound'),'flash',array('alert'=>'danger')); - $this->set('error', 'dreamjob.error.noPermision'); + $this->set('error', array('title'=>__('dreamjob.error.noPermision.title'),'text'=>__('dreamjob.error.noPermision.text'))); $this->render('/Home/error'); }else{ if($this->request->is('put') or $this->request->is('post')){ @@ -524,7 +524,7 @@ class UserController extends AppController { $data['AppUser']['avatar'] = $this->request->data['AppUser']['avatar']; $result = $this->AppUser->imageUpload($data); if($result){ - $this->MiconwareSession->setFlash(__('dreamjob.settings.avatar.done'),'flash',array('alert'=>'success')); + $this->MiconwareSession->setFlash(__('dreamjob.settings.avatar.success'),'flash',array('alert'=>'success')); }else{ $this->MiconwareSession->setFlash(__('dreamjob.settings.avatar.error'),'flash',array('alert'=>'danger')); } diff --git a/app/Locale/cake.pot b/app/Locale/cake.pot index f9a0f96..7b04879 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-04-29 22:09+0200\n" +"POT-Creation-Date: 2014-06-10 18:37+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -22,39 +22,3 @@ msgstr "" msgid "An Internal Error Has Occurred." msgstr "" -msgid "January" -msgstr "Januar" - -msgid "February" -msgstr "Februar" - -msgid "March" -msgstr "März" - -msgid "April" -msgstr "April" - -msgid "May" -msgstr "Mai" - -msgid "June" -msgstr "Juni" - -msgid "July" -msgstr "Juli" - -msgid "August" -msgstr "August" - -msgid "September" -msgstr "September" - -msgid "October" -msgstr "Oktober" - -msgid "November" -msgstr "November" - -msgid "December" -msgstr "Dezember" - diff --git a/app/Locale/cake_dev.pot b/app/Locale/cake_dev.pot index 15d3fec..9e19b36 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-04-29 22:09+0200\n" +"POT-Creation-Date: 2014-06-10 18:37+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 41601ea..1da6b31 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-04-29 22:09+0200\n" +"POT-Creation-Date: 2014-06-10 18:37+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -14,148 +14,324 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: Controller/HomeController.php:47 -msgid "dreamjob.loggedin" +#: Controller/ExtraController.php:19;61;79 +#: Controller/HomeController.php:116 +msgid "dreamjob.contactSend.success" msgstr "" -#: Controller/HomeController.php:49;52 -msgid "dreamjob.loggedinError" +#: Controller/ExtraController.php:21;63;81 +#: Controller/HomeController.php:118 +msgid "dreamjob.contactSend.error" msgstr "" -#: Controller/HomeController.php:69 -msgid "dreamjob.loggingoutSucess" +#: Controller/ExtraController.php:25 +#: View/Extra/contact.ctp:7 +#: View/Layouts/default.ctp:118 +msgid "dreamjob.contact" msgstr "" -#: Controller/HomeController.php:71 -msgid "dreamjob.loggingoutError" +#: Controller/ExtraController.php:31 +#: View/Extra/cooperators.ctp:7 +#: View/Layouts/default.ctp:113 +msgid "dreamjob.cooperators" msgstr "" -#: Controller/JobController.php:40 -#: View/Elements/job_opening_item.ctp:79 -msgid "dreamjob.opening.delete" +#: Controller/ExtraController.php:37 +#: View/Extra/team.ctp:7 +#: View/Layouts/default.ctp:112 +msgid "dreamjob.team" msgstr "" -#: Controller/JobController.php:42 +#: Controller/ExtraController.php:43 +#: View/Layouts/default.ctp:99 +msgid "dreamjob.extra.company" +msgstr "" + +#: Controller/ExtraController.php:49 +#: View/Layouts/default.ctp:98 +msgid "dreamjob.extra.worker" +msgstr "" + +#: Controller/ExtraController.php:67 +#: View/Extra/premium.ctp:7 +#: View/Layouts/default.ctp:105 +msgid "dreamjob.premium" +msgstr "" + +#: Controller/ExtraController.php:85 +#: View/Extra/advertise.ctp:7 +#: View/Layouts/default.ctp:106 +msgid "dreamjob.advertise" +msgstr "" + +#: Controller/HomeController.php:41;69;86 +#: View/Elements/barleft.ctp:84 +#: View/Elements/navbar.ctp:3;6 +msgid "dreamjob.startpage" +msgstr "" + +#: Controller/HomeController.php:56 +msgid "dreamjob.loggedin.success" +msgstr "" + +#: Controller/HomeController.php:58;61 +msgid "dreamjob.loggedin.error" +msgstr "" + +#: Controller/HomeController.php:78 +msgid "dreamjob.loggingout.success" +msgstr "" + +#: Controller/HomeController.php:80 +msgid "dreamjob.loggingout.error" +msgstr "" + +#: Controller/HomeController.php:95 +#: View/Layouts/default.ctp:119 +msgid "dreamjob.impressum" +msgstr "" + +#: Controller/HomeController.php:103 +#: View/Job/application_send.ctp:43 +#: View/Layouts/default.ctp:120 +#: View/Registration/company.ctp:38 +#: View/Registration/worker.ctp:41 +msgid "dreamjob.agb" +msgstr "" + +#: Controller/HomeController.php:123 +#: View/Elements/job_opening_head_extra.ctp:16 +#: View/Registration/company.ctp:19 +#: View/User/settings_account.ctp:67 +msgid "dreamjob.company" +msgstr "" + +#: Controller/JobController.php:29;113;169;191;216;315 +#: Controller/PdfController.php:25;46 +#: Controller/SearchController.php:74;154;192 +#: Controller/UserController.php:100;157;203;250;326;442;488;517 +msgid "dreamjob.error.noPermision.title" +msgstr "" + +#: Controller/JobController.php:29;113;169;191;216;315 +#: Controller/PdfController.php:25;46 +#: Controller/SearchController.php:74;154;192 +#: Controller/UserController.php:100;157;203;250;326;442;488;517 +msgid "dreamjob.error.noPermision.text" +msgstr "" + +#: Controller/JobController.php:36 +msgid "dreamjob.opening.delete.success" +msgstr "" + +#: Controller/JobController.php:38 msgid "dreamjob.opening.delete.error" msgstr "" -#: Controller/JobController.php:60;347 -msgid "dreamjob.opening.save.add" +#: Controller/JobController.php:56;95 +msgid "dreamjob.opening.save.success" msgstr "" -#: Controller/JobController.php:62;97;349 +#: Controller/JobController.php:60;99 msgid "dreamjob.opening.save.error" msgstr "" -#: Controller/JobController.php:94 -msgid "dreamjob.opening.save" +#: Controller/JobController.php:71;82 +msgid "dreamjob.error.noCompany.title" msgstr "" -#: Controller/JobController.php:135 -msgid "dreamjob.opening.fav.delete" +#: Controller/JobController.php:71;82 +msgid "dreamjob.error.noCompany.text" msgstr "" -#: Controller/JobController.php:140 -msgid "dreamjob.opening.fav.add" +#: Controller/JobController.php:110;155;336 +msgid "dreamjob.error.opening.notFound.title" msgstr "" -#: Controller/JobController.php:221;288 -#: View/Job/applicationCompany_list.ctp:14 -msgid "dreamjob.application.archiv" +#: Controller/JobController.php:110;155;336 +msgid "dreamjob.error.opening.notFound.text" msgstr "" -#: Controller/JobController.php:223;290 +#: Controller/JobController.php:137 +msgid "dreamjob.opening.fav.delete.success" +msgstr "" + +#: Controller/JobController.php:142 +msgid "dreamjob.opening.fav.add.success" +msgstr "" + +#: Controller/JobController.php:225;290 +msgid "dreamjob.application.archiv.success" +msgstr "" + +#: Controller/JobController.php:227;292 msgid "dreamjob.application.archiv.error" msgstr "" -#: Controller/JobController.php:235 -msgid "dreamjob.application.msg.add" +#: Controller/JobController.php:239 +msgid "dreamjob.application.msg.success" msgstr "" -#: Controller/JobController.php:237 +#: Controller/JobController.php:241 msgid "dreamjob.application.msg.error" msgstr "" -#: Controller/JobController.php:352 -#: Controller/RegistrationController.php:67;124 +#: Controller/JobController.php:351 +msgid "dreamjob.application.send.success" +msgstr "" + +#: Controller/JobController.php:354 +msgid "dreamjob.application.send.error" +msgstr "" + +#: Controller/JobController.php:357 +#: Controller/RegistrationController.php:66;125 msgid "dreamjob.agb.error.notAccept" msgstr "" -#: Controller/RegistrationController.php:59;116 -msgid "dreamjob.registration.done" +#: Controller/JobController.php:365 +msgid "dreamjob.error.noWorker.title" msgstr "" -#: Controller/RegistrationController.php:61;118 +#: Controller/JobController.php:365 +msgid "dreamjob.error.noWorker.text" +msgstr "" + +#: Controller/RegistrationController.php:21;76;134;147;171 +msgid "dreamjob.error.loggedin.title" +msgstr "" + +#: Controller/RegistrationController.php:21;76;134;147;171 +msgid "dreamjob.error.loggedin.text" +msgstr "" + +#: Controller/RegistrationController.php:58;117 +msgid "dreamjob.registration.success" +msgstr "" + +#: Controller/RegistrationController.php:60;119 msgid "dreamjob.registration.error" msgstr "" -#: Controller/RegistrationController.php:64;121 -#: Controller/UserController.php:293 -msgid "dreamjob.error.password.notEqual" +#: Controller/RegistrationController.php:63;122;197 +#: Controller/UserController.php:294 +msgid "dreamjob.password.error.notEqual" msgstr "" -#: Controller/UserController.php:99;108;202;249;322;357;436;482;511 +#: Controller/RegistrationController.php:163 +msgid "dreamjob.password_reset.send.success" +msgstr "" + +#: Controller/RegistrationController.php:166 +msgid "dreamjob.password_reset.send.error" +msgstr "" + +#: Controller/RegistrationController.php:183 +msgid "dreamjob.password_replace.notFound" +msgstr "" + +#: Controller/RegistrationController.php:191 +msgid "dreamjob.password_replace.success" +msgstr "" + +#: Controller/RegistrationController.php:194 +msgid "dreamjob.password_replace.error" +msgstr "" + +#: Controller/RegistrationController.php:201 +msgid "dreamjob.error.link.title" +msgstr "" + +#: Controller/RegistrationController.php:201 +msgid "dreamjob.error.link.text" +msgstr "" + +#: Controller/UserController.php:99;108;202;249;325;360;441;487;516 msgid "dreamjob.error.page.notFound" msgstr "" -#: Controller/UserController.php:140;287;451 -#: View/Registration/company.ctp:41 -#: View/Registration/worker.ctp:44 -#: View/User/settings_account.ctp:88 -#: View/User/settings_imageUpload.ctp:14 -#: View/User/settings_pages.ctp:113 -msgid "dreamjob.settings.save" +#: Controller/UserController.php:140;288;456 +msgid "dreamjob.settings.save.success" msgstr "" -#: Controller/UserController.php:142;289;453 +#: Controller/UserController.php:142;290;458 msgid "dreamjob.settings.save.error" msgstr "" #: Controller/UserController.php:220 -msgid "dreamjob.error.page.order.saved" +msgid "dreamjob.page.order.save.success" msgstr "" #: Controller/UserController.php:223 -msgid "dreamjob.error.page.order.error" +msgid "dreamjob.page.order.save.error" msgstr "" -#: Controller/UserController.php:352;408 +#: Controller/UserController.php:355;413 msgid "dreamjob.page.save.error" msgstr "" -#: Controller/UserController.php:384 -msgid "dreamjob.pages.delete" +#: Controller/UserController.php:389 +msgid "dreamjob.pages.delete.success" msgstr "" -#: Controller/UserController.php:386 +#: Controller/UserController.php:391 msgid "dreamjob.pages.delete.error" msgstr "" -#: Controller/UserController.php:394 -msgid "dreamjob.page.oneType" +#: Controller/UserController.php:399 +msgid "dreamjob.page.oneType.error" msgstr "" -#: Controller/UserController.php:414 -msgid "dreamjob.page.save" +#: Controller/UserController.php:419 +msgid "dreamjob.page.save.success" msgstr "" -#: Controller/UserController.php:492 +#: Controller/UserController.php:497 msgid "dreamjob.settings.delete.agree" msgstr "" -#: Controller/UserController.php:494 +#: Controller/UserController.php:499 msgid "dreamjob.settings.delete.error" msgstr "" -#: Controller/UserController.php:522 -msgid "dreamjob.settings.avatar.done" +#: Controller/UserController.php:527 +msgid "dreamjob.settings.avatar.success" msgstr "" -#: Controller/UserController.php:524 +#: Controller/UserController.php:529 msgid "dreamjob.settings.avatar.error" msgstr "" -#: View/Elements/barleft.ctp:54 +#: View/Elements/barleft.ctp:27 +msgid "dreamjob.my.profil" +msgstr "" + +#: View/Elements/barleft.ctp:29 +#: View/Job/opening_list.ctp:7 +msgid "dreamjob.my.opening" +msgstr "" + +#: View/Elements/barleft.ctp:31 +#: View/Job/application.ctp:10 +#: View/Job/applicationWorker_list.ctp:7 +#: View/Job/opening.ctp:28 +msgid "dreamjob.my.application" +msgstr "" + +#: View/Elements/barleft.ctp:32 +#: View/Job/favorite.ctp:7 +msgid "dreamjob.my.favority" +msgstr "" + +#: View/Elements/barleft.ctp:34 +#: View/User/settings_account.ctp:17;32 +#: View/User/settings_account_delete.ctp:9 +#: View/User/settings_isearch.ctp:17 +#: View/User/settings_pages.ctp:35 +msgid "dreamjob.settings" +msgstr "" + +#: View/Elements/barleft.ctp:60 msgid "dreamjob.company.startpage" msgstr "" @@ -169,6 +345,7 @@ msgstr "" #: View/Search/education.ctp:24 #: View/Search/internship.ctp:24 #: View/Search/opening.ctp:24 +#: View/Search/worker.ctp:23 #: View/User/company.ctp:81 #: View/User/settings_account.ctp:72 #: View/User/settings_isearch.ctp:29 @@ -177,8 +354,9 @@ msgstr "" #: View/Elements/job_company_item.ctp:38 #: View/Elements/job_opening_item.ctp:67 -#: View/Elements/user_worker_cv.ctp:46 -#: View/Elements/user_worker_cv_edit.ctp:46 +#: View/Elements/user_worker_cv.ctp:43 +#: View/Elements/user_worker_cv_edit.ctp:49 +#: View/Elements/user_worker_cv_pdf.ctp:47 #: View/Elements/user_worker_item.ctp:40 #: View/Job/opening_edit.ctp:45 #: View/Registration/company.ctp:32 @@ -209,6 +387,7 @@ msgstr "" #: View/Elements/job_opening_item.ctp:68 #: View/Job/opening_edit.ctp:33 #: View/Search/opening.ctp:28 +#: View/Search/worker.ctp:25 #: View/User/settings_isearch.ctp:31 msgid "dreamjob.kindofjob" msgstr "" @@ -223,12 +402,6 @@ msgstr "" msgid "dreamjob.company.titleinfo" msgstr "" -#: View/Elements/job_opening_head_extra.ctp:16 -#: View/Registration/company.ctp:19 -#: View/User/settings_account.ctp:67 -msgid "dreamjob.company" -msgstr "" - #: View/Elements/job_opening_head_extra.ctp:17 #: View/Registration/company.ctp:25 #: View/User/settings_account.ctp:73 @@ -255,7 +428,7 @@ msgstr "" #: View/Elements/job_opening_item.ctp:77 #: View/Elements/user_worker_item.ctp:68 #: View/Job/application.ctp:12 -#: View/Pdf/application.ctp:33 +#: View/Pdf/application.ctp:38 msgid "dreamjob.application" msgstr "" @@ -263,72 +436,58 @@ msgstr "" msgid "dreamjob.opening.edit" msgstr "" +#: View/Elements/job_opening_item.ctp:79 +msgid "dreamjob.opening.delete" +msgstr "" + #: View/Elements/job_opening_item.ctp:89;91 -#: View/Elements/user_worker_item.ctp:65 -#: View/Job/application.ctp:37 msgid "dreamjob.applicated" msgstr "" #: View/Elements/job_opening_item.ctp:97 +#: View/Job/application.ctp:37 #: View/Job/opening.ctp:50 msgid "dreamjob.applicate" msgstr "" -msgid "dreamjob.team" -msgstr "" - -msgid "dreamjob.premium" -msgstr "" - -msgid "dreamjob.advertise" -msgstr "" - -msgid "dreamjob.extra.company" -msgstr "" - -msgid "dreamjob.extra.worker" -msgstr "" - -#: View/Elements/navbar.ctp:8 -msgid "dreamjob.startpage" -msgstr "" - -#: View/Elements/navbar.ctp:10;12 +#: View/Elements/navbar.ctp:4;7 #: View/Home/home.ctp:9 #: View/Search/academy.ctp:28 #: View/Search/company.ctp:29 #: View/Search/education.ctp:28 #: View/Search/internship.ctp:28 #: View/Search/opening.ctp:31 -#: View/Search/worker.ctp:25 +#: View/Search/worker.ctp:28 msgid "dreamjob.search" msgstr "" -#: View/Elements/navbar.ctp:14 +#: View/Elements/navbar.ctp:9 msgid "dreamjob.service" msgstr "" -#: View/Elements/navbar.ctp:15 +#: View/Elements/navbar.ctp:11 msgid "dreamjob.logout" msgstr "" -#: View/Elements/navbar.ctp:28 +#: View/Elements/navbar.ctp:24 #: View/Elements/user_worker_header.ctp:43 #: View/Registration/company.ctp:15 +#: View/Registration/password_reset.ctp:8 #: View/Registration/worker.ctp:15 #: View/User/company.ctp:45;68 #: View/User/settings_account.ctp:39 msgid "dreamjob.mail" msgstr "" -#: View/Elements/navbar.ctp:30 +#: View/Elements/navbar.ctp:26 #: View/Registration/company.ctp:16 +#: View/Registration/password_replace.ctp:8 #: View/Registration/worker.ctp:16 #: View/User/settings_account.ctp:41 msgid "dreamjob.password" msgstr "" -#: View/Elements/navbar.ctp:32 +#: View/Elements/navbar.ctp:28 msgid "dreamjob.login" msgstr "" @@ -362,47 +521,52 @@ msgstr "" msgid "dreamjob.search.internship" msgstr "" -#: View/Elements/user_worker_cv.ctp:11 +#: View/Elements/user_worker_cv.ctp:10 #: View/Elements/user_worker_cv_edit.ctp:12 #: View/Job/application.ctp:67 -#: View/Pdf/application.ctp:66 -#: View/Pdf/profil.ctp:42 +#: View/Pdf/application.ctp:64 +#: View/Pdf/profil.ctp:46 #: View/User/worker.ctp:23;25 msgid "dreamjob.cv" msgstr "" -#: View/Elements/user_worker_cv.ctp:13 +#: View/Elements/user_worker_cv.ctp:12 msgid "dreamjob.edit" msgstr "" -#: View/Elements/user_worker_cv.ctp:27 +#: View/Elements/user_worker_cv.ctp:24 #: View/Elements/user_worker_cv_edit.ctp:27 +#: View/Elements/user_worker_cv_pdf.ctp:28 #: View/Registration/worker.ctp:24 #: View/User/settings_account.ctp:51 msgid "dreamjob.bday" msgstr "" -#: View/Elements/user_worker_cv.ctp:38 -#: View/Elements/user_worker_cv_edit.ctp:38 +#: View/Elements/user_worker_cv.ctp:35 +#: View/Elements/user_worker_cv_edit.ctp:39 +#: View/Elements/user_worker_cv_pdf.ctp:39 #: View/Elements/user_worker_item.ctp:43 #: View/Registration/worker.ctp:29 #: View/User/settings_account.ctp:56 msgid "dreamjob.workexperience" msgstr "" -#: View/Elements/user_worker_cv.ctp:39 -#: View/Elements/user_worker_cv_edit.ctp:39 +#: View/Elements/user_worker_cv.ctp:36 +#: View/Elements/user_worker_cv_edit.ctp:40 +#: View/Elements/user_worker_cv_pdf.ctp:40 #: View/Elements/user_worker_item.ctp:43 msgid "dreamjob.years" msgstr "" -#: View/Elements/user_worker_cv.ctp:42 -#: View/Elements/user_worker_cv_edit.ctp:42 +#: View/Elements/user_worker_cv.ctp:39 +#: View/Elements/user_worker_cv_edit.ctp:44 +#: View/Elements/user_worker_cv_pdf.ctp:43 msgid "dreamjob.graducation.worker" msgstr "" -#: View/Elements/user_worker_cv.ctp:50 -#: View/Elements/user_worker_cv_edit.ctp:50 +#: View/Elements/user_worker_cv.ctp:47 +#: View/Elements/user_worker_cv_edit.ctp:54 +#: View/Elements/user_worker_cv_pdf.ctp:51 msgid "dreamjob.country.worker" msgstr "" @@ -410,18 +574,22 @@ msgstr "" msgid "dreamjob.edit.end" msgstr "" -#: View/Elements/user_worker_cv_edit.ctp:61;89;120;148 +#: View/Elements/user_worker_cv_edit.ctp:66;94;126;154 msgid "dreamjob.between" msgstr "" -#: View/Elements/user_worker_cv_edit.ctp:61;67;71;89;93;97;120;126;130;148;152;156 +#: View/Elements/user_worker_cv_edit.ctp:66;72;76;94;98;102;126;132;136;154;158;162 msgid "dreamjob.chooseOne.date" msgstr "" -#: View/Elements/user_worker_cv_edit.ctp:61;89;120;148 +#: View/Elements/user_worker_cv_edit.ctp:66;94;126;154 msgid "dreamjob.between.till" msgstr "" +#: View/Elements/user_worker_cv_edit.ctp:183 +msgid "dreamjob.settings.save" +msgstr "" + #: View/Elements/user_worker_header.ctp:22;23 #: View/User/company.ctp:30;31 #: View/User/settings_imageUpload.ctp:7 @@ -444,6 +612,7 @@ msgid "dreamjob.profil.mappePDF" msgstr "" #: View/Elements/user_worker_header.ctp:49 +#: View/Job/application.ctp:32 msgid "dreamjob.application.mappePDF" msgstr "" @@ -455,30 +624,42 @@ msgstr "" msgid "dreamjob.graducation" msgstr "" +#: View/Elements/user_worker_item.ctp:53 +#: View/Job/application.ctp:27 +msgid "dreamjob.application.close" +msgstr "" + +#: View/Elements/user_worker_item.ctp:57 +#: View/Job/application.ctp:29 +msgid "dreamjob.application.close.actived" +msgstr "" + +#: View/Elements/user_worker_item.ctp:65 +msgid "dreamjob.applicated.to" +msgstr "" + #: View/Elements/user_worker_item.ctp:73 msgid "dreamjob.details" msgstr "" #: View/Emails/html/delete_order.ctp:2 -#: View/Emails/html/registration.ctp:2 #: View/User/test.ctp:12 msgid "dreamjob.regisration.active.link" msgstr "" -#: View/Emails/html/job_application.ctp:2 -#: View/Emails/html/job_application_msg.ctp:2 -#: View/Job/application.ctp:39 -msgid "dreamjob.message.send" +#: 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" msgstr "" #: View/Home/home.ctp:13 msgid "dreamjob.search.opening.startpage.placeholder" msgstr "" -#: View/Home/home.ctp:22 -msgid "dreamjob.registration.to" -msgstr "" - #: View/Home/home.ctp:26 msgid "dreamjob.search.to" msgstr "" @@ -487,28 +668,17 @@ msgstr "" msgid "dreamjob.startpage.openings" msgstr "" -#: View/Job/application.ctp:10 -#: View/Job/applicationWorker_list.ctp:7 -#: View/Job/opening.ctp:28 -msgid "dreamjob.my.application" -msgstr "" - - #: View/Job/application.ctp:16 #: View/User/company.ctp:111;113;132 msgid "dreamjob.opening" msgstr "" -#: View/Job/application.ctp:27 -msgid "dreamjob.application.close" -msgstr "" - -#: View/Job/application.ctp:29 -msgid "dreamjob.application.close.actived" +#: View/Job/application.ctp:39 +msgid "dreamjob.message.send" msgstr "" #: View/Job/application.ctp:64;118 -#: View/Pdf/application.ctp:43 +#: View/Pdf/application.ctp:47 msgid "dreamjob.application.why" msgstr "" @@ -518,6 +688,13 @@ 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 +#: View/User/settings_pages.ctp:113 msgid "dreamjob.save" msgstr "" @@ -525,6 +702,10 @@ msgstr "" msgid "dreamjob.application.archiv.activ" msgstr "" +#: View/Job/applicationCompany_list.ctp:14 +msgid "dreamjob.application.archiv" +msgstr "" + #: View/Job/applicationCompany_list.ctp:15 msgid "dreamjob.application.archiv.all" msgstr "" @@ -537,43 +718,36 @@ msgstr "" msgid "dreamjob.application.form" msgstr "" -#: View/Job/application_send.ctp:18 +#: View/Job/application_send.ctp:27 msgid "dreamjob.opening.subject.placeholder" msgstr "" -#: View/Job/application_send.ctp:18 -msgid "dreamjob.application.subject" -msgstr "" - -#: View/Job/application_send.ctp:22 +#: View/Job/application_send.ctp:31 msgid "dreamjob.application.addPages" msgstr "" -#: View/Job/application_send.ctp:34 +#: View/Job/application_send.ctp:43 #: View/Registration/company.ctp:38 #: View/Registration/worker.ctp:41 msgid "dreamjob.agb.accept" msgstr "" -#: View/Job/application_send.ctp:34 -#: View/Layouts/default.ctp:116 -#: View/Registration/company.ctp:38 -#: View/Registration/worker.ctp:41 -msgid "dreamjob.agb" -msgstr "" - -#: View/Job/application_send.ctp:37 +#: View/Job/application_send.ctp:46 msgid "dreamjob.application.send" msgstr "" -#: View/Job/favorite.ctp:7 -msgid "dreamjob.my.favority" -msgstr "" - #: View/Job/opening.ctp:20 msgid "dreamjob.company.to" msgstr "" +#: View/Job/opening.ctp:31 +msgid "dreamjob.favority.adding" +msgstr "" + +#: View/Job/opening.ctp:33 +msgid "dreamjob.favority.removeing" +msgstr "" + #: View/Job/opening_edit.ctp:27 msgid "dreamjob.opening.addForm" msgstr "" @@ -628,10 +802,6 @@ msgstr "" msgid "dreamjob.text" msgstr "" -#: View/Job/opening_list.ctp:7 -msgid "dreamjob.my.opening" -msgstr "" - #: View/Job/opening_list.ctp:11 msgid "dreamjob.opening.add" msgstr "" @@ -644,47 +814,11 @@ msgstr "" msgid "dreamjob.close" msgstr "" -#: View/Layouts/default.ctp:96 -msgid "dreamjob.help" -msgstr "" - -#: View/Layouts/default.ctp:97 -msgid "dreamjob.faq" -msgstr "" - -#: View/Layouts/default.ctp:102 -msgid "dreamjob.sponsorus" -msgstr "" - -#: View/Layouts/default.ctp:103 -msgid "dreamjob.cooperators" -msgstr "" - -#: View/Layouts/default.ctp:104 -msgid "dreamjob.advertisers" -msgstr "" - -#: View/Layouts/default.ctp:110 -msgid "dreamjob.contact" -msgstr "" - -#: View/Layouts/default.ctp:111 -msgid "dreamjob.uscompany" -msgstr "" - -#: View/Layouts/default.ctp:117 -msgid "dreamjob.impressum" -msgstr "" - -#: View/Layouts/default.ctp:118 -msgid "dreamjob.advbyus" -msgstr "" - -#: View/Pdf/application.ctp:35 +#: View/Pdf/application.ctp:38 msgid "dreamjob.application.for" msgstr "" -#: View/Pdf/profil.ctp:32 +#: View/Pdf/profil.ctp:36 msgid "dreamjob.application.mappe" msgstr "" @@ -717,6 +851,7 @@ msgid "dreamjob.mail.placeholder" msgstr "" #: View/Registration/company.ctp:17 +#: View/Registration/password_replace.ctp:9 #: View/Registration/worker.ctp:17 #: View/User/settings_account.ctp:42 msgid "dreamjob.password2" @@ -781,6 +916,18 @@ msgstr "" msgid "dreamjob.registration.worker" msgstr "" +#: View/Registration/password_replace.ctp:5 +msgid "dreamjob.password.replace" +msgstr "" + +#: View/Registration/password_reset.ctp:5 +msgid "dreamjob.password.reset" +msgstr "" + +#: View/Registration/password_reset.ctp:11 +msgid "dreamjob.password.send" +msgstr "" + #: View/Registration/worker.ctp:19 #: View/User/settings_account.ctp:46 msgid "dreamjob.worker" @@ -840,6 +987,7 @@ msgstr "" #: View/Search/education.ctp:24;25 #: View/Search/internship.ctp:24;25 #: View/Search/opening.ctp:24;26;27;28 +#: View/Search/worker.ctp:23;24;25 msgid "dreamjob.chooseOne" msgstr "" @@ -879,11 +1027,9 @@ msgstr "" msgid "dreamjob.search.worker.placeholder" msgstr "" -#: View/User/settings_account.ctp:17;32 -#: View/User/settings_account_delete.ctp:9 -#: View/User/settings_isearch.ctp:17 -#: View/User/settings_pages.ctp:35 -msgid "dreamjob.settings" +#: View/Search/worker.ctp:24 +#: View/User/settings_isearch.ctp:30 +msgid "dreamjob.job" msgstr "" #: View/User/settings_account.ctp:21 @@ -935,8 +1081,8 @@ msgstr "" msgid "dreamjob.settings.to" msgstr "" -#: View/User/settings_isearch.ctp:30 -msgid "dreamjob.job" +#: View/User/settings_imageUpload.ctp:11 +msgid "dreamjob.avatar" msgstr "" #: View/User/settings_isearch.ctp:32 @@ -1115,114 +1261,3 @@ msgstr "" msgid "Debug setting does not allow access to this url." msgstr "" -#: View/User/setings_imageUpload.ctp -msgid "dreamjob.avatar" -msgstr "" - -# -msgid "dreamjob.favority.adding" -msgstr "" - -# -msgid "dreamjob.favority.removeing" -msgstr "" - -# -msgid "dreamjob.contactSend" -msgstr "" - -# -msgid "dreamjob.contactSend.error" -msgstr "" - - -# -msgid "dreamjob.application.send.success" -msgstr "" - -# -msgid "dreamjob.application.send.error" -msgstr "" - - -msgid "dreamjob.my.profil" -msgstr "" - -msgid "dreamjob.applicated.to" -msgstr "" - - - -msgid "dreamjob.password.reset" -msgstr "" - -msgid "dreamjob.password.replace" -msgstr "" - -msgid "dreamjob.password.send" -msgstr "" - -msgid "dreamjob.password_reset.send" -msgstr "" - -msgid "dreamjob.password_reset.send.error" -msgstr "" - -msgid "dreamjob.password_replace.error" -msgstr "" - -msgid "dreamjob.password_replace.done" -msgstr "" - -msgid "dreamjob.password_replace.notFound" -msgstr "" - - - - -# -# Generierte Fehlermeldungen eigenarbeit! -# - -# - -msgid "dreamjob.error.noPermision.title" -msgstr "" - -msgid "dreamjob.error.noPermision.text" -msgstr "" - -# - -msgid "dreamjob.error.noCompany.title" -msgstr "" - -msgid "dreamjob.error.noCompany.text" -msgstr "" - -# - -msgid "dreamjob.error.noWorker.title" -msgstr "" - -msgid "dreamjob.error.noWorker.text" -msgstr "" - -# - -msgid "dreamjob.error.loggedin.title" -msgstr "" - -msgid "dreamjob.error.loggedin.text" -msgstr "" - -# - -msgid "dreamjob.error.opening.notFound.title" -msgstr "" - -msgid "dreamjob.error.opening.notFound.text" -msgstr "" - -# - -msgid "dreamjob.error.link.title" -msgstr "" - -msgid "dreamjob.error.link.text" -msgstr "" - diff --git a/app/View/Home/error.ctp b/app/View/Home/error.ctp index 7bfc80a..70ddbf9 100644 --- a/app/View/Home/error.ctp +++ b/app/View/Home/error.ctp @@ -4,6 +4,6 @@ */ ?>
-

- +

+
diff --git a/app/View/Layouts/default.ctp b/app/View/Layouts/default.ctp index e266ae0..07dc679 100755 --- a/app/View/Layouts/default.ctp +++ b/app/View/Layouts/default.ctp @@ -5,7 +5,7 @@ ?> - <?=((isset($title))?__($title):$title_for_layout);?> - <?=__('dreamjob');?> + <?=((isset($title))?$title:$title_for_layout);?> - <?=__('dreamjob');?> Html->charset(); diff --git a/app/View/Registration/company.ctp b/app/View/Registration/company.ctp index c9b18ca..cb5b2b9 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.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(__('dreamjob.save'),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.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?> + Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>