[phpwiki-checkins] CVS: phpwiki/themes/default/templates blogform.tmpl,1.3,1.4 editpage.tmpl,1.41,1.42 info.tmpl,1.15,1.16 navbar.tmpl,1.29,1.30

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/default/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12902/default/templates

Modified Files:
	blogform.tmpl editpage.tmpl info.tmpl navbar.tmpl 
Log Message:
Simplified strings for easier translation

Index: blogform.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/blogform.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -2 -b -p -d -r1.3 -r1.4
--- blogform.tmpl	29 Mar 2004 21:37:42 -0000	1.3
+++ blogform.tmpl	18 May 2004 14:47:21 -0000	1.4
@@ -4,5 +4,5 @@
 <div class="wikiblog wikiblog-form">
 <form action="<?=$request->getPostURL()?>" method="post" class="wikiaction"
-      accept-charset="<?=CHARSET?>">
+      accept-charset="<?=$charset?>">
   <input type="hidden" name="blog[pagename]" value="<?=$PAGENAME?>" />
   <?= HiddenInputs($request->getArgs()) ?>
@@ -10,9 +10,9 @@
      <caption><?=_("Add a Comment")?></caption>
      <col class="label" width="1*" /><col class="input" width="100*" />
-     <tr><th align="right"><?=_("Summary:")?></th>
+     <tr><th align="right"><?=_("Summary").':'?></th>
          <td><input class="wikitext" type="text" size="60"
                     maxlength="256" name="blog[summary]" value="" /></td>
      </tr>
-     <tr><th align="right"><?=_("Comment:")?></th>
+     <tr><th align="right"><?=_("Comment").':'?></th>
          <td><textarea class="blogedit" rows="5" cols="60"
                        name="blog[body]" wrap="virtual"></textarea></td>

Index: editpage.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/editpage.tmpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -2 -b -p -d -r1.41 -r1.42
--- editpage.tmpl	13 Apr 2004 08:29:08 -0000	1.41
+++ editpage.tmpl	18 May 2004 14:47:21 -0000	1.42
@@ -77,5 +77,5 @@ $s = $Theme->getButtonSeparator();
 <!-- FIXME: fix layout, move CSS to CSS -->
 <div class="toolbar" style="text-align: center;">
-  <?=_("Summary:")?> <?=$SUMMARY_INPUT?>
+  <?=_("Summary").':'?> <?=$SUMMARY_INPUT?>
 </div>
 <table summary="Toolbar: Page editing options." class="toolbar" width="100%"

Index: info.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/info.tmpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -2 -b -p -d -r1.15 -r1.16
--- info.tmpl	11 Dec 2003 19:38:29 -0000	1.15
+++ info.tmpl	18 May 2004 14:47:21 -0000	1.16
@@ -63,12 +63,12 @@ if ($is_current = $revision->isCurrent()
     }
 
-    $label['date'] = _("Last Modified:");
-    $label['author'] = _("Last Author:");
-    $label['summary'] = _("Last Summary:");
+    $label['date'] = _("Last Modified").':';
+    $label['author'] = _("Last Author").':';
+    $label['summary'] = _("Last Summary").':';
 
 } else {
     $label['date'] = _("Saved on:");
-    $label['author'] = _("Author:");
-    $label['summary'] = _("Summary:");
+    $label['author'] = _("Author").':';
+    $label['summary'] = _("Summary").':';
 }
 
@@ -161,4 +161,7 @@ if (isSubPage($page->getName())) {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -                         
 // $Log$
+// Revision 1.16  2004/05/18 14:47:21  rurban
+// Simplified strings for easier translation
+//
 // Revision 1.15  2003/12/11 19:38:29  carstenklapp
 // Internal change: Fix PHP Warning: Call-time pass-by-reference has been deprecated

Index: navbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/default/templates/navbar.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -2 -b -p -d -r1.29 -r1.30
--- navbar.tmpl	18 May 2004 13:37:06 -0000	1.29
+++ navbar.tmpl	18 May 2004 14:47:21 -0000	1.30
@@ -20,5 +20,5 @@
 <?php if (!empty($revision)) { ?>
 <?=$s?><?= $Theme->makeLinkButton($revision,_("LikePages"),_("LikePages")) ?><?=$s?><?= $Theme->makeLinkButton($revision,_("BackLinks"),_("BackLinks")) ?><?php
-  $links = $page->getLinks(false);
+  $links = $page->getPageLinks();
   if ($links->count() > 1) { ?><?=$s?><?= $Theme->makeLinkButton($revision,_("RelatedChanges"),_("RelatedChanges")) ?><?php } ?>
 <?php } ?>
@@ -42,2 +42,9 @@
 <?php } ?></div>
 </form>
+<?php if (DEBUG & 2) {
+        if (isset($links)) {
+            $s = '';
+            while ($p = $links->next()) { $s .= $p->_pagename.', '; }
+            echo asXML(HTML::strong("PageLinks: "),$s ? HTML::em($s) : HTML::em('<none>'));
+        }
+} ?>