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 a8dd7d2c..cb455ec1 100644 Binary files a/locale/de_DE/LC_MESSAGES/The Legend of Z.mo and b/locale/de_DE/LC_MESSAGES/The Legend of Z.mo differ 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 @@
  • - + format(new \DateTime($seminary['created'])))?>
  • 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 @@

    - + format(new \DateTime($seminary['created'])))?>

    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 @@
  • - + format(new \DateTime($user['created'])))?>
  • 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 @@
  • - + format(new \DateTime($user['created'])))?>