miconware
/
dreamjob
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i18n etwas umstrukturiert

This commit is contained in:
Martin Müller 2014-06-10 18:37:45 +02:00
parent cd37b3fe1c
commit 9988d06d71
14 changed files with 437 additions and 438 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controller/ExtraController.php
View File

@ -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');
}
}

24
app/Controller/HomeController.php
View File

@ -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');
}
}

40
app/Controller/JobController.php
View File

@ -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');
}
}

4
app/Controller/PdfController.php
View File

@ -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');

26
app/Controller/RegistrationController.php
View File

@ -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');
}
}

6
app/Controller/SearchController.php
View File

@ -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');
}
}

36
app/Controller/UserController.php
View File

@ -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'));
}

38
app/Locale/cake.pot
View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\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"

2
app/Locale/cake_dev.pot
View File

@ -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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"

669
app/Locale/default.pot
View File

File diff suppressed because it is too large Load Diff

4
app/View/Home/error.ctp
View File

@ -4,6 +4,6 @@
*/
?>
<div class="box">
<h1><?=__($error.".title");?></h1>
<?=__($error.".text");?>
<h1><?=$error["title"];?></h1>
<?=$error["text"];?>
</div>

2
app/View/Layouts/default.ctp
View File

@ -5,7 +5,7 @@
?>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="de" lang="de">
<head>
<title><?=((isset($title))?__($title):$title_for_layout);?> - <?=__('dreamjob');?></title>
<title><?=((isset($title))?$title:$title_for_layout);?> - <?=__('dreamjob');?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<?php
echo $this->Html->charset();

2
app/View/Registration/company.ctp
View File

@ -38,7 +38,7 @@
<?=$this->Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
</div>
<br/>
<?=$this->Form->button(__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
</div>
</fieldset>
<?php

2
app/View/Registration/worker.ctp
View File

@ -41,7 +41,7 @@
<?=$this->Html->link(__("dreamjob.agb.accept"),array('controller'=>'home','action'=>'agb'),array('data-target'=>'#popup','data-toggle'=>"modal",'title'=>__('dreamjob.agb'),"ref"=>"eventOff"));?>
</div>
<br/>
<?=$this->Form->button(__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
</div>
</fieldset>
<?php