From e051e90d4eaa888c97c21d2ccc986a3f36289e0d Mon Sep 17 00:00:00 2001 From: Xuefer Date: Mon, 30 Jul 2012 07:01:36 +0000 Subject: [PATCH] htdocs: back to _T to avoid conflict with gettext git-svn-id: svn://svn.lighttpd.net/xcache/trunk@1086 c26eb9a1-5813-0410-bd6c-c2e55f420ca7 --- htdocs/cacher/edit.tpl.php | 4 ++-- htdocs/cacher/help.tpl.php | 2 +- htdocs/cacher/index.php | 12 ++++++------ htdocs/cacher/sub/entrylist.tpl.php | 4 ++-- htdocs/cacher/sub/moduleinfo.tpl.php | 2 +- htdocs/cacher/sub/summary.tpl.php | 24 ++++++++++++------------ htdocs/common/common.php | 16 ++++++++-------- htdocs/coverager/coverager.tpl.php | 20 ++++++++++---------- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/htdocs/cacher/edit.tpl.php b/htdocs/cacher/edit.tpl.php index 5b1a265..317cf21 100644 --- a/htdocs/cacher/edit.tpl.php +++ b/htdocs/cacher/edit.tpl.php @@ -5,12 +5,12 @@ $h_value = htmlspecialchars($value); ?>
- +
>
diff --git a/htdocs/cacher/help.tpl.php b/htdocs/cacher/help.tpl.php index 016f689..39982fa 100644 --- a/htdocs/cacher/help.tpl.php +++ b/htdocs/cacher/help.tpl.php @@ -3,7 +3,7 @@
- +
diff --git a/htdocs/cacher/index.php b/htdocs/cacher/index.php index 8d316dc..d5e0aba 100644 --- a/htdocs/cacher/index.php +++ b/htdocs/cacher/index.php @@ -185,7 +185,7 @@ function getCacheInfos() // {{{ if ($phpCacheCount >= 2) { $total['type'] = XC_TYPE_PHP; - $total['cache_name'] = _('Total'); + $total['cache_name'] = _T('Total'); $total['cacheid'] = -1; $total['gc'] = null; $total['istotal'] = true; @@ -211,7 +211,7 @@ function getCacheInfos() // {{{ if ($varCacheCount >= 2) { $total['type'] = XC_TYPE_VAR; - $total['cache_name'] = _('Total'); + $total['cache_name'] = _T('Total'); $total['cacheid'] = -1; $total['gc'] = null; $total['istotal'] = true; @@ -285,10 +285,10 @@ if (!extension_loaded('XCache')) { } $doTypes = array( - '' => _('Summary'), - 'listphp' => _('List PHP'), - 'listvar' => _('List Var Data'), - 'help' => _('Help'), + '' => _T('Summary'), + 'listphp' => _T('List PHP'), + 'listvar' => _T('List Var Data'), + 'help' => _T('Help'), ); function processPOST() // {{{ diff --git a/htdocs/cacher/sub/entrylist.tpl.php b/htdocs/cacher/sub/entrylist.tpl.php index 4178f06..0b99776 100644 --- a/htdocs/cacher/sub/entrylist.tpl.php +++ b/htdocs/cacher/sub/entrylist.tpl.php @@ -1,7 +1,7 @@
- +
- "> + ">
+

diff --git a/htdocs/cacher/sub/summary.tpl.php b/htdocs/cacher/sub/summary.tpl.php index 58db765..dba2297 100644 --- a/htdocs/cacher/sub/summary.tpl.php +++ b/htdocs/cacher/sub/summary.tpl.php @@ -1,6 +1,6 @@ - + $ci) { $class = $cycleClass->next(); echo <<
-
+
  
-
+
  
-
+
  
-
+
diff --git a/htdocs/common/common.php b/htdocs/common/common.php index aa30c0a..42a18a4 100644 --- a/htdocs/common/common.php +++ b/htdocs/common/common.php @@ -44,10 +44,10 @@ function mainnav() { foreach (array( "http://xcache.lighttpd.net/" => "XCache", - "http://xcache.lighttpd.net/wiki/DocTOC" => _("Document"), - "http://xcache.lighttpd.net/wiki/PhpIni" => _("INI Reference"), - "http://xcache.lighttpd.net/wiki/GetSupport" => _("Get Support"), - "https://groups.google.com/group/xcache/" => _("Discusson"), + "http://xcache.lighttpd.net/wiki/DocTOC" => _T("Document"), + "http://xcache.lighttpd.net/wiki/PhpIni" => _T("INI Reference"), + "http://xcache.lighttpd.net/wiki/GetSupport" => _T("Get Support"), + "https://groups.google.com/group/xcache/" => _T("Discusson"), "http://www.php.net/" => "PHP", "http://www.lighttpd.net/" => "Lighttpd", ) as $url => $title) { @@ -138,7 +138,7 @@ function get_language_file($name) return isset($file) ? $file : "$name-en.lang.php"; } -function _($str) +function _T($str) { if (isset($GLOBALS['strings'][$str])) { return $GLOBALS['strings'][$str]; @@ -151,7 +151,7 @@ function _($str) function __($str) { - return _($str); + return _T($str); } function N_($str) @@ -260,10 +260,10 @@ include get_language_file("../common/common"); $modules = array(); if (file_exists("../cacher/index.php")) { - $modules["cacher"] = _("Cacher"); + $modules["cacher"] = _T("Cacher"); } if (file_exists("../coverager/index.php")) { - $modules["coverager"] = _("Coverager"); + $modules["coverager"] = _T("Coverager"); } header("Cache-Control: no-cache, must-revalidate"); header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); diff --git a/htdocs/coverager/coverager.tpl.php b/htdocs/coverager/coverager.tpl.php index 8944f2e..8c51115 100644 --- a/htdocs/coverager/coverager.tpl.php +++ b/htdocs/coverager/coverager.tpl.php @@ -34,11 +34,11 @@ function dir_head() { global $cycle; $cycle = new Cycle('class="col1"', 'class="col2"'); - $l_dir = _("Directory"); - $l_per = _("Percent"); - $l_hit = _("Hits"); - $l_lns = _("Lines"); - $l_tds = _("TODO"); + $l_dir = _T("Directory"); + $l_per = _T("Percent"); + $l_hit = _T("Hits"); + $l_lns = _T("Lines"); + $l_tds = _T("TODO"); return << @@ -96,10 +96,10 @@ function file_head() { global $cycle; $cycle = new Cycle('class="col1"', 'class="col2"'); - $l_fil = _("File"); - $l_per = _("Percent"); - $l_hit = _("Hits"); - $l_lns = _("Lines"); + $l_fil = _T("File"); + $l_per = _T("Percent"); + $l_hit = _T("Hits"); + $l_lns = _T("Lines"); return << @@ -148,7 +148,7 @@ function file_foot() EOS; } -$l_root = _("root"); +$l_root = _T("root"); if ($action == 'dir') { if (function_exists('ob_filter_path_nicer')) { ob_start('ob_filter_path_nicer');