From: Jan Schneider <jan@horde.org>
Date: Sun, 3 Oct 2010 18:57:13 +0000 (+0200)
Subject: Revert "Move time_format pref to Horde"
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1238e035ca512ab9e57f4113aac7930a75e55699;p=horde.git

Revert "Move time_format pref to Horde"

This reverts commit ad1c9fcec705761a78f9b2b6fcea30803c10dc00.

Revert the changes to Kronolith which is using a completely different
time format preference.
---

diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php
index 9630e0559..276d9ea5b 100644
--- a/kronolith/lib/Kronolith.php
+++ b/kronolith/lib/Kronolith.php
@@ -152,7 +152,7 @@ class Kronolith
             'date_format' => str_replace(array('%e', '%d', '%a', '%A', '%m', '%h', '%b', '%B', '%y', '%Y'),
                                          array('d', 'dd', 'ddd', 'dddd', 'MM', 'MMM', 'MMM', 'MMMM', 'yy', 'yyyy'),
                                          Horde_Nls::getLangInfo(D_FMT)),
-            'time_format' => $prefs->getValue('time_format'),
+            'time_format' => $prefs->getValue('twentyFour') ? 'HH:mm' : 'hh:mm tt',
             'status' => array('tentative' => self::STATUS_TENTATIVE,
                               'confirmed' => self::STATUS_CONFIRMED,
                               'cancelled' => self::STATUS_CANCELLED,