whitespace

This commit is contained in:
Isaac Connor 2018-12-20 14:58:38 -05:00
parent 88e148068e
commit a277f697e9
1 changed files with 36 additions and 39 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
// //
// ZoneMinder web language file, $Date$, $Revision$ // ZoneMinder web language file
// Copyright (C) 2001-2008 Philip Coombes // Copyright (C) 2001-2008 Philip Coombes
// //
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
@ -18,17 +18,15 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
// //
function translate( $name ) function translate( $name ) {
{
global $SLANG; global $SLANG;
if ( array_key_exists( $name, $SLANG ) ) if ( array_key_exists($name, $SLANG) )
return $SLANG[$name]; return $SLANG[$name];
else else
return $name; return $name;
} }
function loadLanguage( $prefix="" ) function loadLanguage( $prefix='' ) {
{
global $user; global $user;
if ( $prefix ) if ( $prefix )
@ -39,37 +37,36 @@ function loadLanguage( $prefix="" )
if ( isset($user['Language']) ) if ( isset($user['Language']) )
$userLangFile = $prefix.'lang/'.$user['Language'].'.php'; $userLangFile = $prefix.'lang/'.$user['Language'].'.php';
if ( isset($userLangFile) && file_exists( $userLangFile ) ) if ( isset($userLangFile) && file_exists($userLangFile) )
return( $userLangFile ); return $userLangFile;
elseif ( file_exists( $systemLangFile ) ) elseif ( file_exists($systemLangFile) )
return( $systemLangFile ); return $systemLangFile;
elseif ( file_exists( $fallbackLangFile ) ) elseif ( file_exists($fallbackLangFile) )
return( $fallbackLangFile ); return $fallbackLangFile;
else else
return( false ); return false;
} }
if ( $langFile = loadLanguage() ) { if ( $langFile = loadLanguage() ) {
require_once( $langFile ); require_once($langFile);
require_once( 'lang/default.php' ); require_once('lang/default.php');
foreach ($DLANG as $key => $value) { foreach ($DLANG as $key => $value) {
if ( ! array_key_exists( $key, $SLANG ) ) if ( ! array_key_exists($key, $SLANG) )
$SLANG[$key] = $DLANG[$key]; $SLANG[$key] = $DLANG[$key];
} }
} }
// //
// Date and time formats fallback, if not set up by the language file already // Date and time formats fallback, if not set up by the language file already
// //
defined("DATE_FMT_CONSOLE_LONG") or define("DATE_FMT_CONSOLE_LONG", "D jS M, g:ia"); // This is the main console date/time, date() or strftime() format defined('DATE_FMT_CONSOLE_LONG') or define('DATE_FMT_CONSOLE_LONG', 'D jS M, g:ia'); // This is the main console date/time, date() or strftime() format
defined("DATE_FMT_CONSOLE_SHORT") or define( "DATE_FMT_CONSOLE_SHORT", "%H:%M" ); // This is the xHTML console date/time, date() or strftime() format defined('DATE_FMT_CONSOLE_SHORT') or define('DATE_FMT_CONSOLE_SHORT', '%H:%M'); // This is the xHTML console date/time, date() or strftime() format
defined("STRF_FMT_DATETIME") or define( "STRF_FMT_DATETIME", "%c" ); // Strftime locale aware format for dates with times defined('STRF_FMT_DATETIME') or define('STRF_FMT_DATETIME', '%c'); // Strftime locale aware format for dates with times
defined("STRF_FMT_DATE") or define( "STRF_FMT_DATE", "%x" ); // Strftime locale aware format for dates without times defined('STRF_FMT_DATE') or define('STRF_FMT_DATE', '%x'); // Strftime locale aware format for dates without times
defined("STRF_FMT_TIME") or define( "STRF_FMT_TIME", "%X" ); // Strftime locale aware format for times without dates defined('STRF_FMT_TIME') or define('STRF_FMT_TIME', '%X'); // Strftime locale aware format for times without dates
defined("STRF_FMT_DATETIME_SHORT") or define( "STRF_FMT_DATETIME_SHORT", "%y/%m/%d %H:%M:%S" ); // Strftime shorter format for dates with time, not locale aware defined('STRF_FMT_DATETIME_SHORT') or define('STRF_FMT_DATETIME_SHORT', '%y/%m/%d %H:%M:%S'); // Strftime shorter format for dates with time, not locale aware
defined("STRF_FMT_DATETIME_SHORTER") or define( "STRF_FMT_DATETIME_SHORTER", "%m/%d %H:%M:%S" );// Strftime shorter format for dates with time, not locale aware, used where space is tight defined('STRF_FMT_DATETIME_SHORTER') or define('STRF_FMT_DATETIME_SHORTER','%m/%d %H:%M:%S');// Strftime shorter format for dates with time, not locale aware, used where space is tight
?> ?>