adds parameter to ampeln deadline/overdue phrase

This commit is contained in:
SimonGschnell
2024-08-07 15:21:22 +02:00
parent 05e0d219f4
commit 3f86961bda
3 changed files with 12 additions and 13 deletions
@@ -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)
{
@@ -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">
+5 -5
View File
@@ -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'
)