Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[7850] trunk
|
From: <var...@us...> - 2011-01-21 09:41:12
|
Revision: 7850
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7850&view=rev
Author: vargenau
Date: 2011-01-21 09:41:05 +0000 (Fri, 21 Jan 2011)
Log Message:
-----------
Translate ": " so that a space can be added in French
Modified Paths:
--------------
trunk/lib/InlineParser.php
trunk/lib/plugin/ModeratedPage.php
trunk/lib/plugin/SemanticSearch.php
trunk/lib/plugin/SpellCheck.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/upgrade.php
trunk/themes/blog/templates/blogform.tmpl
trunk/themes/default/templates/blogform.tmpl
trunk/themes/fusionforge/templates/blogform.tmpl
trunk/themes/fusionforge/themeinfo.php
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/InlineParser.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -341,7 +341,7 @@
str_replace("\n", " ", $bracketlink), $matches);
if (count($matches) < 4) {
// "[ personal\ninformation manager | PhpWiki:PersonalWiki ]"
- trigger_error(_("Invalid [] syntax ignored").": ".$bracketlink, E_USER_WARNING);
+ trigger_error(_("Invalid [] syntax ignored")._(": ").$bracketlink, E_USER_WARNING);
return new Cached_Link;
}
list (, $hash, $label, $bar, $rawlink) = $matches;
Modified: trunk/lib/plugin/ModeratedPage.php
===================================================================
--- trunk/lib/plugin/ModeratedPage.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/plugin/ModeratedPage.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -253,10 +253,10 @@
require_once("lib/MailNotify.php");
$pagename = $page->getName();
$mailer = new MailNotify($pagename);
- $subject = "[".WIKI_NAME.'] '.$action.': '._("ModeratedPage").' '.$pagename;
+ $subject = "[".WIKI_NAME.'] '.$action._(": ")._("ModeratedPage").' '.$pagename;
$content = "You are approved as Moderator of the ".WIKI_NAME. " wiki.\n".
"Someone wanted to edit a moderated page, which you have to approve or reject.\n\n".
- $action.': '._("ModeratedPage").' '.$pagename."\n"
+ $action._(": ")._("ModeratedPage").' '.$pagename."\n"
//. serialize($moderated['data'][$id])
."\n<".WikiURL($pagename, array('action' => _("ModeratedPage"),
'id' => $id, 'pass' => 'approve'), 1).">"
@@ -348,7 +348,7 @@
$status = $this->getSiteStatus($request, $action_page);
require_once("lib/MailNotify.php");
$mailer = new MailNotify($pagename);
- $subject = "[".WIKI_NAME."] $pass $action "._("ModeratedPage").': '.$pagename;
+ $subject = "[".WIKI_NAME."] $pass $action "._("ModeratedPage")._(": ").$pagename;
$mailer->from = $request->_user->UserFrom();
$content = sprintf(_("%s approved your wiki action from %s"),
$mailer->from,CTime($moderation['timestamp']))
Modified: trunk/lib/plugin/SemanticSearch.php
===================================================================
--- trunk/lib/plugin/SemanticSearch.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/plugin/SemanticSearch.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -154,7 +154,7 @@
)),
HTML::tbody
(HTML::tr(
- HTML::td($pagefilter, ": "),
+ HTML::td($pagefilter, _(": ")),
HTML::td($relation),
HTML::td(HTML::strong(HTML::tt(' :: '))),
HTML::td($queryrel),
@@ -237,7 +237,7 @@
)),
HTML::tbody
(HTML::tr(
- HTML::td($pagefilter, ": "),
+ HTML::td($pagefilter, _(": ")),
HTML::td($attribute),
HTML::td($attr_op),
HTML::td($queryatt),
Modified: trunk/lib/plugin/SpellCheck.php
===================================================================
--- trunk/lib/plugin/SpellCheck.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/plugin/SpellCheck.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -175,7 +175,7 @@
'href' => "javascript:do_replace('$word','$s')"),
$s),", ");
}
- $list->pushContent(HTML::li($w, ": ", $r));
+ $list->pushContent(HTML::li($w, _(": "), $r));
}
$html->pushContent($list);
return $html;
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/plugin/WikiAdminRename.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -263,11 +263,11 @@
function renameForm(&$header, $post_args, $singlepage) {
$table = HTML::table();
- $this->_tablePush($table, _("Rename"). " ". _("from").': ',
+ $this->_tablePush($table, _("Rename"). " ". _("from")._(": "),
HTML::input(array('name' => 'admin_rename[from]',
'size' => 90,
'value' => $post_args['from'])));
- $this->_tablePush($table, _("to").': ',
+ $this->_tablePush($table, _("to")._(": "),
HTML::input(array('name' => 'admin_rename[to]',
'size' => 90,
'value' => $post_args['to'])));
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -227,11 +227,11 @@
_("Replace all occurences of the given string in the content of all pages.")),
HTML::br());
$table = HTML::table();
- $this->_tablePush($table, _("Replace").": ",
+ $this->_tablePush($table, _("Replace")._(": "),
HTML::input(array('name' => 'admin_replace[from]',
'size' => 90,
'value' => $post_args['from'])));
- $this->_tablePush($table, _("by").': ',
+ $this->_tablePush($table, _("by")._(": "),
HTML::input(array('name' => 'admin_replace[to]',
'size' => 90,
'value' => $post_args['to'])));
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -241,10 +241,10 @@
$type = _("individual page permission");
elseif ($type == 'default')
$type = _("default page permission");
- $header->pushContent(HTML::strong(_("Type").': '), HTML::tt($type),HTML::br());
- $header->pushContent(HTML::strong(_("ACL").': '), HTML::tt($perm->asAclLines()),HTML::br());
+ $header->pushContent(HTML::strong(_("Type")._(": ")), HTML::tt($type),HTML::br());
+ $header->pushContent(HTML::strong(_("ACL")._(": ")), HTML::tt($perm->asAclLines()),HTML::br());
- $header->pushContent(HTML::p(HTML::strong(_("Description").': '),
+ $header->pushContent(HTML::p(HTML::strong(_("Description")._(": ")),
_("Selected Grant checkboxes allow access, unselected checkboxes deny access."),
_("To ignore delete the line."),
_("To add check 'Add' near the dropdown list.")
Modified: trunk/lib/upgrade.php
===================================================================
--- trunk/lib/upgrade.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/lib/upgrade.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -1101,7 +1101,7 @@
$this->parent->dbi->set($this->_db_key, $this->upgrade);
echo "<b>",_("FIXED"),"</b>";
if (isset($this->reason))
- echo ": ", $this->reason;
+ echo _(": "), $this->reason;
echo "<br />\n";
flush();
return true;
@@ -1109,7 +1109,7 @@
function fail() {
echo " <b><font color=\"red\">", _("FAILED"), "</font></b>";
if (isset($this->reason))
- echo ": ", $this->reason;
+ echo _(": "), $this->reason;
echo "<br />\n";
flush();
return false;
Modified: trunk/themes/blog/templates/blogform.tmpl
===================================================================
--- trunk/themes/blog/templates/blogform.tmpl 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/themes/blog/templates/blogform.tmpl 2011-01-21 09:41:05 UTC (rev 7850)
@@ -1,5 +1,5 @@
<?php // -*- php -*-
-// rcs_id('$Id$');
+// $Id$
?>
<div class="wikiblog wikiblog-form">
<form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
@@ -7,7 +7,7 @@
<input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
<input type="hidden" name="mode" value="add" />
<div class="wikiblog-form">
- <?php echo _("Headline").': ' ?><br />
+ <?php echo _("Headline")._(": ") ?><br />
<input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
<?php echo $EDIT_TOOLBAR ?>
Modified: trunk/themes/default/templates/blogform.tmpl
===================================================================
--- trunk/themes/default/templates/blogform.tmpl 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/themes/default/templates/blogform.tmpl 2011-01-21 09:41:05 UTC (rev 7850)
@@ -1,5 +1,5 @@
<?php // -*- php -*-
-// rcs_id('$Id$');
+// $Id$
?>
<div class="wikiblog wikiblog-form">
<form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"
@@ -7,7 +7,7 @@
<input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
<input type="hidden" name="mode" value="add" />
<div class="wikiblog-form">
- <?php echo _("Headline").': ' ?><br />
+ <?php echo _("Headline")._(": ") ?><br />
<input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
<?php echo $EDIT_TOOLBAR ?>
Modified: trunk/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/blogform.tmpl 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/themes/fusionforge/templates/blogform.tmpl 2011-01-21 09:41:05 UTC (rev 7850)
@@ -7,7 +7,7 @@
<input type="hidden" name="edit[pagename]" value="<?php echo $PAGENAME?>" />
<input type="hidden" name="mode" value="add" />
<div class="wikiblog-form">
- <?php echo _("Headline").': ' ?><br />
+ <?php echo _("Headline")._(": ") ?><br />
<input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60"
maxlength="256" name="edit[summary]" value="" />
<?php echo $EDIT_TOOLBAR ?>
Modified: trunk/themes/fusionforge/themeinfo.php
===================================================================
--- trunk/themes/fusionforge/themeinfo.php 2011-01-21 08:57:55 UTC (rev 7849)
+++ trunk/themes/fusionforge/themeinfo.php 2011-01-21 09:41:05 UTC (rev 7850)
@@ -32,7 +32,7 @@
session_require_global_perm ('forge_admin');
}
- $HTML->header(array('title'=> $group_public_name.': '.htmlspecialchars($pagename),
+ $HTML->header(array('title'=> $group_public_name._(": ").htmlspecialchars($pagename),
'group' => $group_id,
'toptab' => 'wiki',
'submenu' => $submenu->asXML()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
