Changeset 1086

Timestamp:

2012-07-30T09:01:36+02:00 (10 months ago)

Author:

moo

Message:

htdocs: back to _T to avoid conflict with gettext

Location:

trunk/htdocs

Files:

• cacher/edit.tpl.php (modified) (1 diff)
• cacher/help.tpl.php (modified) (1 diff)
• cacher/index.php (modified) (3 diffs)
• cacher/sub/entrylist.tpl.php (modified) (2 diffs)
• cacher/sub/moduleinfo.tpl.php (modified) (1 diff)
• cacher/sub/summary.tpl.php (modified) (3 diffs)
• common/common.php (modified) (4 diffs)
• coverager/coverager.tpl.php (modified) (3 diffs)

trunk/htdocs/cacher/edit.tpl.php

@@ -6 +6 @@
 <form method="post" action="">
     <fieldset>
-        <legend><?php echo sprintf(_("Editing Variable %s"), $h_name); ?></legend>
+        <legend><?php echo sprintf(_T("Editing Variable %s"), $h_name); ?></legend>
         <textarea name="value" style="width: 100%; height: 200px; overflow-y: auto" <?php echo $editable ? "" : "disabled=disabled"; ?>><?php echo $h_value; ?></textarea><br>
         <input type="submit" <?php echo $editable ? "" : "disabled=disabled"; ?>>
         <?php
         if (!$editable) {
-            echo sprintf(_("Set %s in config to enable"), "\$config['enable_eval'] = true");
+            echo sprintf(_T("Set %s in config to enable"), "\$config['enable_eval'] = true");
         }
         ?>

trunk/htdocs/cacher/help.tpl.php

@@ -4 +4 @@
 <form method="post" action="">
     <div>
-        <input type="submit" name="coredump" value="Test coredump" class="submit" onclick="return confirm('<?php echo _('Sure?'); ?>');" />
+        <input type="submit" name="coredump" value="Test coredump" class="submit" onclick="return confirm('<?php echo _T('Sure?'); ?>');" />
     </div>
 </form>

trunk/htdocs/cacher/index.php

@@ -186 +186 @@
     if ($phpCacheCount >= 2) {
         $total['type'] = XC_TYPE_PHP;
-        $total['cache_name'] = _('Total');
+        $total['cache_name'] = _T('Total');
         $total['cacheid'] = -1;
         $total['gc'] = null;
@@ -212 +212 @@
     if ($varCacheCount >= 2) {
         $total['type'] = XC_TYPE_VAR;
-        $total['cache_name'] = _('Total');
+        $total['cache_name'] = _T('Total');
         $total['cacheid'] = -1;
         $total['gc'] = null;
@@ -286 +286 @@
 
 $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'),
         );
 

trunk/htdocs/cacher/sub/entrylist.tpl.php

@@ -2 +2 @@
 <form action="" method="post">
     <table cellspacing="0" cellpadding="4" class="cycles entries">
-        <caption><?php echo _("$typeName $listName"); ?></caption>
+        <caption><?php echo _T("$typeName $listName"); ?></caption>
 <?php
 
@@ -142 +142 @@
     </table>
 <?php if (!$isphp && $listName == 'Deleted') { ?>
-    <input type="submit" value="<?php echo _("Remove Selected"); ?>">
+    <input type="submit" value="<?php echo _T("Remove Selected"); ?>">
 <?php } ?>
 </form>

trunk/htdocs/cacher/sub/moduleinfo.tpl.php

@@ -1 @@
-<h2><?php echo _("Module Info"); ?></h2>
+<h2><?php echo _T("Module Info"); ?></h2>
 <div class="phpinfo"><?php echo getModuleInfo(); ?></div>

trunk/htdocs/cacher/sub/summary.tpl.php

@@ -1 +1 @@
 <?php $cycleClass = new Cycle('class="col1"', 'class="col2"'); ?>
 <table cellspacing="0" cellpadding="4" class="cycles caches">
-    <caption><?php echo _('Caches'); ?></caption>
+    <caption><?php echo _T('Caches'); ?></caption>
     <tr>
     <?php echo
@@ -28 +28 @@
     <?php
     $numkeys = explode(',', 'slots,size,avail,hits,updates,skips,ooms,errors,cached,deleted');
-    $l_clear = _('Clear');
-    $l_disabled = _('Disabled');
-    $l_disable = _('Disable');
-    $l_enable = _('Enable');
-    $l_compiling = _('Compiling');
-    $l_normal = _('Normal');
-    $l_confirm = _('Sure?');
+    $l_clear = _T('Clear');
+    $l_disabled = _T('Disabled');
+    $l_disable = _T('Disable');
+    $l_enable = _T('Enable');
+    $l_compiling = _T('Compiling');
+    $l_normal = _T('Normal');
+    $l_confirm = _T('Sure?');
     foreach (getCacheInfos() as $i => $ci) {
         $class = $cycleClass->next();
@@ -130 +130 @@
 </table>
 <div class="blockarea legends">
-    <div class="legendtitle"><?php echo _('Legends:'); ?></div>
+    <div class="legendtitle"><?php echo _T('Legends:'); ?></div>
     <div class="legend pvalue">&nbsp;&nbsp;</div>
-    <div class="legendtitle"><?php echo _($config['percent_graph_type'] == 'free' ? '% Free' : '% Used'); ?></div>
+    <div class="legendtitle"><?php echo _T($config['percent_graph_type'] == 'free' ? '% Free' : '% Used'); ?></div>
     <div class="legend" style="background: rgb(0,0,255)">&nbsp;&nbsp;</div>
-    <div class="legendtitle"><?php echo _($config['percent_graph_type'] == 'free' ? 'Free Blocks' : 'Used Blocks'); ?></div>
+    <div class="legendtitle"><?php echo _T($config['percent_graph_type'] == 'free' ? 'Free Blocks' : 'Used Blocks'); ?></div>
     <div class="legend" style="background: rgb(255,0,0)">&nbsp;&nbsp;</div>
-    <div class="legendtitle"><?php echo _('Hits'); ?></div>
+    <div class="legendtitle"><?php echo _T('Hits'); ?></div>
 </div>
 <?php unset($cycleClass); ?>

trunk/htdocs/common/common.php

@@ -45 +45 @@
     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",
@@ -139 +139 @@
 }
 
-function _($str)
+function _T($str)
 {
     if (isset($GLOBALS['strings'][$str])) {
@@ -152 +152 @@
 function __($str)
 {
-    return _($str);
+    return _T($str);
 }
 
@@ -261 +261 @@
 $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");

trunk/htdocs/coverager/coverager.tpl.php

@@ -35 +35 @@
     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 <<<EOS
 <table cellpadding="2" cellspacing="0" border="0" class="cycles">
@@ -97 +97 @@
     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 <<<EOS
 <table cellpadding="2" cellspacing="0" border="0" class="cycles">
@@ -149 +149 @@
 }
 
-$l_root = _("root");
+$l_root = _T("root");
 if ($action == 'dir') {
     if (function_exists('ob_filter_path_nicer')) {