diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts index 851ee3d16fbdab08305e2b08e2c5e302d2a59592..fdeab8d264ddd8f4d3392545d4a1db448d4dba2b 100755 --- a/src/frontend/lang/lang-en.ts +++ b/src/frontend/lang/lang-en.ts @@ -1241,4 +1241,5 @@ export const LANG_EN = { "dashboard" : "Dashboard", "noSendmail" : "No mail sent", "noEvent" : "Aucun event", + "hours" : "hours", }; diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts index 659bece474dccbc1955d083e686f1cbf26b4cfe2..c5863775bef4a4fd0b3a74c04edb1c492210f9d9 100755 --- a/src/frontend/lang/lang-fr.ts +++ b/src/frontend/lang/lang-fr.ts @@ -1278,4 +1278,5 @@ export const LANG_FR = { "dashboard" : "Vue d'ensemble", "noSendmail" : "Aucun envoi", "noEvent" : "Aucun évênement", + "hours" : "heures", }; diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts index 050d8cf2f3b963344390c11c7ef275d95d12bc9e..4be6e552491fce7274482dfd31f52da50c22a0ae 100755 --- a/src/frontend/lang/lang-nl.ts +++ b/src/frontend/lang/lang-nl.ts @@ -1266,4 +1266,5 @@ export const LANG_NL = { "dashboard" : "Dashboard", //_TO_TRANSLATE "noSendmail" : "No mail sent", //_TO_TRANSLATE "noEvent" : "Aucun event", //_TO_TRANSLATE + "hours" : "hours", //_TO_TRANSLATE }; diff --git a/src/frontend/plugins/timeLimit.pipe.ts b/src/frontend/plugins/timeLimit.pipe.ts index fdae009da57ff7df5f7fa41e299ada1bad2296e6..01fa614471e39daf72fd4bb8bcbb224dff2df9bd 100755 --- a/src/frontend/plugins/timeLimit.pipe.ts +++ b/src/frontend/plugins/timeLimit.pipe.ts @@ -51,8 +51,13 @@ export class TimeLimitPipe implements PipeTransform, OnDestroy { } else if(now > d) { return '<span class="timeDanger" color="warn"><b>' + this.lang.outdated + ' !</b></span>'; } else { + console.log(days); if (Number.isNaN(seconds)){ return ''; + } else if (minutes <= 59){ + return '<span color="warn"><b>'+ minutes + ' ' + this.lang.minutes +'</b></span>'; + } else if (hours <= 23){ + return '<span color="warn"><b>'+ hours + ' ' + this.lang.hours +'</b></span>'; } else if (days <= 3) { return '<span color="warn"><b>'+ days + ' ' + this.lang.dayS +'</b></span>'; } else if (days <= 7) { @@ -65,40 +70,6 @@ export class TimeLimitPipe implements PipeTransform, OnDestroy { return dayNumber + '/' + monthNumber + '/' + d.getFullYear(); } } - - - /*if (Number.isNaN(seconds)){ - return ''; - } else if (seconds <= 45) { - return seconds + ' secondes'; - } else if (seconds <= 90) { - //return 'une minute'; - } else if (minutes <= 45) { - return minutes + ' minutes'; - } else if (minutes <= 90) { - //return 'une heure'; - } else if (hours <= 22) { - return hourNumber+':'+minuteNumber; - //return hours + ' heures'; - } else if (hours <= 36) { - return dayNumber+' '+ month[d.getMonth()]; - //return 'un jour'; - } else if (days <= 25) { - return d.getDate()+' '+ month[d.getMonth()]; - //return days + ' jours'; - } else if (days <= 45) { - return d.getDate()+' '+ month[d.getMonth()]; - //return 'un mois'; - } else if (days <= 345) { - return d.getDate()+' '+ month[d.getMonth()]; - //return months + ' mois'; - } else if (days <= 545) { - return dayNumber + '/' + monthNumber + '/' + d.getFullYear(); - //return 'un an'; - } else { // (days > 545) - return dayNumber + '/' + monthNumber + '/' + d.getFullYear(); - //return years + ' ans'; - }*/ } ngOnDestroy(): void { this.removeTimer();