Merge pull request #58 from helsingborg-stad/feature/allow-already-se…

…t-lang feat: allow already set lang
helsingborg-stad · Nov 6, 2023 · 01e227d · 01e227d
2 parents d63d1d2 + 858208e
commit 01e227d
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/source/php/Controller.php b/source/php/Controller.php
@@ -58,16 +58,18 @@ public function singleViewData($data)
         $data['sourceSystem'] = $this->getSourceSystem();
         $data['preparedListData'] = $this->prepareData($data);
 
-        $data['lang'] = (object) [
-            'applyNow'      => __('Apply now', 'job-listings'),
-            'applyHere'     => __('Apply here', 'job-listings'),
-            'contact'       => __('Contact', 'job-listings'),
-            'information'   => __('Information', 'job-listings'),
-            'login'         => __('Log in', 'job-listings'),
-            'daysLeft'      => __('Days left', 'job-listings'),
-            'periodEnded'   => __('The application period has ended', 'job-listings'),
+        $lang = [
+            'applyNow' => __('Apply now', 'job-listings'),
+            'applyHere' => __('Apply here', 'job-listings'),
+            'contact' => __('Contact', 'job-listings'),
+            'information' => __('Information', 'job-listings'),
+            'login' => __('Log in', 'job-listings'),
+            'daysLeft' => __('Days left', 'job-listings'),
+            'periodEnded' => __('The application period has ended', 'job-listings')
         ];
 
+        $data['lang'] = isset($data['lang']) && is_object($data['lang']) ? (object) array_merge((array) $data['lang'], $lang) : (object) $lang;
+
         return $data;
     }