From: Kern Sibbald Date: Sun, 19 Jun 2005 09:57:55 +0000 (+0000) Subject: Minor tweaks X-Git-Tag: Release-1.38.0~359 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8c0ba0b8d2394b3d948698a515c67943b4d4bb01;p=bacula%2Fbacula Minor tweaks git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2145 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/gui/.cvsignore b/gui/.cvsignore index d89921897a..d521238cec 100644 --- a/gui/.cvsignore +++ b/gui/.cvsignore @@ -1 +1,5 @@ +diff +config.status +config.out +config.log autom4te.cache diff --git a/gui/bacula-web/lang.php b/gui/bacula-web/lang.php index 5a079d61fd..0d86ac6136 100644 --- a/gui/bacula-web/lang.php +++ b/gui/bacula-web/lang.php @@ -1,7 +1,7 @@ register_block('t','smarty_translate'); - - $vars = $smarty->get_config_vars(); - $language = $vars[lang]; - $domain = "messages"; - putenv("LANG=$language"); - setlocale(LC_ALL, $language); - bindtextdomain($domain,"./locale"); - textdomain($domain); + require($smarty_gettext_path."smarty_gettext.php"); + $smarty->register_block('t','smarty_translate'); + + $vars = $smarty->get_config_vars(); + $language = $vars['lang']; + $domain = "messages"; + putenv("LANG=$language"); + setlocale(LC_ALL, $language); + bindtextdomain($domain,"./locale"); + textdomain($domain); } else { - function smarty_translate($params, $text, &$smarty) { - return $text; - } - $smarty->register_block('t','smarty_translate'); + function smarty_translate($params, $text, &$smarty) { + return $text; + } + $smarty->register_block('t','smarty_translate'); } -?> \ No newline at end of file +?> diff --git a/gui/bacula-web/report.php b/gui/bacula-web/report.php index 3ba21291e2..ba6028784c 100644 --- a/gui/bacula-web/report.php +++ b/gui/bacula-web/report.php @@ -56,9 +56,9 @@ else if ($dbSql->driver == "pgsql") or die("Error query row 56"); while ( $tmp = $res_jobs->fetchRow(DB_FETCHMODE_ASSOC) ) { - $tdate = explode (":",$tmp[elapsed]); // Temporal "workaround" ;) Fix later + $tdate = explode (":",$tmp['elapsed']); // Temporal "workaround" ;) Fix later if ( $tdate[0] > 300000 ) - $tmp[elapsed] = "00:00:00"; + $tmp['elapsed'] = "00:00:00"; array_push($a_jobs,$tmp); } $smarty->assign('jobs',$a_jobs);