[phpwiki-checkins] CVS: phpwiki/themes/default/templates actionbar.tmpl,1.18,1.19 info.tmpl,1.8,1.9 navbar.tmpl,1.16,1.17

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory usw-pr-cvs1:/tmp/cvs-serv26630/themes/default/templates

Modified Files:
	actionbar.tmpl info.tmpl navbar.tmpl 
Log Message:
Always use the english version of the ActionPage name for the
action query arg.

Upon receipt of the request, PhpWiki tries to find a translated
version of the requested ActionPage, first checking under the
users preferred language, then under the wiki's default language.
If neither translation is found, we fall back to the
english version.

This solves two problems:
 o If a user change his language preference, before the change,
   the translated action page may not exist.  It used to be this
   broke the wiki, now we revert to the actionpage in the default
   language of the wiki.
 o It fixes the single-word Historique action page problem.
   (English action pages must still be WikiWords.  But as
   noted on phpwiki-talk, this does not seem to be an unreasonable
   restriction.)


Index: actionbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/actionbar.tmpl,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -2 -b -p -d -r1.18 -r1.19
--- actionbar.tmpl	17 Sep 2002 06:42:43 -0000	1.18
+++ actionbar.tmpl	18 Sep 2002 19:29:44 -0000	1.19
@@ -27,9 +27,9 @@
       <?=$Sep?><?= Button('remove') ?>
     <?php } ?>
-    <?=$Sep?><?= Button(_("PageHistory")) ?>
+    <?=$Sep?><?= Button("PageHistory", _("PageHistory")) ?>
     <?=$Sep?><?= Button("diff") ?> 
-    <?=$Sep?><?= Button(_("Info")) ?>
+    <?=$Sep?><?= Button("PageInfo", _("PageInfo")) ?>
 <?php if (defined('DEBUG') || $user->isAdmin()) { ?> 
-    <?=$Sep?><?= Button(_("DebugInfo")) ?> <!-- For debugging only, really -->
+    <?=$Sep?><?= Button("DebugInfo", _("DebugInfo")) ?> <!-- For debugging only, really -->
 <?php } ?>
   </div>

Index: info.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/info.tmpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -2 -b -p -d -r1.8 -r1.9
--- info.tmpl	15 Sep 2002 20:21:16 -0000	1.8
+++ info.tmpl	18 Sep 2002 19:29:44 -0000	1.9
@@ -129,7 +129,7 @@ $Sep = $Theme->getButtonSeparator();
 </table>
 
-<?= Button(_("PageHistory")) ?>
+<?= Button("PageHistory", _("PageHistory")) ?>
 <?=$Sep?><?= Button("diff") ?> 
 <?php if (defined('DEBUG') || $user->isAdmin()) { ?>
-	<?=$Sep?><?= Button(_("DebugInfo")) ?> <!-- For debugging only, really -->
+	<?=$Sep?><?= Button("DebugInfo", _("DebugInfo")) ?> <!-- For debugging only, really -->
 <?php } ?>
\ No newline at end of file

Index: navbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/navbar.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -2 -b -p -d -r1.16 -r1.17
--- navbar.tmpl	15 Sep 2002 20:30:40 -0000	1.16
+++ navbar.tmpl	18 Sep 2002 19:29:44 -0000	1.17
@@ -21,6 +21,6 @@ $s = $Theme->getButtonSeparator();
              onmouseout="window.status=''; return true;" />
     <?php if (!empty($revision)) { ?>
-     <?=$s?><?= Button(_("LikePages")) ?>
-     <?=$s?><?= Button(_("BackLinks")) ?>
+     <?=$s?><?= Button("LikePages", _("LikePages")) ?>
+     <?=$s?><?= Button("BackLinks", _("BackLinks")) ?>
     <?php } ?>
     <?php if (!empty($user)) { ?>