File allow-setting-date-format-according-to-language... of Package ZoneMinder

Overview Repositories Revisions Requests Users Attributes Meta

File allow-setting-date-format-according-to-language.patch of Package ZoneMinder (Revision 9fab4d4f1a711f3753ca59c4ab68f3b5)

Currently displaying revision 9fab4d4f1a711f3753ca59c4ab68f3b5 , Show latest

From 40e51a0ed65089f1ea78779f4219e0986b1f731a Mon Sep 17 00:00:00 2001
From: Dirk Hartmann <2monex@gmx.net>
Date: Sun, 25 May 2014 15:54:35 +0200
Subject: [PATCH 07/10] allow setting date format according to language

date format was english only and not localized. By adding the array
$DATE_LANG
in translation files it is now possible to set the date format according
to
the language settings.
---
 web/lang/de_de.php                  | 6 ++++++
 web/lang/hu_hu.php                  | 6 +++++-
 web/skins/classic/views/console.php | 3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index 424d91e94..38a313563 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -71,6 +71,8 @@ header( "Content-Type: text/html; charset=utf-8" );
 // setlocale( LC_CTYPE, 'en_GB' ); Character class settings 4.3.0 and after
 // setlocale( LC_TIME, 'en_GB' ); Date and time formatting 4.3.0 and after
 
+setlocale( LC_TIME, 'de_DE.UTF8' );
+
 // Simple String Replacements
 $SLANG = array(
     '24BitColour'          => '24-Bit-Farbe',
@@ -774,6 +776,10 @@ $CLANG = array(
     'VersionMismatch'      => 'Versionskonflikt, System-Version ist %1$s , Datenbank-Version ist %2$s.', // Added - 2011-05-25
 );
 
+$DATE_LANG = array(
+    'CONSOLE_LONG'         => '%A, %d. %B %Y. %H:%M',
+);
+
 // The next section allows you to describe a series of word ending and counts used to 
 // generate the correctly conjugated forms of words depending on a count that is associated
 // with that word.
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index 3f0928be1..ef7253bf4 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -97,7 +97,7 @@ header( "Content-Type: text/html; charset=utf-8" );
 //setlocale( LC_TIME, 'hu_HU'); //Date and time formatting 4.3.0 and after
 
 setlocale( LC_CTYPE, 'hu_HU.UTF-8');
-setlocale( LC_TIME, 'hu_HU.UTF-8' );
+setlocale( LC_TIME, 'hu_HU.UTF8' );
 
 //
 // Date and time formats, specific to this language
@@ -814,6 +814,10 @@ $CLANG = array(
     'VersionMismatch'      => 'Verziószám eltérés: rendszerverzió %1$s, adatbázis %2$s.',
 );
 
+$DATE_LANG = array(
+    'CONSOLE_LONG'         => '%Y. %B %d. %A %H:%M',
+);
+
 // The next section allows you to describe a series of word ending and counts used to 
 // generate the correctly conjugated forms of words depending on a count that is associated
 // with that word.
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index b1d985e09..12d3a3fa7 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -181,6 +181,7 @@ $seqUpFile = getSkinFile( 'graphics/seq-u.gif' );
 $seqDownFile = getSkinFile( 'graphics/seq-d.gif' );
 
 $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
+$usedDateFormat = isset( $DATE_LANG['CONSOLE_LONG'] ) ? $DATE_LANG['CONSOLE_LONG'] :  DATE_FMT_CONSOLE_LONG;
 
 $left_columns = 3;
 if ( count($servers) ) $left_columns += 1;
@@ -194,7 +195,7 @@ xhtmlHeaders( __FILE__, translate('Console') );
     <input type="hidden" name="view" value="<?php echo $view ?>"/>
     <input type="hidden" name="action" value=""/>
     <div id="header">
-      <h3 id="systemTime"><?php echo preg_match( '/%/', DATE_FMT_CONSOLE_LONG )?strftime( DATE_FMT_CONSOLE_LONG ):date( DATE_FMT_CONSOLE_LONG ) ?></h3>
+      <h3 id="systemTime"><?php echo preg_match( '/%/', $usedDateFormat )?strftime( $usedDateFormat ):date( $usedDateFormat ) ?></h3>
       <h3 id="systemStats"><?php echo translate('Load') ?>: <?php echo getLoad() ?> - <?php echo translate('Disk') ?>: <?php echo getDiskPercent() ?>% - <?php echo ZM_PATH_MAP ?>: <?php echo getDiskPercent(ZM_PATH_MAP) ?>%</h3>
       <h2 id="title"><a href="http://www.zoneminder.com" target="ZoneMinder">ZoneMinder</a> <?php echo translate('Console') ?> - <?php echo makePopupLink( '?view=state', 'zmState', 'state', $status, canEdit( 'System' ) ) ?> - <?php echo $run_state ?> <?php echo makePopupLink( '?view=version', 'zmVersion', 'version', '<span class="'.$versionClass.'">v'.ZM_VERSION.'</span>', canEdit( 'System' ) ) ?></h2>
       <div class="clear"></div>
-- 
2.11.1

Places

File allow-setting-date-format-according-to-language.patch of Package ZoneMinder (Revision 9fab4d4f1a711f3753ca59c4ab68f3b5)

Places