openrat-cms

commit 69f767917e8a1d46cfb710e7bbbccd0539f71480
parent c04140302c0172a85968556210da33d1c81f20ce
Author: dankert <openrat@jandankert.de>
Date:   Sat,  4 Dec 2021 00:36:49 +0100

New: Short date format if the date is not older than 24 houres.

Diffstat:
M
modules/language/Language_CN.class.php
 | 
3
++-
M
modules/language/Language_DE.class.php
 | 
3
++-
M
modules/language/Language_EN.class.php
 | 
3
++-
M
modules/language/Language_ES.class.php
 | 
3
++-
M
modules/language/Language_FR.class.php
 | 
3
++-
M
modules/language/Language_IT.class.php
 | 
3
++-
M
modules/language/Language_RU.class.php
 | 
3
++-
M
modules/language/Messages.class.php
 | 
1
+
M
modules/language/language.yml
 | 
19
+++++++++++++------
M
modules/template_engine/components/html/component_date/component-date.php
 | 
3
++-

10 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/modules/language/Language_CN.class.php b/modules/language/Language_CN.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Creation-User',
 'DATE_ANSI'=>'Date ANSI notation',
 'DATE'=>'Date',
-'DATE_FORMAT'=>'m/d Y, H:i:s',
+'DATE_FORMAT'=>'m/d Y',
+'DATE_FORMAT_TODAY'=>'H:i:s',
 'DATE_FORMAT_LONG'=>'l F jS Y, H:i',
 'DATE_LAST_MONTH'=>'Last month',
 'DATE_LAST_YEAR'=>'Last year',
diff --git a/modules/language/Language_DE.class.php b/modules/language/Language_DE.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Erstellungsautor',
 'DATE_ANSI'=>'Datum gemäß ANSI-Notation',
 'DATE'=>'Datum',
-'DATE_FORMAT'=>'d.m.Y, H:i',
+'DATE_FORMAT'=>'d.m.Y',
+'DATE_FORMAT_TODAY'=>'H:i',
 'DATE_FORMAT_LONG'=>'{weekday}\, d. {month} Y \u\m H:i:s',
 'DATE_LAST_MONTH'=>'Letzter Monat',
 'DATE_LAST_YEAR'=>'Letztes Jahr',
diff --git a/modules/language/Language_EN.class.php b/modules/language/Language_EN.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Creation-User',
 'DATE_ANSI'=>'Date ANSI notation',
 'DATE'=>'Date',
-'DATE_FORMAT'=>'m/d Y, H:i:s',
+'DATE_FORMAT'=>'m/d Y',
+'DATE_FORMAT_TODAY'=>'H:i:s',
 'DATE_FORMAT_LONG'=>'l F jS Y, H:i',
 'DATE_LAST_MONTH'=>'Last month',
 'DATE_LAST_YEAR'=>'Last year',
diff --git a/modules/language/Language_ES.class.php b/modules/language/Language_ES.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Creationuser',
 'DATE_ANSI'=>'Fechar la notación del ANSI',
 'DATE'=>'Fechar',
-'DATE_FORMAT'=>'m/d Y, H: i: s',
+'DATE_FORMAT'=>'m/d Y',
+'DATE_FORMAT_TODAY'=>'H: i: s',
 'DATE_FORMAT_LONG'=>'l F jS Y, H:i',
 'DATE_LAST_MONTH'=>'El mes pasado',
 'DATE_LAST_YEAR'=>'El año pasado',
diff --git a/modules/language/Language_FR.class.php b/modules/language/Language_FR.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Creationuser',
 'DATE_ANSI'=>'Dater la notation de norme ANSI',
 'DATE'=>'Dater',
-'DATE_FORMAT'=>'m/d Y, H : i : s',
+'DATE_FORMAT'=>'m/d Y',
+'DATE_FORMAT_TODAY'=>'H : i : s',
 'DATE_FORMAT_LONG'=>'l F jS Y, H:i',
 'DATE_LAST_MONTH'=>'Le mois dernier',
 'DATE_LAST_YEAR'=>'L\'année dernière',
diff --git a/modules/language/Language_IT.class.php b/modules/language/Language_IT.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Creationuser',
 'DATE_ANSI'=>'Date ANSI notation',
 'DATE'=>'la notazione dell\'ANSI della data della data',
-'DATE_FORMAT'=>'m/d Y, H: i:s',
+'DATE_FORMAT'=>'m/d Y',
+'DATE_FORMAT_TODAY'=>'H: i:s',
 'DATE_FORMAT_LONG'=>'l F jS Y, H:i',
 'DATE_LAST_MONTH'=>'Last month',
 'DATE_LAST_YEAR'=>'l\'anno scorso',
diff --git a/modules/language/Language_RU.class.php b/modules/language/Language_RU.class.php
@@ -121,7 +121,8 @@ public function get() { return [
 'CREATE_USER'=>'Creationuser',
 'DATE_ANSI'=>'Дата ANSI счисления',
 'DATE'=>'Дата',
-'DATE_FORMAT'=>'m/d Y, H: i:s',
+'DATE_FORMAT'=>'m/d Y',
+'DATE_FORMAT_TODAY'=>'H: i:s',
 'DATE_FORMAT_LONG'=>'l F jS Y, H:i',
 'DATE_LAST_MONTH'=>'За последний месяц За последний',
 'DATE_LAST_YEAR'=>'Last year',
diff --git a/modules/language/Messages.class.php b/modules/language/Messages.class.php
@@ -122,6 +122,7 @@ class Messages {
   const DATE_ANSI = 'DATE_ANSI';
   const DATE = 'DATE';
   const DATE_FORMAT = 'DATE_FORMAT';
+  const DATE_FORMAT_TODAY = 'DATE_FORMAT_TODAY';
   const DATE_FORMAT_LONG = 'DATE_FORMAT_LONG';
   const DATE_LAST_MONTH = 'DATE_LAST_MONTH';
   const DATE_LAST_YEAR = 'DATE_LAST_YEAR';
diff --git a/modules/language/language.yml b/modules/language/language.yml
@@ -482,12 +482,19 @@ DATE:
   it: "la notazione dell'ANSI della data della data"
   ru: Дата
 DATE_FORMAT:
-  de: d.m.Y, H:i
-  en: m/d Y, H:i:s
-  es: 'm/d Y, H: i: s'
-  fr: 'm/d Y, H : i : s'
-  it: "m/d Y, H: i:s"
-  ru: 'm/d Y, H: i:s'
+  de: "d.m.Y"
+  en: "m/d Y"
+  es: 'm/d Y'
+  fr: 'm/d Y'
+  it: "m/d Y"
+  ru: 'm/d Y'
+DATE_FORMAT_TODAY:
+  de: "H:i"
+  en: "H:i:s"
+  es: "H: i: s"
+  fr: "H : i : s"
+  it: "H: i:s"
+  ru: "H: i:s"
 DATE_FORMAT_LONG:
   de: '{weekday}\, d. {month} Y \u\m H:i:s'
   en: "l F jS Y, H:i"
diff --git a/modules/template_engine/components/html/component_date/component-date.php b/modules/template_engine/components/html/component_date/component-date.php
@@ -62,7 +62,8 @@ function component_date($time )
 		echo ' datetime="'.date('c',$time).'"';
 
 		echo '>';
-		echo date( Output::lang(Messages::DATE_FORMAT),$time );
+		$format = (\cms\base\Startup::getStartTime()-$time)>(60*60*24)?Messages::DATE_FORMAT:Messages::DATE_FORMAT_TODAY;
+		echo date( Output::lang($format),$time );
 		echo '</time>';
 	}
 }