From c6fb81c04583019055c1754298c0fe843fba3a9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCller?= Date: Mon, 15 Sep 2014 18:10:35 +0200 Subject: [PATCH] Externe Bewerbung + Service sprache --- app/Controller/JobController.php | 4 +++- app/Locale/default.pot | 6 +++++- app/Locale/deu/LC_MESSAGES/default.mo | Bin 16720 -> 16793 bytes app/Locale/deu/LC_MESSAGES/default.po | 10 +++++++--- app/View/Elements/navbar.ctp | 7 +++++-- app/View/Service/show.ctp | 4 ++-- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/app/Controller/JobController.php b/app/Controller/JobController.php index 899fe00..4bf7b7c 100644 --- a/app/Controller/JobController.php +++ b/app/Controller/JobController.php @@ -436,8 +436,10 @@ class JobController extends AppController { $this->request->data['DreamjobUser']['postcode'] = $this->request->query('postcode'); $this->request->data['DreamjobListCity']['name'] = $this->request->query('city'); } - + $this->set('pages', $w['DreamjobPageInh']); + + $this->set('MENU_EXT_APP', true); $this->render('/Job/application_send_ext'); } else { diff --git a/app/Locale/default.pot b/app/Locale/default.pot index d8d0c0d..e9ef0bb 100644 --- a/app/Locale/default.pot +++ b/app/Locale/default.pot @@ -469,12 +469,16 @@ msgstr "" msgid "dreamjob.service.overview" msgstr "" +#: View/Elements/navbar.ctp:9 +msgid "dreamjob.service.overview.to" +msgstr "" + #: View/Elements/navbar.ctp:9 msgid "dreamjob.service.infotext" msgstr "" #: View/Elements/navbar.ctp:9 -msgid "dreamjob.service.link" +msgid "dreamjob.service.link.to" msgstr "" #: View/Elements/navbar.ctp:11 diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo index e5bb6448604957d969c681c23315f18703628474..620f6c4ba519c889bb43f93cce70354fe8643320 100644 GIT binary patch delta 4171 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 J|6IB@=l?i-!sP$} diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po index a81955f..d1eab7e 100644 --- a/app/Locale/deu/LC_MESSAGES/default.po +++ b/app/Locale/deu/LC_MESSAGES/default.po @@ -1205,7 +1205,7 @@ msgstr "Bewerbung" #: View/Job/application_send.ctp:13 msgid "dreamjob.application.extern.to" -msgstr "Bewerbungs-Tool" +msgstr "Externe Bewerbung" #: View/Job/application_send.ctp:13 msgid "dreamjob.application.receiver" @@ -1215,6 +1215,10 @@ msgstr "Empfänger" msgid "dreamjob.service.overview" msgstr "Übersicht" +#: View/Elements/navbar.ctp:9 +msgid "dreamjob.service.overview.to" +msgstr "zur Übersicht" + #: View/Elements/navbar.ctp:9 msgid "dreamjob.service.infotext" msgstr "" @@ -1222,5 +1226,5 @@ msgstr "" "die unseres ergänzten oder für Jobsuchende interessant sein könnte " #: View/Elements/navbar.ctp:9 -msgid "dreamjob.service.link" -msgstr "zum " +msgid "dreamjob.service.link.to" +msgstr "zur Webseite" diff --git a/app/View/Elements/navbar.ctp b/app/View/Elements/navbar.ctp index 0795538..2edb17b 100755 --- a/app/View/Elements/navbar.ctp +++ b/app/View/Elements/navbar.ctp @@ -1,12 +1,15 @@
    class="active">Html->link(__('dreamjob.startpage'),array('controller'=>'home','action'=>'company'));?> - class="active">Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'worker'));?> + class="active">Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'worker'));?> class="active">Html->link(__('dreamjob.startpage'),array('controller'=>'home','action'=>'home'));?> - class="active">Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?> + class="active">Html->link(__('dreamjob.search'),array('controller'=>'search','action'=>'opening'));?> class="active">Html->link(__('dreamjob.service'),array('controller'=>'service','action'=>'index'));?> + + class="active">Html->link(__('dreamjob.application.extern.to'),array('controller'=>'job','action'=>'applicationSendExt'));?> +
  • Html->link(__('dreamjob.logout'),array('controller'=>'home','action'=>'logout'));?>
    • diff --git a/app/View/Service/show.ctp b/app/View/Service/show.ctp index c857771..e5bb173 100644 --- a/app/View/Service/show.ctp +++ b/app/View/Service/show.ctp @@ -7,7 +7,7 @@ dreamJOB+
    - Html->link(__('dreamjob'),array('controller'=>'service','action'=>'index','list'=>$obj['DreamjobService']['category']));?> + Html->link(__('dreamjob.service.overview.to'),array('controller'=>'service','action'=>'index','list'=>$obj['DreamjobService']['category']));?>

    0)?' style="color:#333;background-color:#'.$obj['DreamjobService']['color'].';"':'';?>>

    @@ -21,7 +21,7 @@
    0){ ?> - Html->link(__('dreamjob'),$obj['DreamjobService']['link'],array('class'=>'btn btn-default','rel'=>'external','target'=>'_blank'));?> + Html->link(__('dreamjob.service.link.to'),$obj['DreamjobService']['link'],array('class'=>'btn btn-default','rel'=>'external','target'=>'_blank'));?>