Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[7947] trunk/lib/plugin
|
From: <var...@us...> - 2011-03-02 15:15:55
|
Revision: 7947
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7947&view=rev
Author: vargenau
Date: 2011-03-02 15:15:48 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Better use "%d" for numbers; remove unneeded "permanently"
Modified Paths:
--------------
trunk/lib/plugin/WikiAdminChmod.php
trunk/lib/plugin/WikiAdminChown.php
trunk/lib/plugin/WikiAdminMarkup.php
trunk/lib/plugin/WikiAdminPurge.php
trunk/lib/plugin/WikiAdminRemove.php
trunk/lib/plugin/WikiAdminRename.php
trunk/lib/plugin/WikiAdminSearchReplace.php
trunk/lib/plugin/WikiAdminSetAcl.php
trunk/lib/plugin/WikiAdminSetExternal.php
trunk/lib/plugin/WikiAdminUtils.php
Modified: trunk/lib/plugin/WikiAdminChmod.php
===================================================================
--- trunk/lib/plugin/WikiAdminChmod.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminChmod.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -76,15 +76,15 @@
}
}
} else {
- $ul->pushContent(HTML::li(fmt("Invalid chmod string")));
+ $ul->pushContent(HTML::li(_("Invalid chmod string")));
}
if ($count) {
$dbi->touch();
return HTML($ul,
- HTML::p(fmt("%s pages have been changed.",$count)));
+ HTML::p(fmt("%d pages have been changed.", $count)));
} else {
return HTML($ul,
- HTML::p(fmt("No pages changed.")));
+ HTML::p(_("No pages changed.")));
}
}
Modified: trunk/lib/plugin/WikiAdminChown.php
===================================================================
--- trunk/lib/plugin/WikiAdminChown.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminChown.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -88,9 +88,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -168,7 +168,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently change the owner of the selected pages?"))));
+ _("Are you sure you want to change the owner of the selected pages?"))));
$header = $this->chownForm($header, $post_args);
}
else {
Modified: trunk/lib/plugin/WikiAdminMarkup.php
===================================================================
--- trunk/lib/plugin/WikiAdminMarkup.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminMarkup.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -91,9 +91,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -160,7 +160,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently change the markup type of the selected files?"))));
+ _("Are you sure you want to change the markup type of the selected files?"))));
$header = $this->chmarkupForm($header, $post_args);
}
else {
Modified: trunk/lib/plugin/WikiAdminPurge.php
===================================================================
--- trunk/lib/plugin/WikiAdminPurge.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminPurge.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -76,7 +76,7 @@
if ($count == 1) {
$result->pushContent(HTML::p("One page has been permanently purged:"));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently purged:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been permanently purged:", $count)));
}
$result->pushContent($ul);
return $result;
Modified: trunk/lib/plugin/WikiAdminRemove.php
===================================================================
--- trunk/lib/plugin/WikiAdminRemove.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminRemove.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -118,9 +118,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p("One page has been permanently removed:"));
+ $result->pushContent(HTML::p("One page has been removed:"));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently removed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been removed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -194,7 +194,7 @@
if ($next_action == 'verify') {
$button_label = _("Yes");
$header->pushContent(HTML::p(HTML::strong(
- _("Are you sure you want to permanently remove the selected files?"))));
+ _("Are you sure you want to remove the selected files?"))));
}
else {
$button_label = _("Remove selected pages");
Modified: trunk/lib/plugin/WikiAdminRename.php
===================================================================
--- trunk/lib/plugin/WikiAdminRename.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminRename.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -120,10 +120,10 @@
$result->setAttr('class', 'feedback');
if ($count == 1) {
$result->pushContent(HTML::p(
- "One page has been permanently renamed:"));
+ "One page has been renamed:"));
} else {
$result->pushContent(HTML::p(
- fmt("%s pages have been permanently renamed:", $count)));
+ fmt("%d pages have been renamed:", $count)));
}
$result->pushContent($ul);
return $result;
@@ -206,7 +206,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently rename the selected pages?"))));
+ _("Are you sure you want to rename the selected pages?"))));
$header = $this->renameForm($header, $post_args, $singlepage);
} else {
if ($singlepage === true) {
Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -103,9 +103,9 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
} else {
@@ -186,7 +186,7 @@
$button_label = _("Yes");
$header->pushContent(
HTML::p(HTML::strong(
- _("Are you sure you want to permanently replace text in the selected files?"))));
+ _("Are you sure you want to replace text in the selected files?"))));
$this->replaceForm($header, $post_args);
} else {
$button_label = _("Search & Replace");
Modified: trunk/lib/plugin/WikiAdminSetAcl.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminSetAcl.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -120,17 +120,17 @@
}
}
} else {
- $result->pushContent(HTML::p(fmt("Invalid ACL")));
+ $result->pushContent(HTML::p(_("Invalid ACL")));
}
if ($count) {
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count > 1) {
- $result->pushContent(HTML::p(fmt("%s pages have been changed.",$count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed.", $count)));
}
} else {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p(fmt("No pages changed.")));
+ $result->pushContent(HTML::p(_("No pages changed.")));
}
return $result;
}
Modified: trunk/lib/plugin/WikiAdminSetExternal.php
===================================================================
--- trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminSetExternal.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -77,15 +77,15 @@
$dbi->touch();
$result->setAttr('class', 'feedback');
if ($count == 1) {
- $result->pushContent(HTML::p(_("One page has been permanently changed:")));
+ $result->pushContent(HTML::p(_("One page has been changed:")));
} else {
- $result->pushContent(HTML::p(fmt("%s pages have been permanently changed:", $count)));
+ $result->pushContent(HTML::p(fmt("%d pages have been changed:", $count)));
}
$result->pushContent($ul);
return $result;
} else {
$result->setAttr('class', 'error');
- $result->pushContent(HTML::p_(("No pages changed.")));
+ $result->pushContent(HTML::p(_("No pages changed.")));
return $result;
}
}
Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php 2011-03-02 10:51:08 UTC (rev 7946)
+++ trunk/lib/plugin/WikiAdminUtils.php 2011-03-02 15:15:48 UTC (rev 7947)
@@ -144,7 +144,7 @@
if (!$count)
return _("No pages with bad names had to be deleted.");
else {
- return HTML(fmt("Deleted %s pages with invalid names:", $count),
+ return HTML(fmt("Deleted %d pages with invalid names:", $count),
HTML::div(array('align'=>'left'), $list));
}
}
@@ -177,7 +177,7 @@
if (!$count)
return _("No empty, unreferenced pages were found.");
else
- return HTML(fmt("Deleted %s unreferenced pages:", $count),
+ return HTML(fmt("Deleted %d unreferenced pages:", $count),
HTML::div(array('align'=>'left'), $list),
($notpurgable ?
fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
