From 3f86961bdaaaa38871febd51fbf9273b3b6bbc5e Mon Sep 17 00:00:00 2001
From: SimonGschnell <simongschnell@gmail.com>
Date: Wed, 7 Aug 2024 15:21:22 +0200
Subject: [PATCH] adds parameter to ampeln deadline/overdue phrase

---
 application/helpers/hlp_return_object_helper.php |  7 +++----
 public/js/components/DashboardWidget/Ampel.js    |  8 ++++----
 system/phrasesupdate.php                         | 10 +++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/application/helpers/hlp_return_object_helper.php b/application/helpers/hlp_return_object_helper.php
index 4db5eb9e3..602008d3b 100755
--- a/application/helpers/hlp_return_object_helper.php
+++ b/application/helpers/hlp_return_object_helper.php
@@ -25,11 +25,10 @@ if (! defined('BASEPATH')) exit('No direct script access allowed');
 
 /**
  * Used to create a return object, should not be used directly
- * @return  stdClass
+ * @return stdClass
  */
 function _createReturnObject($code, $error, $retval)
 {
-	
 	$returnObject = new stdClass();
 	$returnObject->code = $code;
 	$returnObject->error = $error;
@@ -41,7 +40,7 @@ function _createReturnObject($code, $error, $retval)
 /**
  * Success
  *
- * @return  stdClass
+ * @return stdClass
  */
 function success($retval = null, $code = null)
 {
@@ -51,7 +50,7 @@ function success($retval = null, $code = null)
 /**
  * Error
  *
- * @return  stdClass
+ * @return stdClass
  */
 function error($retval = null, $code = null)
 {
diff --git a/public/js/components/DashboardWidget/Ampel.js b/public/js/components/DashboardWidget/Ampel.js
index 9ec65fa14..be5db43ea 100755
--- a/public/js/components/DashboardWidget/Ampel.js
+++ b/public/js/components/DashboardWidget/Ampel.js
@@ -145,7 +145,7 @@ export default {
 				<div class="d-flex justify-content-end">
 					<a v-if="count.ueberfaellig > 0" :href="'#allAmpelOffcanvas' + idcounter" data-bs-toggle="offcanvas" @click="filter = 'ueberfaellig'" class="text-decoration-none">
 						<span class="badge bg-danger me-1">
-							<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+							<i class="fa fa-solid fa-bolt"></i> {{$p.t('ampeln','overdue',{count:count.ueberfaellig})}}
 						</span>
 					</a>
 				</div>
@@ -154,7 +154,7 @@ export default {
 						<div class="card-body">
 							<div class="position-relative">
 								<div class="d-flex">
-									<div class="text-muted small me-auto"><small>{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}</small></div>
+									<div class="text-muted small me-auto"><small>{{$p.t('ampeln','ampelnDeadline',{value:getDate(ampel.deadline)})}}</small></div>
 									<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt "><span class="badge bg-danger"><i class="fa fa-solid fa-bolt"></i></span></div>
 									<div v-if="ampel.verpflichtend"><span class="badge bg-warning ms-1"><i class="fa fa-solid fa-triangle-exclamation"></i></span></div>
 									<div v-if="ampel.bestaetigt"><span class="badge bg-success ms-1"><i class="fa fa-solid fa-circle-check"></i></span></div>
@@ -210,7 +210,7 @@ export default {
 						<button class="btn btn-danger w-100"  @click="toggleFilter('ueberfaellig')">
 							<i class="fa fa-solid fa-bolt me-2"></i>
 							<small :class="{'fw-bold':filter==='ueberfaellig'}">
-								{{$p.t('ampeln','overdue')}}: <b>{{ count.ueberfaellig }}</b>
+								{{$p.t('ampeln','overdue',{count:count.ueberfaellig})}}
 							</small>
 						</button>
 					</div>
@@ -231,7 +231,7 @@ export default {
 								<div class="d-flex">
 									<span class="small text-muted me-auto">
 										<small>
-											{{$p.t('ampeln','deadline')}}: {{ getDate(ampel.deadline) }}
+											{{$p.t('ampeln','ampelnDeadline',{value:getDate(ampel.deadline)})}}
 										</small>
 									</span>
 									<div v-if="(new Date() > new Date(ampel.deadline)) && !ampel.bestaetigt">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9182de60a..b22e6c8cf 100755
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -27539,13 +27539,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Überfällig',
+				'text' => 'Überfällig: {count}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Overdue',
+				'text' => 'Overdue: {count}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -27554,18 +27554,18 @@ array(
 	array(
 		'app' => 'core',
 		'category' => 'ampeln',
-		'phrase' => 'deadline',
+		'phrase' => 'ampelnDeadline',
 		'insertvon' => 'system',
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Stichtag',
+				'text' => 'Stichtag: {value}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Deadline',
+				'text' => 'Deadline: {value}',
 				'description' => '',
 				'insertvon' => 'system'
 			)