Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[9095] trunk
|
From: <var...@us...> - 2014-09-18 14:32:23
|
Revision: 9095
http://sourceforge.net/p/phpwiki/code/9095
Author: vargenau
Date: 2014-09-18 14:32:14 +0000 (Thu, 18 Sep 2014)
Log Message:
-----------
correct total number of pages for AllPagesCreatedByMe, AllPagesOwnedByMe, AllPagesLastEditedByMe; remove brackets in message
Modified Paths:
--------------
trunk/lib/plugin/AllPages.php
trunk/lib/plugin/LinkDatabase.php
trunk/locale/de/LC_MESSAGES/phpwiki.mo
trunk/locale/es/LC_MESSAGES/phpwiki.mo
trunk/locale/fr/LC_MESSAGES/phpwiki.mo
trunk/locale/it/LC_MESSAGES/phpwiki.mo
trunk/locale/ja/LC_MESSAGES/phpwiki.mo
trunk/locale/nl/LC_MESSAGES/phpwiki.mo
trunk/locale/po/de.po
trunk/locale/po/es.po
trunk/locale/po/fr.po
trunk/locale/po/it.po
trunk/locale/po/ja.po
trunk/locale/po/nl.po
trunk/locale/po/phpwiki.pot
trunk/locale/po/sv.po
trunk/locale/po/zh.po
trunk/locale/sv/LC_MESSAGES/phpwiki.mo
trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/plugin/AllPages.php
===================================================================
--- trunk/lib/plugin/AllPages.php 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/lib/plugin/AllPages.php 2014-09-18 14:32:14 UTC (rev 9095)
@@ -62,70 +62,55 @@
$caption = _("All pages in this wiki (%d total):");
if (!empty($args['userpages'])) {
- $pages = PageList::allUserPages($args['include_empty'],
- $args['sortby'], ''
- );
+ $pages = PageList::allUserPages($args['include_empty'], $args['sortby'], '');
$caption = _("List of user-created pages (%d total):");
- $args['count'] = $request->getArg('count');
+ $args['count'] = count($pages);
} elseif (!empty($args['owner'])) {
- $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
- $args['sortby'], ''
- );
- $args['count'] = $request->getArg('count');
- if (!$args['count'])
- $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
- $caption = fmt("List of pages owned by [%s] (%d total):",
+ $pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'], $args['sortby'], '');
+ $args['count'] = count($pages);
+ $caption = fmt("List of pages owned by %s (%d total):",
WikiLink($args['owner'] == '[]'
? $request->_user->getAuthenticatedId()
: $args['owner'],
'if_known'), $args['count']);
} elseif (!empty($args['author'])) {
- $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
- $args['sortby'], ''
- );
- $args['count'] = $request->getArg('count');
- if (!$args['count'])
- $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
- $caption = fmt("List of pages last edited by [%s] (%d total):",
+ $pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'], $args['sortby'], '');
+ $args['count'] = count($pages);
+ $caption = fmt("List of pages last edited by %s (%d total):",
WikiLink($args['author'] == '[]'
? $request->_user->getAuthenticatedId()
: $args['author'],
'if_known'), $args['count']);
} elseif (!empty($args['creator'])) {
- $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
- $args['sortby'], ''
- );
- $args['count'] = $request->getArg('count');
- if (!$args['count'])
- $args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
- $caption = fmt("List of pages created by [%s] (%d total):",
+ $pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'], $args['sortby'], '');
+ $args['count'] = count($pages);
+ $caption = fmt("List of pages created by %s (%d total):",
WikiLink($args['creator'] == '[]'
? $request->_user->getAuthenticatedId()
: $args['creator'],
'if_known'), $args['count']);
- //} elseif ($pages) {
- // $args['count'] = count($pages);
+ } elseif ($pages) {
+ $args['count'] = count($pages);
} else {
if (!$request->getArg('count'))
$args['count'] = $dbi->numPages($args['include_empty'], $args['exclude']);
else
$args['count'] = $request->getArg('count');
}
- if (empty($args['count']) and !empty($pages))
+ if (empty($args['count']) and !empty($pages)) {
$args['count'] = count($pages);
+ }
$pagelist = new PageList($args['info'], $args['exclude'], $args);
- if (!$args['noheader']) $pagelist->setCaption($caption);
+ if (!$args['noheader']) {
+ $pagelist->setCaption($caption);
+ }
- // deleted pages show up as version 0.
- //if ($args['include_empty'])
- // $pagelist->_addColumn('version');
-
if ($pages !== false)
$pagelist->addPageList($pages);
else
$pagelist->addPages($dbi->getAllPages($args['include_empty'], $args['sortby'],
$args['limit']));
- return $pagelist;
+ return $pagelist;
}
}
Modified: trunk/lib/plugin/LinkDatabase.php
===================================================================
--- trunk/lib/plugin/LinkDatabase.php 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/lib/plugin/LinkDatabase.php 2014-09-18 14:32:14 UTC (rev 9095)
@@ -83,21 +83,21 @@
$pages = PageList::allPagesByOwner($args['owner'], $args['include_empty'],
$args['sortby'], $args['limit']);
if ($args['owner'])
- $caption = fmt("List of pages owned by [%s] (%d total):",
+ $caption = fmt("List of pages owned by %s (%d total):",
WikiLink($args['owner'], 'if_known'),
count($pages));
} elseif (!empty($args['author'])) {
$pages = PageList::allPagesByAuthor($args['author'], $args['include_empty'],
$args['sortby'], $args['limit']);
if ($args['author'])
- $caption = fmt("List of pages last edited by [%s] (%d total):",
+ $caption = fmt("List of pages last edited by %s (%d total):",
WikiLink($args['author'], 'if_known'),
count($pages));
} elseif (!empty($args['creator'])) {
$pages = PageList::allPagesByCreator($args['creator'], $args['include_empty'],
$args['sortby'], $args['limit']);
if ($args['creator'])
- $caption = fmt("List of pages created by [%s] (%d total):",
+ $caption = fmt("List of pages created by %s (%d total):",
WikiLink($args['creator'], 'if_known'),
count($pages));
} else {
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/de.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2000-10-31 02:23+0200\n"
"Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
"<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -1231,21 +1231,17 @@
msgstr "Liste der Benutzer erzeugten Seiten (%d insgesamt):"
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
-msgstr "Liste der Seiten owned by [%s] (%d insgesamt):"
+msgid "List of pages owned by %s (%d total):"
+msgstr "Liste der Seiten owned by %s (%d insgesamt):"
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
-msgstr "Liste der Seiten last edited by [%s] (%d insgesamt):"
+msgid "List of pages last edited by %s (%d total):"
+msgstr "Liste der Seiten last edited by %s (%d insgesamt):"
#, php-format
-msgid "List of pages created by [%s] (%d total):"
-msgstr "Liste der Seiten erzeugt von [%s] (%d insgesamt):"
+msgid "List of pages created by %s (%d total):"
+msgstr "Liste der Seiten erzeugt von %s (%d insgesamt):"
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr "Dauer: %s s"
-
msgid "List all once authenticated users."
msgstr "Liste alle eingetragenen Benutzer."
@@ -6050,6 +6046,9 @@
msgid "Edit this page"
msgstr "Diese Seite bearbeiten"
+#~ msgid "Elapsed time: %s s"
+#~ msgstr "Dauer: %s s"
+
#~ msgid "The current page has no subpages defined."
#~ msgstr "Diese Seite hat keine zugewiesenen Unterseiten."
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/es.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2000-02-01 00:50-0500\n"
"Last-Translator: Pablo Roca <pr...@cl...>\n"
"Language-Team: \n"
@@ -1213,21 +1213,17 @@
msgstr ""
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr ""
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
msgid "List all once authenticated users."
msgstr ""
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/fr.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2004-06-22 21:10+0200\n"
"Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
"Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -1208,21 +1208,17 @@
msgstr "Liste des pages créées par les utilisateurs (%d au total) :"
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
-msgstr "Liste des pages possédées par [%s] (%d au total) :"
+msgid "List of pages owned by %s (%d total):"
+msgstr "Liste des pages possédées par %s (%d au total) :"
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
-msgstr "Liste des pages modifiées en dernier par [%s] (%d au total) :"
+msgid "List of pages last edited by %s (%d total):"
+msgstr "Liste des pages modifiées en dernier par %s (%d au total) :"
#, php-format
-msgid "List of pages created by [%s] (%d total):"
-msgstr "Liste des pages créées par [%s] (%d au total) :"
+msgid "List of pages created by %s (%d total):"
+msgstr "Liste des pages créées par %s (%d au total) :"
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr "Temps écoulé : %s s"
-
msgid "List all once authenticated users."
msgstr "Énumérez tous les utilisateurs une fois authentifiés."
@@ -3273,7 +3269,7 @@
#, php-format
msgid "Wanted Pages for %s (%d total):"
-msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :"
+msgstr "Pages recherchées pour %s dans ce wiki (%d au total) :"
#, php-format
msgid "Wanted Pages in this wiki (%d total):"
@@ -5952,6 +5948,9 @@
msgid "Edit this page"
msgstr "Modifier cette page"
+#~ msgid "Elapsed time: %s s"
+#~ msgstr "Temps écoulé : %s s"
+
#~ msgid "The current page has no subpages defined."
#~ msgstr "La page actuelle n'a aucune sous-page définie."
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/it.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2005-02-12 16:23+0100\n"
"Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
"Language-Team: \n"
@@ -1195,21 +1195,17 @@
msgstr ""
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr ""
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
msgid "List all once authenticated users."
msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/ja.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2003-06-07 09:01+0900\n"
"Last-Translator: Tadashi Jokagi <web...@el...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1199,21 +1199,17 @@
msgstr ""
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr ""
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
#, fuzzy
msgid "List all once authenticated users."
msgstr "%sでソートします。"
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/nl.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2000-09-30 02:23+0200\n"
"Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
"Language-Team: Dutch <nl...@li...>\n"
@@ -1186,21 +1186,17 @@
msgstr ""
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr ""
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
msgid "List all once authenticated users."
msgstr ""
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/phpwiki.pot 2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki-1.4.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2002-12-14 17:51-0500\n"
"Last-Translator: Reini Urban <ru...@us...>\n"
"Language-Team: LANGUAGE <LL...@li...>\n"
@@ -1180,21 +1180,17 @@
msgstr ""
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr ""
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
msgid "List all once authenticated users."
msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/sv.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2001-01-27 01:58+0200\n"
"Last-Translator: Jon Åslund <jo...@he...>\n"
"Language-Team: \n"
@@ -1181,21 +1181,17 @@
msgstr ""
#, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr ""
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr ""
-
msgid "List all once authenticated users."
msgstr ""
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po 2014-09-18 14:28:21 UTC (rev 9094)
+++ trunk/locale/po/zh.po 2014-09-18 14:32:14 UTC (rev 9095)
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: PhpWiki 1.5.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-16 10:25+0200\n"
+"POT-Creation-Date: 2014-09-18 16:30+0200\n"
"PO-Revision-Date: 2004-04-21 10:08+0800\n"
"Last-Translator: DruryL <dr...@us...>\n"
"Language-Team: DruryL <dr...@us...>\n"
@@ -1233,21 +1233,17 @@
msgstr "%s 所需要的頁面 (共 %d):"
#, fuzzy, php-format
-msgid "List of pages owned by [%s] (%d total):"
+msgid "List of pages owned by %s (%d total):"
msgstr "%s 所需要的頁面 (共 %d):"
#, php-format
-msgid "List of pages last edited by [%s] (%d total):"
+msgid "List of pages last edited by %s (%d total):"
msgstr ""
#, fuzzy, php-format
-msgid "List of pages created by [%s] (%d total):"
+msgid "List of pages created by %s (%d total):"
msgstr "%s 所需要的頁面 (共 %d):"
-#, php-format
-msgid "Elapsed time: %s s"
-msgstr "經過時間: %s s"
-
msgid "List all once authenticated users."
msgstr ""
@@ -6112,6 +6108,9 @@
msgid "Edit this page"
msgstr "編輯此頁面"
+#~ msgid "Elapsed time: %s s"
+#~ msgstr "經過時間: %s s"
+
#~ msgid "The current page has no subpages defined."
#~ msgstr "目前頁面沒有定義任何子頁面."
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
