[phpwiki-checkins] SF.net SVN: phpwiki:[10667] trunk

[<var...@us...>]

Revision: 10667
          http://sourceforge.net/p/phpwiki/code/10667
Author:   vargenau
Date:     2021-11-21 18:01:13 +0000 (Sun, 21 Nov 2021)
Log Message:
-----------
First argument of WikiLink must be "__"

Modified Paths:
--------------
    trunk/lib/editpage.php
    trunk/lib/plugin/RateIt.php
    trunk/lib/plugin/RecentEdits.php
    trunk/lib/plugin/RelatedChanges.php
    trunk/themes/MonoBook/templates/browse-footer.tmpl

Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/editpage.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -586,10 +586,10 @@
     private function getModeratedMessage()
     {
         return
-            HTML(HTML::h2(WikiLink(_("ModeratedPage"))),
+            HTML(HTML::h2(WikiLink(__("ModeratedPage"))),
                 HTML::p(fmt("You can edit away, but your changes will have to be approved by the defined moderators at the definition in %s", WikiLink(_("ModeratedPage")))),
                 HTML::p(fmt("The approval has a grace period of 5 days. If you have your e-mail defined in your %s, you will get a notification of approval or rejection.",
-                    WikiLink(_("UserPreferences")))));
+                    WikiLink(__("UserPreferences")))));
     }
 
     protected function getConflictMessage($unresolved = false)

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/plugin/RateIt.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -349,8 +349,7 @@
             $argstr .= $key . "=" . $value;
         $widget = $this->run($request->_dbi, $argstr, $request, $basepage);
 
-        return $this->makeBox(WikiLink(_("RateIt"), '', _("Rate It")),
-            $widget);
+        return $this->makeBox(WikiLink(__("RateIt"), '', _("Rate It")), $widget);
     }
 
     /**

Modified: trunk/lib/plugin/RecentEdits.php
===================================================================
--- trunk/lib/plugin/RecentEdits.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/plugin/RecentEdits.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -58,7 +58,7 @@
         $args['show_deleted'] = false;
         $args['show_all'] = true;
         $args['days'] = 90;
-        return $this->makeBox(WikiLink(_("RecentEdits"), '', _("Recent Edits")),
+        return $this->makeBox(WikiLink(__("RecentEdits"), '', _("Recent Edits")),
             $this->format($this->getChanges($request->_dbi, $args), $args));
     }
 }

Modified: trunk/lib/plugin/RelatedChanges.php
===================================================================
--- trunk/lib/plugin/RelatedChanges.php	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/lib/plugin/RelatedChanges.php	2021-11-21 18:01:13 UTC (rev 10667)
@@ -92,7 +92,7 @@
         $args['show_deleted'] = false;
         $args['show_all'] = false;
         $args['days'] = 90;
-        return $this->makeBox(WikiLink(_("RelatedChanges"), '', _("Related Changes")),
+        return $this->makeBox(WikiLink(__("RelatedChanges"), '', _("Related Changes")),
             $this->format($this->getChanges($request->_dbi, $args), $args));
     }
 

Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/browse-footer.tmpl	2021-11-21 17:48:24 UTC (rev 10666)
+++ trunk/themes/MonoBook/templates/browse-footer.tmpl	2021-11-21 18:01:13 UTC (rev 10667)
@@ -11,8 +11,8 @@
       <a class="internal" href="http://phpwiki.demo.free.fr/index.php/Copyrights">Copyrights</a>
 <?php } ?>
 </b> for details).<br /></li>
-<?php if ($request->_dbi->isWikiPage(__("About").WIKI_NAME)) { ?>
-      <?php echo WikiLink(_("About").WIKI_NAME) ?>
+<?php if ($request->_dbi->isWikiPage(__("About")." ".WIKI_NAME)) { ?>
+      <?php echo WikiLink(__("About")." ".WIKI_NAME) ?>
 <?php } else { ?>
       <li id="f-about"><a href="http://phpwiki.demo.free.fr/index.php/Help/PhpWiki">About PhpWiki</a></li>
 <?php } ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.