From 3bebc9a35fba318c3543dca0c3387569d8893226 Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@users.noreply.github.com>
Date: Sat, 25 Jan 2014 20:22:54 +0100
Subject: [PATCH] add IntlDateFormatter for formatting locale-dependent date
 and time

---
 app/Controller.inc                          |  14 +++++++++
 app/Utils.inc                               |   8 -----
 configs/AppConfig.inc                       |   3 +-
 locale/de_DE/LC_MESSAGES/The Legend of Z.mo | Bin 1407 -> 1544 bytes
 locale/de_DE/LC_MESSAGES/The Legend of Z.po |  32 +++++++++++++++++---
 views/html/seminaries/index.tpl             |   2 +-
 views/html/seminaries/seminary.tpl          |   2 +-
 views/html/users/index.tpl                  |   2 +-
 views/html/users/user.tpl                   |   2 +-
 9 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/app/Controller.inc b/app/Controller.inc
index 24301a88..5594ac31 100644
--- a/app/Controller.inc
+++ b/app/Controller.inc
@@ -82,6 +82,20 @@
 			// Create linker
 			$this->linker = new \nre\core\Linker($this->request);
 			
+			// Create date and time formatter
+			$this->set('dateFormatter', new \IntlDateFormatter(
+				\nre\core\Config::getDefault('locale'),
+				\IntlDateFormatter::MEDIUM,
+				\IntlDateFormatter::NONE,
+				NULL
+			));
+			$this->set('timeFormatter', new \IntlDateFormatter(
+				\nre\core\Config::getDefault('locale'),
+				\IntlDateFormatter::NONE,
+				\IntlDateFormatter::SHORT,
+				NULL
+			));
+			
 			// Set userdata
 			$this->set('loggedUser', static::$user);
 		}
diff --git a/app/Utils.inc b/app/Utils.inc
index 3ef93670..1e3527c1 100644
--- a/app/Utils.inc
+++ b/app/Utils.inc
@@ -19,14 +19,6 @@
 	 */
 	class Utils
 	{
-		
-		/**
-		 * Format for printing the date
-		 * 
-		 * @var string
-		 */
-		const DATEFORMAT = 'm.d.Y';
-		
 	}
 
 ?>
diff --git a/configs/AppConfig.inc b/configs/AppConfig.inc
index c4ef5929..12624ab0 100644
--- a/configs/AppConfig.inc
+++ b/configs/AppConfig.inc
@@ -47,7 +47,8 @@
 			'toplevel-error'	=>	'fault',
 			'intermediate'		=>	'introduction',
 			'intermediate-error'	=>	'error',
-			'language'		=>	'de_DE.utf8'
+			'language'		=>	'de_DE.utf8',
+			'locale'		=>	'de-DE'
 		);
 		
 		
diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo
index a8dd7d2c500d170581bcd7b63409bb2c2e4438c8..cb455ec186be0d5ee691003275f56b08f9b65462 100644
GIT binary patch
delta 654
zcmYk3J4gdT5QaCo%hM!ke1ne@6hRR}K*eAq0YL<9#3E{uVwJ!pMIHpJU?*aC*lKBI
zWv5_cDWafam&#6UEG*S;l8ZRp?6<SKxAV{JPxv5GtH;e_h4tZs_!B;YA9)zCpjW9b
z7=rC^2)4m#7=rWA2h*?vF2e}Sxa+&nPn>tx%P>g1-(*c4G6}Qbzyv&ja^ZdRfO>Z0
zI+TlEUA{pP_UXocqbVQ?PZ2*1yV<`smFkC&uoJ#R`R^P0RZXcl*+lsOl*%Td2$*G%
zgbPpvreO@OLaAUI@~It$6tvy=3`z&ip`5#f(y1Glcd&=}MfS<BKA4EIFDPA);vz(n
zwM-PtPya1I(2K`$n$R$cZitpZo|GaR;-x_8h6s~fB8YU#k~bBV4NDhwwydp!u39CX
z&lR%8J?Fu*75ob(ylcMoT-nx6#k*u!<0a?HyBL_Ul8IC@;TXnfYko0h%z0ufm14=#
f#Zp<@wk|lEX4RA>=hn=~HQIK@d>j63o{Q8k!JA11

delta 531
zcmXxhD@X)E9LMpweR$`2o_Z<>-hmecqqo7wnhaYkhSPR+gGB@%b<?3i(_k_P7L%5%
z2PT_AgFysAFbQUp==Zlb{$chr|DB!3fA*yETh88U!MP!(Xmwhj)}VC?Jcvge!zUcU
zcO1qq4DlPs@dqnd^#<=}afrN$C0uZ}uuLA~qA{6C+`tiP!3;IA>paCta_jPI93{WS
zOE&G}40$IoW&#gU-yfsaxj-H83ROT4wa;BXo*8pbr^<^5)Jb362Ok)df1)azXO_kz
z)D5gT6PzaBbmJ*%!(HTjc_>#D2jmCS8l^T5*3VC@s{TV)&iwqh=$#JWtK&jfsA?!a
z4;7&5YcyN;I=1U=*k>=X4S&5D&9#=|XvL;})Ad(-XZ~`*z65)AD{R}Fa68;jcMi-S
Di<U5c

diff --git a/locale/de_DE/LC_MESSAGES/The Legend of Z.po b/locale/de_DE/LC_MESSAGES/The Legend of Z.po
index 0f2a598c..c42c969d 100644
--- a/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
+++ b/locale/de_DE/LC_MESSAGES/The Legend of Z.po	
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The Legend of Z\n"
-"POT-Creation-Date: 2014-01-22 16:28+0100\n"
-"PO-Revision-Date: 2014-01-22 16:29+0100\n"
+"POT-Creation-Date: 2014-01-25 20:20+0100\n"
+"PO-Revision-Date: 2014-01-25 20:20+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -25,6 +25,7 @@ msgstr "Benutzer"
 #: ../../../views/html/menu/index.tpl:3
 #: ../../../views/html/seminaries/seminary.tpl:1
 #: ../../../views/html/seminaries/index.tpl:1
+#: ../../../views/html/seminaries/create.tpl:1
 msgid "Seminaries"
 msgstr "Kurse"
 
@@ -56,8 +57,9 @@ msgid "Delete user"
 msgstr "Benutzer löschen"
 
 #: ../../../views/html/users/user.tpl:7 ../../../views/html/users/index.tpl:10
-msgid "registered on"
-msgstr "registriert seit"
+#, php-format
+msgid "registered on %s"
+msgstr "registriert am %s"
 
 #: ../../../views/html/users/index.tpl:3
 msgid "Create new user"
@@ -75,6 +77,7 @@ msgstr "E‑Mail-Adresse"
 
 #: ../../../views/html/users/edit.tpl:13
 #: ../../../views/html/users/create.tpl:13
+#: ../../../views/html/seminaries/create.tpl:9
 msgid "create"
 msgstr "erstellen"
 
@@ -100,11 +103,30 @@ msgid "Error"
 msgstr "Fehler"
 
 #: ../../../views/html/seminaries/seminary.tpl:4
-#: ../../../views/html/seminaries/index.tpl:7
+#: ../../../views/html/seminaries/index.tpl:10
 #, php-format
 msgid "created by %s on %s"
 msgstr "erstellt von %s am %s"
 
+#: ../../../views/html/seminaries/index.tpl:3
+msgid "Create new seminary"
+msgstr "Neuen Kurs erstellen"
+
+#: ../../../views/html/seminaries/create.tpl:2
+msgid "New seminary"
+msgstr "Neuer Kurs"
+
+#: ../../../views/html/seminaries/create.tpl:6
+#: ../../../views/html/seminaries/create.tpl:7
+msgid "Title"
+msgstr "Titel"
+
 #: ../../../views/html/introduction/index.tpl:1
 msgid "Introduction"
 msgstr "Einführung"
+
+#~ msgid "created by %s on %s at %s"
+#~ msgstr "erstellt von %s am %s um %s Uhr"
+
+#~ msgid "registered on"
+#~ msgstr "registriert seit"
diff --git a/views/html/seminaries/index.tpl b/views/html/seminaries/index.tpl
index 037f718e..6e40934a 100644
--- a/views/html/seminaries/index.tpl
+++ b/views/html/seminaries/index.tpl
@@ -4,7 +4,7 @@
 	<li>
 		<h2><a href="<?=$linker->link(array('seminary', $seminary['url']), 1)?>"><?=$seminary['title']?></a></h2>
 		<details>
-			<summary><?=sprintf(_('created by %s on %s'), $seminary['creator']['username'], date(\hhu\z\Utils::DATEFORMAT, strtotime($seminary['created'])))?></summary>
+			<summary><?=sprintf(_('created by %s on %s'), $seminary['creator']['username'], $dateFormatter->format(new \DateTime($seminary['created'])))?></summary>
 		</details>
 	</li>
 	<?php endforeach ?>
diff --git a/views/html/seminaries/seminary.tpl b/views/html/seminaries/seminary.tpl
index 094fbf3b..3c5f1aba 100644
--- a/views/html/seminaries/seminary.tpl
+++ b/views/html/seminaries/seminary.tpl
@@ -1,5 +1,5 @@
 <h1><?=_('Seminaries')?></h1>
 <h2><?=$seminary['title']?></h2>
 <p>
-	<?=sprintf(_('created by %s on %s'), $seminary['creator']['username'], date(\hhu\z\Utils::DATEFORMAT, strtotime($seminary['created'])))?>
+	<?=sprintf(_('created by %s on %s'), $seminary['creator']['username'],  $dateFormatter->format(new \DateTime($seminary['created'])))?>
 </p>
diff --git a/views/html/users/index.tpl b/views/html/users/index.tpl
index 9a5b525e..5d2883af 100644
--- a/views/html/users/index.tpl
+++ b/views/html/users/index.tpl
@@ -7,7 +7,7 @@
 	<li>
 		<h2><a href="<?=$linker->link(array('user', $user['username']), 1)?>"><?=$user['username']?></a></h2>
 		<details>
-			<summary><?=_('registered on')?> <?=date(\hhu\z\Utils::DATEFORMAT, strtotime($user['created']))?></summary>
+			<summary><?=sprintf(_('registered on %s'),  $dateFormatter->format(new \DateTime($user['created'])))?></summary>
 		</details>
 	</li>
 	<?php endforeach ?>
diff --git a/views/html/users/user.tpl b/views/html/users/user.tpl
index 1e8466b5..e3a037af 100644
--- a/views/html/users/user.tpl
+++ b/views/html/users/user.tpl
@@ -4,5 +4,5 @@
 	<li><a href="<?=$linker->link('delete', 3)?>"><?=_('Delete user')?></a></li>
 </nav>
 <p>
-	<?=_('registered on')?> <?=date(\hhu\z\Utils::DATEFORMAT, strtotime($user['created']))?>
+	<?=sprintf(_('registered on %s'), $dateFormatter->format(new \DateTime($user['created'])))?>
 </p>