You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <var...@us...> - 2022-01-05 16:09:19
|
Revision: 10824 http://sourceforge.net/p/phpwiki/code/10824 Author: vargenau Date: 2022-01-05 16:09:17 +0000 (Wed, 05 Jan 2022) Log Message: ----------- Less strings Modified Paths: -------------- trunk/themes/Portland/templates/actionbar.tmpl Modified: trunk/themes/Portland/templates/actionbar.tmpl =================================================================== --- trunk/themes/Portland/templates/actionbar.tmpl 2022-01-05 16:07:40 UTC (rev 10823) +++ trunk/themes/Portland/templates/actionbar.tmpl 2022-01-05 16:09:17 UTC (rev 10824) @@ -1,7 +1,7 @@ <?php - if ($revision and (!$page->get('locked') || $user->isAdmin())) + if ($revision && (!$page->get('locked') || $user->isAdmin())) $EditB = Button("edit", - $revision->isCurrent() ? _("EditText") : _("Edit Old Revision")); + $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")); else $EditB = Button("viewsource", _("View Source")); $EditB = fmt("%s of this page", $EditB); @@ -9,9 +9,9 @@ ?> <?php echo $EditB ?> <a href="<?php echo WikiURL($revision,array('action'=>'diff'))?>"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a> - <?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?> - <?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?> +<?php echo $SEP?><?php echo Button(__("PageHistory"), _("Page History")) ?> +<?php echo $SEP?><?php echo Button(__("PageInfo"), _("Page Info")) ?> <?php if (defined('DEBUG') && DEBUG || $user->isAdmin()) { ?> - <?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?> <?php // For debugging only, really ?> +<?php echo $SEP?><?php echo Button(__("DebugBackendInfo"), _("Debug Backend Info")) ?> <?php } ?> <br /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-05 16:07:41
|
Revision: 10823 http://sourceforge.net/p/phpwiki/code/10823 Author: vargenau Date: 2022-01-05 16:07:40 +0000 (Wed, 05 Jan 2022) Log Message: ----------- Translate title Modified Paths: -------------- trunk/themes/MonoBook/templates/actionbar.tmpl Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2022-01-05 16:05:57 UTC (rev 10822) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2022-01-05 16:07:40 UTC (rev 10823) @@ -48,10 +48,9 @@ <?php } ?> <?php } ?> - - <?php if ( $user->isSignedIn() ) { ?> - <?php echo ActionButton(_("WatchPage"), _("Watch"), false, - array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes")) ?> + <?php if ($user->isSignedIn()) { ?> + <?php echo ActionButton(__("WatchPage"), _("Watch"), false, + array('title'=>_("Add/Remove this to/from the list of pages you're monitoring for changes"))) ?> <?php } ?> </ul> </div> @@ -61,7 +60,7 @@ <h2><?php echo _("Special Actions") ?></h2> <div class="pBody"> <ul> - <?php if ( $user->isSignedIn() ) { ?> + <?php if ($user->isSignedIn()) { ?> <?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?> <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $pagename)) { ?> <?php echo ActionButton('chown') ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-05 16:06:00
|
Revision: 10822 http://sourceforge.net/p/phpwiki/code/10822 Author: vargenau Date: 2022-01-05 16:05:57 +0000 (Wed, 05 Jan 2022) Log Message: ----------- Less strings Modified Paths: -------------- trunk/themes/Wordpress/templates/actionbar.tmpl Modified: trunk/themes/Wordpress/templates/actionbar.tmpl =================================================================== --- trunk/themes/Wordpress/templates/actionbar.tmpl 2022-01-05 15:50:22 UTC (rev 10821) +++ trunk/themes/Wordpress/templates/actionbar.tmpl 2022-01-05 16:05:57 UTC (rev 10822) @@ -1,13 +1,11 @@ <nav role="navigation" aria-label="<?php echo _("Actions Menu") ?>"> <div id="actionbar"> - <?php - if ((!$page->get('locked') || $user->isAdmin()) and $revision) + if ($revision && (!$page->get('locked') || $user->isAdmin())) $EditB = Button("edit", - $revision->isCurrent() ? _("Edit this page") : _("Edit Old Revision")); + $revision->isCurrent() ? _("Edit") : _("Edit Old Revision")); else $EditB = Button("viewsource", _("View Source")); - // $EditB = fmt("%s of this page", $EditB); if (empty($revision)) $revision = $page->getCurrentRevision(false); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-05 15:50:23
|
Revision: 10821 http://sourceforge.net/p/phpwiki/code/10821 Author: vargenau Date: 2022-01-05 15:50:22 +0000 (Wed, 05 Jan 2022) Log Message: ----------- blog theme: adjust banner size Modified Paths: -------------- trunk/themes/blog/Kubrick.css Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2022-01-05 12:31:05 UTC (rev 10820) +++ trunk/themes/blog/Kubrick.css 2022-01-05 15:50:22 UTC (rev 10821) @@ -389,6 +389,10 @@ min-height: 490px; } +.success, .feedback, .warning, .warning_msg, .error, .information { + width: 700px; +} + .narrowcolumn, .wikiblog { width: 550px !important; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-05 12:31:06
|
Revision: 10820 http://sourceforge.net/p/phpwiki/code/10820 Author: vargenau Date: 2022-01-05 12:31:05 +0000 (Wed, 05 Jan 2022) Log Message: ----------- PageDump plugin: it's a warning Modified Paths: -------------- trunk/lib/plugin/PageDump.php Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2022-01-05 12:22:19 UTC (rev 10819) +++ trunk/lib/plugin/PageDump.php 2022-01-05 12:31:05 UTC (rev 10820) @@ -213,8 +213,8 @@ return HTML($h2, HTML::em($desc), HTML::pre($mailified), $altpreviewbuttons, - HTML::div(array('class' => 'error'), - HTML::strong(_("Warning")), _(": "), $warning), + HTML::div(array('class' => 'warning'), + HTML::strong(_("Warning")._(": ")), $warning), $dl, $Sep, $dlall, $Sep, $dlsvn ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-05 12:22:22
|
Revision: 10819 http://sourceforge.net/p/phpwiki/code/10819 Author: vargenau Date: 2022-01-05 12:22:19 +0000 (Wed, 05 Jan 2022) Log Message: ----------- Put "Warning:" in bold in editpage.tmpl, split "Warning:" from rest of message Modified Paths: -------------- trunk/lib/WysiwygEdit/Wikiwyg.php trunk/lib/plugin/PageDump.php trunk/lib/plugin/PasswordReset.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/SemanticSearchAdvanced.php trunk/lib/plugin/WikiAdminSearchReplace.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 trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/fusionforge/templates/editpage.tmpl Modified: trunk/lib/WysiwygEdit/Wikiwyg.php =================================================================== --- trunk/lib/WysiwygEdit/Wikiwyg.php 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/lib/WysiwygEdit/Wikiwyg.php 2022-01-05 12:22:19 UTC (rev 10819) @@ -135,7 +135,7 @@ $iframe0 = new RawXml('<iframe id="iframe0" src="blank.htm" height="0" width="0" frameborder="0"></iframe>'); if ($request->getArg('mode') and $request->getArg('mode') == 'wysiwyg') { $out = HTML(HTML::div(array('class' => 'hint'), - _("Warning: This Wikiwyg editor has only Beta quality!")), + _("Warning")._(": ")._("This Wikiwyg editor has only Beta quality!")), $textarea, $iframe0, "\n"); Modified: trunk/lib/plugin/PageDump.php =================================================================== --- trunk/lib/plugin/PageDump.php 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/lib/plugin/PageDump.php 2022-01-05 12:22:19 UTC (rev 10819) @@ -214,8 +214,7 @@ HTML::pre($mailified), $altpreviewbuttons, HTML::div(array('class' => 'error'), - HTML::strong(_("Warning:")), - " ", $warning), + HTML::strong(_("Warning")), _(": "), $warning), $dl, $Sep, $dlall, $Sep, $dlsvn ); } Modified: trunk/lib/plugin/PasswordReset.php =================================================================== --- trunk/lib/plugin/PasswordReset.php 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/lib/plugin/PasswordReset.php 2022-01-05 12:22:19 UTC (rev 10819) @@ -151,7 +151,7 @@ return $this->doForm($request, $userid); } if (!$userid) { - $alert = new Alert(_("Warning:"), + $alert = new Alert(_("Warning")._(": "), _("You need to specify the userid!")); $alert->show(); return $this->doForm($request); @@ -195,7 +195,7 @@ } $verified = $thisuser->_prefs->_prefs['email']->getraw('emailVerified'); if (!$verified) - $header->pushContent(HTML::br(), _("Warning: This users email address is unverified!")); + $header->pushContent(HTML::br(), _("Warning")._(": ")._("This user's email address is unverified!")); } return $this->doForm($request, $userid, $header, Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/lib/plugin/SemanticSearch.php 2022-01-05 12:22:19 UTC (rev 10819) @@ -289,7 +289,7 @@ if (isset($this->_norelations_warning)) $form->pushContent (HTML::div(array('class' => 'warning'), - _("Warning:"), HTML::br(), + _("Warning")._(":"), HTML::br(), _("No relations nor attributes in the whole wikidb defined!") , "\n" , fmt("See %s", WikiLink(_("Help").":"._("SemanticRelations"))))); Modified: trunk/lib/plugin/SemanticSearchAdvanced.php =================================================================== --- trunk/lib/plugin/SemanticSearchAdvanced.php 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/lib/plugin/SemanticSearchAdvanced.php 2022-01-05 12:22:19 UTC (rev 10819) @@ -146,7 +146,7 @@ $form = $this->showForm($dbi, $request, $args, $allrelations); if (isset($this->_norelations_warning)) $form->pushContent(HTML::div(array('class' => 'warning'), - _("Warning:") . $this->_norelations_warning)); + _("Warning")._(": ") . $this->_norelations_warning)); extract($args); Modified: trunk/lib/plugin/WikiAdminSearchReplace.php =================================================================== --- trunk/lib/plugin/WikiAdminSearchReplace.php 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/lib/plugin/WikiAdminSearchReplace.php 2022-01-05 12:22:19 UTC (rev 10819) @@ -104,7 +104,7 @@ $result = HTML::div(); if ($request->isPost() and empty($post_args['from'])) { $result->pushContent(HTML::p(array('class' => 'warning'), - _("Warning: The search string cannot be empty!"))); + _("Warning")._(": ")._("The search string cannot be empty!"))); } if ($next_action == 'select' and empty($pages)) { // List all pages to select from. 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 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/de.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\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." @@ -2154,8 +2154,8 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" -msgstr "Achtung:" +msgid "Warning" +msgstr "Achtung" #, php-format msgid "PageGroup for %s." @@ -2277,7 +2277,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3655,8 +3655,8 @@ msgstr "" "Sie müssen Administratorrechte haben, um dieses Zusatzprogramm zu benutzen." -msgid "Warning: The search string cannot be empty!" -msgstr "Achtung! Das Suchwort darf nicht leer sein!" +msgid "The search string cannot be empty!" +msgstr "Das Suchwort darf nicht leer sein!" msgid "Select the pages to search and replace" msgstr "Seiten auswählen" @@ -5052,7 +5052,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -5074,6 +5074,9 @@ msgid "Note:" msgstr "Hinweis:" +msgid "This page has been locked and cannot be edited." +msgstr "Diese Seite wurde gesperrt und kann nicht bearbeitet werden." + msgid "You are viewing an old revision of this page." msgstr "Sie sehen eine alte Version dieser Seite." @@ -5105,9 +5108,6 @@ msgid "Page Trail" msgstr "Spur" -msgid "This page has been locked and cannot be edited." -msgstr "Diese Seite wurde gesperrt und kann nicht bearbeitet werden." - #, php-format msgid "Comment modified on %s by %s" msgstr "Kommentare am %s geändert von %s" @@ -5159,8 +5159,8 @@ "page.)" msgstr "" -msgid "Warning: You are editing an old revision." -msgstr "Achtung: Sie bearbeiten eine alte Version." +msgid "You are editing an old revision." +msgstr "Sie bearbeiten eine alte Version." msgid "Saving this page will overwrite the current version." msgstr "" @@ -5974,13 +5974,6 @@ #~ msgid "edit area" #~ msgstr "Texteingabe Fenster" -#~ msgid "" -#~ "Warning: You are editing an old revision. Saving this page will overwrite " -#~ "the current version." -#~ msgstr "" -#~ "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version " -#~ "überschrieben." - #~ msgid "ActionPage" #~ msgstr "Aktion Seite" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/es.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -2097,7 +2097,7 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" +msgid "Warning" msgstr "" #, php-format @@ -2219,7 +2219,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3571,7 +3571,7 @@ msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "The search string cannot be empty!" msgstr "" msgid "Select the pages to search and replace" @@ -4950,7 +4950,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4972,6 +4972,9 @@ msgid "Note:" msgstr "Nota:" +msgid "This page has been locked and cannot be edited." +msgstr "Esta página ha sido bloqueada y no puede ser editada." + msgid "You are viewing an old revision of this page." msgstr "" @@ -5003,9 +5006,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "Esta página ha sido bloqueada y no puede ser editada." - #, php-format msgid "Comment modified on %s by %s" msgstr "Comentario modificado en %s por %s" @@ -5054,7 +5054,7 @@ "page.)" msgstr "" -msgid "Warning: You are editing an old revision." +msgid "You are editing an old revision." msgstr "" msgid "Saving this page will overwrite the current version." Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/fr.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\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." @@ -2137,8 +2137,8 @@ "fichiers téléchargés avant de les éditer sous Emacs et les publier sous " "Subversion." -msgid "Warning:" -msgstr "Attention :" +msgid "Warning" +msgstr "Attention" #, php-format msgid "PageGroup for %s." @@ -2259,9 +2259,8 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" -msgstr "" -"Attention : l'adresse électronique de cet utilsateur n'a pas été vérifiée !" +msgid "This user's email address is unverified!" +msgstr "l'adresse électronique de cet utilsateur n'a pas été vérifiée !" #, php-format msgid "Do you really want to reset the password of user %s?" @@ -3645,8 +3644,8 @@ msgid "You must be an administrator to use this plugin." msgstr "Vous devez être un administrateur pour utiliser ce greffon." -msgid "Warning: The search string cannot be empty!" -msgstr "Attention : vous devez entrez au moins une lettre pour la recherche!" +msgid "The search string cannot be empty!" +msgstr "vous devez entrez au moins une lettre pour la recherche !" msgid "Select the pages to search and replace" msgstr "Sélectionner les pages dans lesquelles la recherche sera effectuée" @@ -5041,7 +5040,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -5063,6 +5062,9 @@ msgid "Note:" msgstr "Note :" +msgid "This page has been locked and cannot be edited." +msgstr "Cette page a été verrouillée et ne peut pas être modifiée." + msgid "You are viewing an old revision of this page." msgstr "Vous lisez une ancienne version de cette page." @@ -5094,9 +5096,6 @@ msgid "Page Trail" msgstr "Fil d'Ariane" -msgid "This page has been locked and cannot be edited." -msgstr "Cette page a été verrouillée et ne peut pas être modifiée." - #, php-format msgid "Comment modified on %s by %s" msgstr "Commentaire modifié le %s par %s" @@ -5149,8 +5148,8 @@ "Veuillez continuer vos modifications. (Vous trouverez votre zone de " "modification en bas de page)." -msgid "Warning: You are editing an old revision." -msgstr "Attention : vous modifiez une ancienne version." +msgid "You are editing an old revision." +msgstr "vous modifiez une ancienne version." msgid "Saving this page will overwrite the current version." msgstr "Enregistrer cette page écrasera la version actuelle." @@ -5831,9 +5830,6 @@ #~ msgid "no cache used" #~ msgstr "pas de cache utilisé" -#~ msgid "Warning: leaving the page will lose all your modifications!" -#~ msgstr "Attention : quitter cette page annulera toutes vos modifications !" - #~ msgid "Tutorial" #~ msgstr "Tutoriel" @@ -6058,20 +6054,6 @@ #~ msgid "edit area" #~ msgstr "zone d'édition" -#~ msgid "" -#~ "Preview only! Changes not saved. Please continue editing. (You'll find " -#~ "your edit area at the bottom of the page.)" -#~ msgstr "" -#~ "Vous êtes en prévisualisation ! Veuillez continuer votre édition. (Vous " -#~ "trouverez votre zone d'édition en bas de page)." - -#~ msgid "" -#~ "Warning: You are editing an old revision. Saving this page will overwrite " -#~ "the current version." -#~ msgstr "" -#~ "Attention : vous modifiez une ancienne version de cette page. Enregistrer " -#~ "cette page écrasera la version actuelle." - #~ msgid "ActionPage" #~ msgstr "Pages d'action" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/it.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\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" @@ -2078,8 +2078,8 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" -msgstr "Avvertimento:" +msgid "Warning" +msgstr "Avvertimento" #, php-format msgid "PageGroup for %s." @@ -2200,7 +2200,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3548,7 +3548,7 @@ msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "The search string cannot be empty!" msgstr "" msgid "Select the pages to search and replace" @@ -4910,7 +4910,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4932,6 +4932,9 @@ msgid "Note:" msgstr "Nota:" +msgid "This page has been locked and cannot be edited." +msgstr "Questa pagina è stata bloccata e non può essere modificata." + msgid "You are viewing an old revision of this page." msgstr "" @@ -4963,9 +4966,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "Questa pagina è stata bloccata e non può essere modificata." - #, php-format msgid "Comment modified on %s by %s" msgstr "" @@ -5014,7 +5014,7 @@ "page.)" msgstr "" -msgid "Warning: You are editing an old revision." +msgid "You are editing an old revision." msgstr "" msgid "Saving this page will overwrite the current version." Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/ja.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2064,8 +2064,8 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" -msgstr "警告:" +msgid "Warning" +msgstr "警告" #, php-format msgid "PageGroup for %s." @@ -2186,7 +2186,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3534,7 +3534,7 @@ msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "The search string cannot be empty!" msgstr "" msgid "Select the pages to search and replace" @@ -4896,7 +4896,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4918,6 +4918,9 @@ msgid "Note:" msgstr "ノート:" +msgid "This page has been locked and cannot be edited." +msgstr "" + msgid "You are viewing an old revision of this page." msgstr "" @@ -4949,9 +4952,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "" - #, php-format msgid "Comment modified on %s by %s" msgstr "" @@ -5000,8 +5000,8 @@ "page.)" msgstr "編集を続けて下さい。 (編集エリアのページの下部も見てください)" -msgid "Warning: You are editing an old revision." -msgstr "警告: あなたは古いリビジョンを編集しています。" +msgid "You are editing an old revision." +msgstr "あなたは古いリビジョンを編集しています。" msgid "Saving this page will overwrite the current version." msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/nl.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -2070,7 +2070,7 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" +msgid "Warning" msgstr "" #, php-format @@ -2192,7 +2192,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3540,7 +3540,7 @@ msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "The search string cannot be empty!" msgstr "" msgid "Select the pages to search and replace" @@ -4902,7 +4902,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4924,6 +4924,9 @@ msgid "Note:" msgstr "" +msgid "This page has been locked and cannot be edited." +msgstr "Deze pagina is afgesloten en kan niet veranderd worden." + msgid "You are viewing an old revision of this page." msgstr "" @@ -4955,9 +4958,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "Deze pagina is afgesloten en kan niet veranderd worden." - #, php-format msgid "Comment modified on %s by %s" msgstr "" @@ -5006,7 +5006,7 @@ "page.)" msgstr "" -msgid "Warning: You are editing an old revision." +msgid "You are editing an old revision." msgstr "" msgid "Saving this page will overwrite the current version." Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/phpwiki.pot 2022-01-05 12:22:19 UTC (rev 10819) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2064,7 +2064,7 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" +msgid "Warning" msgstr "" #, php-format @@ -2186,7 +2186,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3534,7 +3534,7 @@ msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "The search string cannot be empty!" msgstr "" msgid "Select the pages to search and replace" @@ -4896,7 +4896,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4918,6 +4918,9 @@ msgid "Note:" msgstr "" +msgid "This page has been locked and cannot be edited." +msgstr "" + msgid "You are viewing an old revision of this page." msgstr "" @@ -4949,9 +4952,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "" - #, php-format msgid "Comment modified on %s by %s" msgstr "" @@ -5000,7 +5000,7 @@ "page.)" msgstr "" -msgid "Warning: You are editing an old revision." +msgid "You are editing an old revision." msgstr "" msgid "Saving this page will overwrite the current version." Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/sv.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -2065,7 +2065,7 @@ "markup before rewrapping with emacs and checking into Subversion." msgstr "" -msgid "Warning:" +msgid "Warning" msgstr "" #, php-format @@ -2187,7 +2187,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3535,7 +3535,7 @@ msgid "You must be an administrator to use this plugin." msgstr "" -msgid "Warning: The search string cannot be empty!" +msgid "The search string cannot be empty!" msgstr "" msgid "Select the pages to search and replace" @@ -4897,7 +4897,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4919,6 +4919,9 @@ msgid "Note:" msgstr "" +msgid "This page has been locked and cannot be edited." +msgstr "Den här sidan är låst och kan ej redigeras." + msgid "You are viewing an old revision of this page." msgstr "" @@ -4950,9 +4953,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "Den här sidan är låst och kan ej redigeras." - #, php-format msgid "Comment modified on %s by %s" msgstr "" @@ -5001,7 +5001,7 @@ "page.)" msgstr "" -msgid "Warning: You are editing an old revision." +msgid "You are editing an old revision." msgstr "" msgid "Saving this page will overwrite the current version." Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/locale/po/zh.po 2022-01-05 12:22:19 UTC (rev 10819) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-03 11:54+0100\n" +"POT-Creation-Date: 2022-01-05 13:02+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -2073,8 +2073,8 @@ "在以 emacs 重包裝與簽入之前,PhpWiki 開發者應會因為巢狀標記而手動審閱已下載的" "檔案." -msgid "Warning:" -msgstr "警告:" +msgid "Warning" +msgstr "警告" #, php-format msgid "PageGroup for %s." @@ -2195,7 +2195,7 @@ msgid "You need to ask an Administrator to reset this password. See below: " msgstr "" -msgid "Warning: This users email address is unverified!" +msgid "This user's email address is unverified!" msgstr "" #, php-format @@ -3545,8 +3545,8 @@ msgid "You must be an administrator to use this plugin." msgstr "你必須是管理者才能使用此 plugin." -msgid "Warning: The search string cannot be empty!" -msgstr "警告: 搜尋字串不能是空白!" +msgid "The search string cannot be empty!" +msgstr "搜尋字串不能是空白!" msgid "Select the pages to search and replace" msgstr "選擇頁面以進行搜尋" @@ -4918,7 +4918,7 @@ msgid "Sub" msgstr "" -msgid "Warning: This Wikiwyg editor has only Beta quality!" +msgid "This Wikiwyg editor has only Beta quality!" msgstr "" msgid "xml-rpc change" @@ -4940,6 +4940,9 @@ msgid "Note:" msgstr "注意:" +msgid "This page has been locked and cannot be edited." +msgstr "此頁面已經被管理者鎖定,並且無法編輯." + msgid "You are viewing an old revision of this page." msgstr "你正在查看此頁面的較舊修訂." @@ -4971,9 +4974,6 @@ msgid "Page Trail" msgstr "" -msgid "This page has been locked and cannot be edited." -msgstr "此頁面已經被管理者鎖定,並且無法編輯." - #, php-format msgid "Comment modified on %s by %s" msgstr "意見在 %s 被 %s 變更" @@ -5022,8 +5022,8 @@ "page.)" msgstr "請繼續編輯. (你將在頁面的底部找到你的編輯區域.)" -msgid "Warning: You are editing an old revision." -msgstr "警告: 你正在編輯較舊的修訂." +msgid "You are editing an old revision." +msgstr "你正在編輯較舊的修訂." msgid "Saving this page will overwrite the current version." msgstr "儲存此頁面將會覆寫掉目前版本." Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/themes/Crao/templates/editpage.tmpl 2022-01-05 12:22:19 UTC (rev 10819) @@ -10,10 +10,11 @@ <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> <?php if (! $IS_CURRENT) { ?> - <p class="warning_msg"> - <?php echo _("Warning: You are editing an old revision.")?> - <?php echo _("Saving this page will overwrite the current version.")?> - </p> + <p class="warning_msg"> + <strong><?php echo _("Warning")._(": ") ?></strong> + <?php echo _("You are editing an old revision.") ?> + <?php echo _("Saving this page will overwrite the current version.") ?> + </p> <?php } ?> <form method="post" id="editpage" name="editpage" action="<?php echo $request->getPostURL() ?>" @@ -33,8 +34,8 @@ </fieldset> <?php if (ENABLE_CAPTCHA) { ?> <fieldset class="toolbar" style="text-align: center;"> - <?php echo $CAPTCHA_IMAGE ?><br/> - <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?> + <?php echo $CAPTCHA_IMAGE ?><br/> + <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?> </fieldset> <?php } ?> <fieldset class="toolbar"> Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/themes/Portland/templates/editpage.tmpl 2022-01-05 12:22:19 UTC (rev 10819) @@ -7,8 +7,11 @@ <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> <?php if (!$IS_CURRENT) { ?> - <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?> - <?php echo _("Saving this page will overwrite the current version.")?></strong></p> + <p class="warning_msg"> + <strong><?php echo _("Warning")._(": ") ?></strong> + <?php echo _("You are editing an old revision.") ?> + <?php echo _("Saving this page will overwrite the current version.") ?> + </p> <?php } ?> </td> </tr> Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2022-01-05 12:22:19 UTC (rev 10819) @@ -9,8 +9,11 @@ <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> <?php if (!$IS_CURRENT) { ?> - <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?> - <?php echo _("Saving this page will overwrite the current version.")?></strong></p> + <p class="warning_msg"> + <strong><?php echo _("Warning")._(": ") ?></strong> + <?php echo _("You are editing an old revision.") ?> + <?php echo _("Saving this page will overwrite the current version.") ?> + </p> <?php } ?> </td> <td> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/themes/default/templates/editpage.tmpl 2022-01-05 12:22:19 UTC (rev 10819) @@ -10,10 +10,11 @@ <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> <?php if (! $IS_CURRENT) { ?> - <p class="warning_msg"> - <?php echo _("Warning: You are editing an old revision.")?> - <?php echo _("Saving this page will overwrite the current version.")?> - </p> + <p class="warning_msg"> + <strong><?php echo _("Warning")._(": ") ?></strong> + <?php echo _("You are editing an old revision.") ?> + <?php echo _("Saving this page will overwrite the current version.") ?> + </p> <?php } ?> <form method="post" id="editpage" name="editpage" action="<?php echo $request->getPostURL() ?>" Modified: trunk/themes/fusionforge/templates/editpage.tmpl =================================================================== --- trunk/themes/fusionforge/templates/editpage.tmpl 2022-01-04 17:42:19 UTC (rev 10818) +++ trunk/themes/fusionforge/templates/editpage.tmpl 2022-01-05 12:22:19 UTC (rev 10819) @@ -8,10 +8,11 @@ <?php echo $PAGE_LOCKED_MESSAGE ?> <?php echo $CONCURRENT_UPDATE_MESSAGE ?> <?php if (! $IS_CURRENT) { ?> - <p class="warning_msg"> - <?php echo _("Warning: You are editing an old revision.")?> - <?php echo _("Saving this page will overwrite the current version.")?> - </p> + <p class="warning_msg"> + <strong><?php echo _("Warning")._(": ") ?></strong> + <?php echo _("You are editing an old revision.") ?> + <?php echo _("Saving this page will overwrite the current version.") ?> + </p> <?php } ?> <?php if (forge_get_config('use_jquery_form_navigate')) { ?> <script type="text/javascript"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 17:42:21
|
Revision: 10818 http://sourceforge.net/p/phpwiki/code/10818 Author: vargenau Date: 2022-01-04 17:42:19 +0000 (Tue, 04 Jan 2022) Log Message: ----------- UserContribs: add space after ":" and translate Modified Paths: -------------- trunk/lib/plugin/RecentChanges.php Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2022-01-04 14:15:37 UTC (rev 10817) +++ trunk/lib/plugin/RecentChanges.php 2022-01-04 17:42:19 UTC (rev 10818) @@ -52,13 +52,13 @@ if ($title == '[]') { $title = $request->_user->getId(); } - $title = _("UserContribs") . ": $title"; + $title = _("UserContribs") . _(": ") . $title; } elseif ($owner) { $title = $owner; if ($title == '[]') { $title = $request->_user->getId(); } - $title = _("UserContribs") . ": $title"; + $title = _("UserContribs") . _(": ") . $title; } elseif ($only_new) { $title = _("RecentNewPages"); } elseif ($show_minor) { @@ -553,7 +553,7 @@ $author_args = $owner ? array('owner' => $owner) : array('author' => $author); - return array(_("UserContribs"), ":", $owner ? $owner : $author, + return array(_("UserContribs"), _(": "), $owner ? $owner : $author, ' ', $this->rss_icon($author_args), $this->rss2_icon($author_args), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 14:15:39
|
Revision: 10817 http://sourceforge.net/p/phpwiki/code/10817 Author: vargenau Date: 2022-01-04 14:15:37 +0000 (Tue, 04 Jan 2022) Log Message: ----------- blog theme: fix layout of messages Modified Paths: -------------- trunk/themes/blog/templates/body.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/blog/templates/viewsource.tmpl Modified: trunk/themes/blog/templates/body.tmpl =================================================================== --- trunk/themes/blog/templates/body.tmpl 2022-01-04 14:13:20 UTC (rev 10816) +++ trunk/themes/blog/templates/body.tmpl 2022-01-04 14:15:37 UTC (rev 10817) @@ -4,6 +4,23 @@ <div id="pagetitle"> <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div> <main role="main"> +<?php +$action = $request->getArg('action'); +if (empty($revision)) $revision = $page->getCurrentRevision(false); +if (($action == 'edit') && $page->get('locked') && !$user->isAdmin()) { ?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> + </p> +<?php } ?> +<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("You are viewing an old revision of this page.")?> + <?php echo Button('browse', _("View the current version."), $page)?> + </p> +<?php } ?> +<?php if (!empty($redirected)) { ?> + <p><?php echo $redirected ?></p> +<?php } ?> <div id="bodyContent"> <?php echo $CONTENT ?> </div> Modified: trunk/themes/blog/templates/browse.tmpl =================================================================== --- trunk/themes/blog/templates/browse.tmpl 2022-01-04 14:13:20 UTC (rev 10816) +++ trunk/themes/blog/templates/browse.tmpl 2022-01-04 14:15:37 UTC (rev 10817) @@ -1,15 +1,3 @@ -<?php -$action = $request->getArg('action'); -?> -<?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:") ?> - <?php echo _("You are viewing an old revision of this page.") ?> - <?php echo Button('browse', _("View the current version."), $page) ?> - </p> -<?php } ?> -<?php if (!empty($redirected)) { ?> - <p><?php echo $redirected ?></p> -<?php } ?> <div id="content" class="narrowcolumn"> <?php echo $CONTENT?> <div class="comments"> Modified: trunk/themes/blog/templates/viewsource.tmpl =================================================================== --- trunk/themes/blog/templates/viewsource.tmpl 2022-01-04 14:13:20 UTC (rev 10816) +++ trunk/themes/blog/templates/viewsource.tmpl 2022-01-04 14:15:37 UTC (rev 10817) @@ -1,15 +1,3 @@ -<?php -if (empty($revision)) $revision = $page->getCurrentRevision(false); -if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> - <?php echo _("This page has been locked and cannot be edited.") ?> - </p> -<?php } ?> -<?php if (! $revision->isCurrent()) { ?> - <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('viewsource', _("View the current version."), $page) ?> - </p> -<?php } ?> <br class="clear-floats" /> <div id="content" class="narrowcolumn"> <textarea class="wikiedit" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 14:13:21
|
Revision: 10816 http://sourceforge.net/p/phpwiki/code/10816 Author: vargenau Date: 2022-01-04 14:13:20 +0000 (Tue, 04 Jan 2022) Log Message: ----------- blog theme: fix editpage textarea placement Modified Paths: -------------- trunk/themes/blog/Kubrick.css Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2022-01-04 11:21:24 UTC (rev 10815) +++ trunk/themes/blog/Kubrick.css 2022-01-04 14:13:20 UTC (rev 10816) @@ -394,7 +394,7 @@ } #editpage, .wiki-edithelp { - margin-left: 22px; + margin-left: 4px; } .wiki-edithelp { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 11:21:26
|
Revision: 10815 http://sourceforge.net/p/phpwiki/code/10815 Author: vargenau Date: 2022-01-04 11:21:24 +0000 (Tue, 04 Jan 2022) Log Message: ----------- themes/Portland/templates/browse.tmpl and themes/Wordpress/templates/browse.tmpl: use Button Modified Paths: -------------- trunk/themes/Portland/templates/browse.tmpl trunk/themes/Wordpress/templates/browse.tmpl Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2022-01-04 11:20:37 UTC (rev 10814) +++ trunk/themes/Portland/templates/browse.tmpl 2022-01-04 11:21:24 UTC (rev 10815) @@ -5,7 +5,7 @@ <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> <p class="warning_msg"><?php echo _("Note:") ?> <?php echo _("You are viewing an old revision of this page.") ?> - <?php echo WikiLink($page, 'existing', _("View the current version.")) ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <hr class="ignore" /> <?php } ?> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2022-01-04 11:20:37 UTC (rev 10814) +++ trunk/themes/Wordpress/templates/browse.tmpl 2022-01-04 11:21:24 UTC (rev 10815) @@ -5,7 +5,7 @@ <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> <p class="warning_msg"><?php echo _("Note:") ?> <?php echo _("You are viewing an old revision of this page.") ?> - <?php echo WikiLink($page, 'existing', _("View the current version.")) ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <hr class="ignore" /> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 11:20:39
|
Revision: 10814 http://sourceforge.net/p/phpwiki/code/10814 Author: vargenau Date: 2022-01-04 11:20:37 +0000 (Tue, 04 Jan 2022) Log Message: ----------- themes/fusionforge/templates/browse.tmpl: whitespace Modified Paths: -------------- trunk/themes/fusionforge/templates/browse.tmpl Modified: trunk/themes/fusionforge/templates/browse.tmpl =================================================================== --- trunk/themes/fusionforge/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) +++ trunk/themes/fusionforge/templates/browse.tmpl 2022-01-04 11:20:37 UTC (rev 10814) @@ -4,9 +4,9 @@ ?> <?php if ($page->exists() and $revision and $revision->hasDefaultContents()) { ?> - <p class="error"><?php echo _('Error')._(': ')?> - <?php echo _("This revision of the page does not exist.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="error"><?php echo _('Error')._(': ') ?> + <?php echo _("This revision of the page does not exist.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } else { ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-04 10:10:40
|
Revision: 10813 http://sourceforge.net/p/phpwiki/code/10813 Author: vargenau Date: 2022-01-04 10:10:37 +0000 (Tue, 04 Jan 2022) Log Message: ----------- templates: whitespace Modified Paths: -------------- trunk/themes/Crao/templates/browse.tmpl trunk/themes/MonoBook/templates/browse.tmpl trunk/themes/MonoBook/templates/viewsource.tmpl trunk/themes/Portland/templates/browse.tmpl trunk/themes/Portland/templates/viewsource.tmpl trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/Wordpress/templates/viewsource.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/blog/templates/viewsource.tmpl trunk/themes/default/templates/browse.tmpl trunk/themes/default/templates/viewsource.tmpl trunk/themes/fusionforge/templates/browse.tmpl Modified: trunk/themes/Crao/templates/browse.tmpl =================================================================== --- trunk/themes/Crao/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Crao/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,9 +2,9 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> Modified: trunk/themes/MonoBook/templates/browse.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/MonoBook/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,13 +2,12 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> Modified: trunk/themes/MonoBook/templates/viewsource.tmpl =================================================================== --- trunk/themes/MonoBook/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/MonoBook/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,7 +1,7 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -12,8 +12,8 @@ <br class="clear-floats" /> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Portland/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,11 +2,10 @@ $action = $request->getArg('action'); ?> <br class="clear-floats" /> - <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version."))?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo WikiLink($page, 'existing', _("View the current version.")) ?> </p> <hr class="ignore" /> <?php } ?> @@ -13,9 +12,7 @@ <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> - <hr /> <?php echo Template('actionbar') ?> <?php // The bottom navigation/search bar ?> Modified: trunk/themes/Portland/templates/viewsource.tmpl =================================================================== --- trunk/themes/Portland/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Portland/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,7 +1,7 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -11,8 +11,8 @@ <?php } ?> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Wordpress/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,11 +2,10 @@ $action = $request->getArg('action'); ?> <br class="clear-floats" /> - <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo WikiLink($page, 'existing', _("View the current version."))?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo WikiLink($page, 'existing', _("View the current version.")) ?> </p> <hr class="ignore" /> <?php } ?> @@ -13,9 +12,7 @@ <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> - <hr /> <?php echo Template('actionbar') ?> <?php // The bottom navigation/search bar ?> Modified: trunk/themes/Wordpress/templates/viewsource.tmpl =================================================================== --- trunk/themes/Wordpress/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/Wordpress/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,8 +2,8 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -13,8 +13,8 @@ <?php } ?> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/blog/templates/browse.tmpl =================================================================== --- trunk/themes/blog/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/blog/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,23 +2,18 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <div id="content" class="narrowcolumn"> - <?php echo $CONTENT?> - <div class="comments"> </div> - <hr class="printer" /> </div> - <?php echo Template('sidebar')?> Modified: trunk/themes/blog/templates/viewsource.tmpl =================================================================== --- trunk/themes/blog/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/blog/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,8 +1,8 @@ <?php if (empty($revision)) $revision = $page->getCurrentRevision(false); if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if (! $revision->isCurrent()) { ?> @@ -14,8 +14,8 @@ <div id="content" class="narrowcolumn"> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> Modified: trunk/themes/default/templates/browse.tmpl =================================================================== --- trunk/themes/default/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/default/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -2,17 +2,15 @@ $action = $request->getArg('action'); ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> <p><?php echo $redirected ?></p> <?php } ?> - <?php echo $CONTENT?> - <div id="footer"><?php // for top & bottom toolbars stylesheet ?> - <?php echo Template('browse-footer')?> + <?php echo Template('browse-footer') ?> </div> Modified: trunk/themes/default/templates/viewsource.tmpl =================================================================== --- trunk/themes/default/templates/viewsource.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/default/templates/viewsource.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -1,7 +1,7 @@ <?php if ($page->get('locked') && !$user->isAdmin()) { ?> - <p class="warning_msg"><strong><?php echo _("Note:")?></strong> - <?php echo _("This page has been locked and cannot be edited.")?> + <p class="warning_msg"><strong><?php echo _("Note:") ?></strong> + <?php echo _("This page has been locked and cannot be edited.") ?> </p> <?php } ?> <?php if ($revision and !$revision->isCurrent()) { ?> @@ -12,11 +12,11 @@ <br class="clear-floats" /> <textarea class="wikiedit" name="content" - rows="<?php echo $request->getPref('editHeight')?>" - cols="<?php echo $request->getPref('editWidth')?>" + rows="<?php echo $request->getPref('editHeight') ?>" + cols="<?php echo $request->getPref('editWidth') ?>" readonly="readonly" ><?php echo $PAGE_SOURCE ?> </textarea> <div id="footer"><?php // for top & bottom toolbars stylesheet ?> -<?php echo Template('browse-footer')?> + <?php echo Template('browse-footer') ?> </div> Modified: trunk/themes/fusionforge/templates/browse.tmpl =================================================================== --- trunk/themes/fusionforge/templates/browse.tmpl 2022-01-03 18:37:18 UTC (rev 10812) +++ trunk/themes/fusionforge/templates/browse.tmpl 2022-01-04 10:10:37 UTC (rev 10813) @@ -10,9 +10,9 @@ </p> <?php } else { ?> <?php if ($revision and !$revision->isCurrent() and ($action!='revert')) { ?> - <p class="warning_msg"><?php echo _("Note:")?> - <?php echo _("You are viewing an old revision of this page.")?> - <?php echo Button('browse', _("View the current version."), $page)?> + <p class="warning_msg"><?php echo _("Note:") ?> + <?php echo _("You are viewing an old revision of this page.") ?> + <?php echo Button('browse', _("View the current version."), $page) ?> </p> <?php } ?> <?php if (!empty($redirected)) { ?> @@ -38,5 +38,5 @@ <?php } ?> <div id="footer"><?php // for top & bottom toolbars stylesheet ?> - <?php echo Template('browse-footer')?> + <?php echo Template('browse-footer') ?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 18:37:19
|
Revision: 10812 http://sourceforge.net/p/phpwiki/code/10812 Author: vargenau Date: 2022-01-03 18:37:18 +0000 (Mon, 03 Jan 2022) Log Message: ----------- Fix blog theme padding Modified Paths: -------------- trunk/themes/blog/Kubrick.css Modified: trunk/themes/blog/Kubrick.css =================================================================== --- trunk/themes/blog/Kubrick.css 2022-01-03 18:22:21 UTC (rev 10811) +++ trunk/themes/blog/Kubrick.css 2022-01-03 18:37:18 UTC (rev 10812) @@ -102,9 +102,12 @@ width: 760px; } +main { + padding-left: 19px; +} + #content { display:table-cell; - padding-left: 19px; padding-right: 4px; font-size: 1.2em } @@ -380,7 +383,6 @@ #bodyContent { display: table-row; - padding: 0 0 20px 25px; margin: 0 0 0; width: 550px; overflow: visible; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 18:22:22
|
Revision: 10811 http://sourceforge.net/p/phpwiki/code/10811 Author: vargenau Date: 2022-01-03 18:22:21 +0000 (Mon, 03 Jan 2022) Log Message: ----------- Put CSS for banners (feedback, warning, error, information) in default/phpwiki-common.css so that they appear in all themes Modified Paths: -------------- trunk/themes/default/phpwiki-common.css trunk/themes/default/phpwiki.css Modified: trunk/themes/default/phpwiki-common.css =================================================================== --- trunk/themes/default/phpwiki-common.css 2022-01-03 17:15:48 UTC (rev 10810) +++ trunk/themes/default/phpwiki-common.css 2022-01-03 18:22:21 UTC (rev 10811) @@ -64,6 +64,35 @@ font-style: italic; } +/* Banners ============================================================ */ + +.success, .feedback, .warning, .warning_msg, .error, .information { + color: black; + padding-left: 0.5em; + padding-right: 0.5em; + border: 1px solid; +} + +.success, .feedback { + border-color: green; + background-color: #DFF2BF; +} + +.warning_msg, .warning { + border-color: orange; + background-color: #FEEFB3; +} + +.error { + border-color: red; + background-color: #FFBABA; +} + +.information { + border-color: blue; + background-color: #BDE5F8; +} + /* Alert class ======================================================== */ .dialog { Modified: trunk/themes/default/phpwiki.css =================================================================== --- trunk/themes/default/phpwiki.css 2022-01-03 17:15:48 UTC (rev 10810) +++ trunk/themes/default/phpwiki.css 2022-01-03 18:22:21 UTC (rev 10811) @@ -563,32 +563,6 @@ display: none; } -.error { - color: black; - background: #eee; - margin-top: 1em; - margin-bottom: 1em; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.8ex; - padding-bottom: 0; - border: medium solid red; - clear: both; -} - -.warning, .warning_msg { - color: black; - background: #eee; - margin-top: 1em; - margin-bottom: 1em; - padding-left: 0.8em; - padding-right: 0.8em; - padding-top: 0.8ex; - padding-bottom: 0; - border: thin solid blue; - clear: both; -} - /* Debug */ .debug { color: black; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 17:15:50
|
Revision: 10810 http://sourceforge.net/p/phpwiki/code/10810 Author: vargenau Date: 2022-01-03 17:15:48 +0000 (Mon, 03 Jan 2022) Log Message: ----------- Remove old previews Modified Paths: -------------- trunk/themes/wikilens/templates/body.tmpl Removed Paths: ------------- trunk/themes/Hawaiian/preview.jpg trunk/themes/MacOSX/preview.jpg Deleted: trunk/themes/Hawaiian/preview.jpg =================================================================== (Binary files differ) Deleted: trunk/themes/MacOSX/preview.jpg =================================================================== (Binary files differ) Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2022-01-03 15:14:27 UTC (rev 10809) +++ trunk/themes/wikilens/templates/body.tmpl 2022-01-03 17:15:48 UTC (rev 10810) @@ -27,10 +27,8 @@ printXML(HTML::raw(" ")); $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); - } ?> </h1> - <div id="content"> + } ?> </h1> <?php echo $CONTENT ?> - </div> </main> <?php echo Template('bottom') ?> </td> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 15:14:29
|
Revision: 10809 http://sourceforge.net/p/phpwiki/code/10809 Author: vargenau Date: 2022-01-03 15:14:27 +0000 (Mon, 03 Jan 2022) Log Message: ----------- Avoid null issue in PHP 8 Modified Paths: -------------- trunk/themes/Sidebar/templates/top.tmpl trunk/themes/wikilens/templates/body.tmpl Modified: trunk/themes/Sidebar/templates/top.tmpl =================================================================== --- trunk/themes/Sidebar/templates/top.tmpl 2022-01-03 10:58:16 UTC (rev 10808) +++ trunk/themes/Sidebar/templates/top.tmpl 2022-01-03 15:14:27 UTC (rev 10809) @@ -20,6 +20,7 @@ <div id="rateit-widget-top"> <?php $loader = new WikiPluginLoader(); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt show=text ?".">", $request, $dbi->_markup)); ?></div> <?php } ?> Modified: trunk/themes/wikilens/templates/body.tmpl =================================================================== --- trunk/themes/wikilens/templates/body.tmpl 2022-01-03 10:58:16 UTC (rev 10808) +++ trunk/themes/wikilens/templates/body.tmpl 2022-01-03 15:14:27 UTC (rev 10809) @@ -25,6 +25,7 @@ <?php if (!empty($user) && $user->isSignedIn()) { $loader = new WikiPluginLoader(); printXML(HTML::raw(" ")); + $dbi = $request->getDbh(); // Needed in PHP 8 printXML($loader->expandPI("<"."?plugin RateIt ?".">", $request, $dbi->_markup)); } ?> </h1> <div id="content"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 10:58:18
|
Revision: 10808 http://sourceforge.net/p/phpwiki/code/10808 Author: vargenau Date: 2022-01-03 10:58:16 +0000 (Mon, 03 Jan 2022) Log Message: ----------- UpLoad plugin: allow more filenames (e.g. with Chinese characters) Modified Paths: -------------- trunk/lib/plugin/UpLoad.php trunk/lib/stdlib.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/it/pgsrc/NoteDiRilascio 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 trunk/pgsrc/ReleaseNotes Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/lib/plugin/UpLoad.php 2022-01-03 10:58:16 UTC (rev 10808) @@ -177,12 +177,6 @@ $sanified_userfile_name = sanify_filename($userfile_name); - if (preg_match("/[^._a-zA-Z0-9- ]/", strip_accents($sanified_userfile_name))) { - $err_header->pushContent(HTML::p(_("Invalid filename."))); - $message->pushContent($err_header); - return HTML($message, $form); - } - if (file_exists($file_dir . $sanified_userfile_name)) { $err_header->pushContent(HTML::p(fmt("There is already a file with name “%s” uploaded.", $sanified_userfile_name))); $message->pushContent($err_header); Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/lib/stdlib.php 2022-01-03 10:58:16 UTC (rev 10808) @@ -2117,18 +2117,6 @@ } /** - * Remove accents from given text. - */ -function strip_accents($text) -{ - $res = utf8_decode($text); - $res = strtr($res, - utf8_decode('àáâãäçèéêëìíîïñòóôõöùúûüýÿÀÁÂÃÄÇÈÉÊËÌÍÎÏÑÒÓÔÕÖÙÚÛÜÝ'), - 'aaaaaceeeeiiiinooooouuuuyyAAAAACEEEEIIIINOOOOOUUUUY'); - return utf8_encode($res); -} - -/** * Sanify filename: * - remove spaces from the beginning and end * - replace multiple spaces by single space 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/it/pgsrc/NoteDiRilascio =================================================================== --- trunk/locale/it/pgsrc/NoteDiRilascio 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/it/pgsrc/NoteDiRilascio 2022-01-03 10:58:16 UTC (rev 10808) @@ -1,4 +1,4 @@ -Date: Thu, 30 Dec 2021 10:43:13 +0000 +Date: Mon, 3 Jan 2022 11:57:23 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=NoteDiRilascio; @@ -8,7 +8,7 @@ <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>> -== 1.6.1 2021-12-XX Marc-Etienne Vargenau == +== 1.6.1 2022-01-XX Marc-Etienne Vargenau == This release makes ~PhpWiki compatible with PHP 8.1. ##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1. @@ -29,6 +29,7 @@ === Plugins === * Chart plugin: new argument “legend” +* UpLoad plugin: allow more filenames (e.g. with Chinese characters) * ~PreferencesInfo plugin removed * ~CategoryPage plugin removed, categories are better created with the button in the toolbar 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 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/de.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\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." @@ -3261,9 +3261,6 @@ msgid "Sorry but this file is too big." msgstr "Leider ist diese Datei zu groß." -msgid "Invalid filename." -msgstr "Ungültiger Dateiname." - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "Es existiert schon eine gleichnamige, hochgeladene Datei »%s«." @@ -5813,6 +5810,9 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "Invalid filename." +#~ msgstr "Ungültiger Dateiname." + #~ msgid "Deleted" #~ msgstr "Gelöscht" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/es.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -3185,9 +3185,6 @@ msgid "Sorry but this file is too big." msgstr "" -msgid "Invalid filename." -msgstr "Nombre de archivo inválido." - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "" @@ -5684,6 +5681,9 @@ msgid "Edit this page" msgstr "Corrija esta página" +#~ msgid "Invalid filename." +#~ msgstr "Nombre de archivo inválido." + #~ msgid "Deleted" #~ msgstr "Borrada" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/fr.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\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." @@ -3244,9 +3244,6 @@ msgid "Sorry but this file is too big." msgstr "Désolé, mais le fichier est trop gros." -msgid "Invalid filename." -msgstr "Nom de fichier incorrect." - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "Un fichier portant le nom « %s » existe déjà." @@ -5806,6 +5803,9 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "Invalid filename." +#~ msgstr "Nom de fichier incorrect." + #~ msgid "Deleted" #~ msgstr "Supprimé" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/it.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\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" @@ -3162,9 +3162,6 @@ msgid "Sorry but this file is too big." msgstr "" -msgid "Invalid filename." -msgstr "" - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/ja.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3148,9 +3148,6 @@ msgid "Sorry but this file is too big." msgstr "" -msgid "Invalid filename." -msgstr "" - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/nl.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -3154,9 +3154,6 @@ msgid "Sorry but this file is too big." msgstr "" -msgid "Invalid filename." -msgstr "" - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/phpwiki.pot 2022-01-03 10:58:16 UTC (rev 10808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -3148,9 +3148,6 @@ msgid "Sorry but this file is too big." msgstr "" -msgid "Invalid filename." -msgstr "" - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/sv.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -3149,9 +3149,6 @@ msgid "Sorry but this file is too big." msgstr "" -msgid "Invalid filename." -msgstr "" - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/locale/po/zh.po 2022-01-03 10:58:16 UTC (rev 10808) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-02 15:35+0100\n" +"POT-Creation-Date: 2022-01-03 11:54+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -3158,9 +3158,6 @@ msgid "Sorry but this file is too big." msgstr "抱歉,因為檔案太大了." -msgid "Invalid filename." -msgstr "" - #, php-format msgid "There is already a file with name “%s” uploaded." msgstr "已經有個名為 %s 的檔案存在." Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2022-01-03 10:48:42 UTC (rev 10807) +++ trunk/pgsrc/ReleaseNotes 2022-01-03 10:58:16 UTC (rev 10808) @@ -1,4 +1,4 @@ -Date: Thu, 30 Dec 2021 10:43:13 +0000 +Date: Mon, 3 Jan 2022 11:57:23 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -8,7 +8,7 @@ <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>> -== 1.6.1 2021-12-XX Marc-Etienne Vargenau == +== 1.6.1 2022-01-XX Marc-Etienne Vargenau == This release makes ~PhpWiki compatible with PHP 8.1. ##READONLY## is renamed as ##ISREADONLY##, since ##readonly## is now a keyword in PHP 8.1. @@ -29,6 +29,7 @@ === Plugins === * Chart plugin: new argument “legend” +* UpLoad plugin: allow more filenames (e.g. with Chinese characters) * ~PreferencesInfo plugin removed * ~CategoryPage plugin removed, categories are better created with the button in the toolbar This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-03 10:48:44
|
Revision: 10807 http://sourceforge.net/p/phpwiki/code/10807 Author: vargenau Date: 2022-01-03 10:48:42 +0000 (Mon, 03 Jan 2022) Log Message: ----------- UpLoad plugin: add HTML header to log file Modified Paths: -------------- trunk/lib/plugin/UpLoad.php Modified: trunk/lib/plugin/UpLoad.php =================================================================== --- trunk/lib/plugin/UpLoad.php 2022-01-02 14:40:53 UTC (rev 10806) +++ trunk/lib/plugin/UpLoad.php 2022-01-03 10:48:42 UTC (rev 10807) @@ -260,11 +260,23 @@ global $request; $user = $request->_user; + $empty_log = !file_exists($upload_log); if (file_exists($upload_log) and (!is_writable($upload_log))) { trigger_error(_("The upload logfile exists but is not writable."), E_USER_WARNING); } elseif (!$log_handle = fopen($upload_log, "a")) { trigger_error(_("Can't open the upload logfile."), E_USER_WARNING); - } else { // file size in KB; precision of 0.1 + } else { + if ($empty_log) { + fwrite($log_handle, + "<!DOCTYPE html>\n" + . '<html xml:lang="en" lang="en">'."\n" + . "<head>\n" + . "<title>PhpWiki - UpLoad logfile</title>\n" + . "</head>\n" + . "<body>\n" + . "<table>\n"); + } + // file size in KB; precision of 0.1 $file_size = round(($userfile->getSize()) / 1024, 1); if ($file_size <= 0) { $file_size = "< 0.1"; @@ -271,11 +283,10 @@ } $userfile_name = $userfile->getName(); fwrite($log_handle, - "\n" - . "<tr><td><a href=\"$userfile_name\">$userfile_name</a></td>" - . "<td class=\"align-right\">$file_size kB</td>" - . "<td> " . $WikiTheme->formatDate(time()) . "</td>" - . "<td> <em>" . $user->getId() . "</em></td></tr>"); + "<tr>\n <td><a href=\"$userfile_name\">$userfile_name</a></td>\n" + . " <td class=\"align-right\">$file_size kB</td>\n" + . " <td> " . $WikiTheme->formatDate(time()) . "</td>\n" + . " <td> <em>" . $user->getId() . "</em></td>\n</tr>\n"); fclose($log_handle); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-02 14:40:55
|
Revision: 10806 http://sourceforge.net/p/phpwiki/code/10806 Author: vargenau Date: 2022-01-02 14:40:53 +0000 (Sun, 02 Jan 2022) Log Message: ----------- RecentChanges: Deleted --> Removed; action is "Remove page" Modified Paths: -------------- trunk/lib/plugin/RecentChanges.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/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/lib/plugin/RecentChanges.php 2022-01-02 14:40:53 UTC (rev 10806) @@ -146,7 +146,7 @@ switch ($this->status($rev)) { case 'deleted': - return _("Deleted"); + return _("Removed"); case 'new': return _("New page"); default: 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 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/de.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\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." @@ -2503,7 +2503,7 @@ msgid "RecentEdits" msgstr "GeringfügigeÄnderungen" -msgid "Deleted" +msgid "Removed" msgstr "Gelöscht" msgid "diff" @@ -3533,6 +3533,9 @@ msgid "No pages purged." msgstr "Keine Seiten entfernt." +msgid "Purge" +msgstr "Entfernen" + msgid "Confirm purge" msgstr "" @@ -3570,7 +3573,7 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" "Sind Sie sicher, dass Sie die ausgewählen Seiten wirklich löschen wollen?" @@ -3577,15 +3580,6 @@ msgid "Select the pages to remove" msgstr "Wähle Seiten zum Umbenennen aus" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "Auch Seiten, die in den letzten %s Tagen gelöscht wurden." - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" -"Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits ausgewählt." - msgid "Rename selected pages" msgstr "Ausgewählte Seiten umbenennen" @@ -5610,9 +5604,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "Entfernen" - msgid "This revision of the page does not exist." msgstr "Leider, Version ist nicht in der Datenbank." @@ -5822,6 +5813,17 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "Deleted" +#~ msgstr "Gelöscht" + +#~ msgid "Also pages which have been deleted at least %s days." +#~ msgstr "Auch Seiten, die in den letzten %s Tagen gelöscht wurden." + +#~ msgid "Pages which have been deleted at least %s days are already checked." +#~ msgstr "" +#~ "Seiten, die in den letzten %s Tagen gelöscht wurden, sind bereits " +#~ "ausgewählt." + #~ msgid "no cache used" #~ msgstr "kein Cache verwendet" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/es.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -2439,7 +2439,7 @@ msgid "RecentEdits" msgstr "RecienteCorrige" -msgid "Deleted" +msgid "Removed" msgstr "Borrada" msgid "diff" @@ -3453,6 +3453,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3489,20 +3492,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "" - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" - msgid "Rename selected pages" msgstr "" @@ -5483,9 +5478,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "Esta revisión de la página no existe." @@ -5692,6 +5684,9 @@ msgid "Edit this page" msgstr "Corrija esta página" +#~ msgid "Deleted" +#~ msgstr "Borrada" + #~ msgid "External Links" #~ msgstr "Acoplamientos Externos" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/fr.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\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." @@ -2482,7 +2482,7 @@ msgid "RecentEdits" msgstr "ÉditionsRécentes" -msgid "Deleted" +msgid "Removed" msgstr "Supprimé" msgid "diff" @@ -3526,6 +3526,9 @@ msgid "No pages purged." msgstr "Aucune page purgée." +msgid "Purge" +msgstr "Purger" + msgid "Confirm purge" msgstr "Confirmer la purge" @@ -3563,21 +3566,12 @@ msgid "Confirm removal" msgstr "Confirmer la suppression" -msgid "Are you sure you want to remove the selected pages?" -msgstr "Êtes-vous certain de vouloir supprimer les pages sélectionnées ?" +msgid "Are you sure you want to remove the following pages?" +msgstr "Êtes-vous certain de vouloir supprimer les pages suivantes ?" msgid "Select the pages to remove" msgstr "Sélectionner les pages à supprimer" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "Même les pages qui ont été supprimées il y a au plus %s jours." - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" -"Les pages qui ont été supprimées il y a au plus %s jours sont déjà cochées." - msgid "Rename selected pages" msgstr "Renommer les pages sélectionnées" @@ -5602,9 +5596,6 @@ msgid "Access Rights" msgstr "Droits d'accès" -msgid "Purge" -msgstr "Purger" - msgid "This revision of the page does not exist." msgstr "Cette version de la page n'existe pas." @@ -5815,6 +5806,17 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "Deleted" +#~ msgstr "Supprimé" + +#~ msgid "Also pages which have been deleted at least %s days." +#~ msgstr "Même les pages qui ont été supprimées il y a au plus %s jours." + +#~ msgid "Pages which have been deleted at least %s days are already checked." +#~ msgstr "" +#~ "Les pages qui ont été supprimées il y a au plus %s jours sont déjà " +#~ "cochées." + #~ msgid "Select a local file and press Upload to attach into this page" #~ msgstr "" #~ "Sélectionnez un fichier local et cliquez sur Télécharger pour le joindre " Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/it.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\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" @@ -2420,7 +2420,7 @@ msgid "RecentEdits" msgstr "" -msgid "Deleted" +msgid "Removed" msgstr "Rimossa" msgid "diff" @@ -3430,6 +3430,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3466,20 +3469,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "" - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" - msgid "Rename selected pages" msgstr "" @@ -5443,9 +5438,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" @@ -5652,6 +5644,9 @@ msgid "Edit this page" msgstr "" +#~ msgid "Deleted" +#~ msgstr "Rimossa" + #~ msgid "External Links" #~ msgstr "Collegamenti Esterni" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/ja.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2406,7 +2406,7 @@ msgid "RecentEdits" msgstr "" -msgid "Deleted" +msgid "Removed" msgstr "削除しました" msgid "diff" @@ -3416,6 +3416,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3452,20 +3455,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "" - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" - msgid "Rename selected pages" msgstr "" @@ -5429,9 +5424,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" @@ -5638,6 +5630,9 @@ msgid "Edit this page" msgstr "ページを編集しています" +#~ msgid "Deleted" +#~ msgstr "削除しました" + #~ msgid "no cache used" #~ msgstr "キャッシュを使いません" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/nl.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -2412,7 +2412,7 @@ msgid "RecentEdits" msgstr "" -msgid "Deleted" +msgid "Removed" msgstr "" msgid "diff" @@ -3422,6 +3422,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3458,20 +3461,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "" - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" - msgid "Rename selected pages" msgstr "" @@ -5435,9 +5430,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/phpwiki.pot 2022-01-02 14:40:53 UTC (rev 10806) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2406,7 +2406,7 @@ msgid "RecentEdits" msgstr "" -msgid "Deleted" +msgid "Removed" msgstr "" msgid "diff" @@ -3416,6 +3416,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3452,20 +3455,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "" - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" - msgid "Rename selected pages" msgstr "" @@ -5429,9 +5424,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/sv.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -2407,7 +2407,7 @@ msgid "RecentEdits" msgstr "" -msgid "Deleted" +msgid "Removed" msgstr "" msgid "diff" @@ -3417,6 +3417,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3453,20 +3456,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "" - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "" - msgid "Rename selected pages" msgstr "" @@ -5430,9 +5425,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2022-01-02 14:29:06 UTC (rev 10805) +++ trunk/locale/po/zh.po 2022-01-02 14:40:53 UTC (rev 10806) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-25 11:54+0100\n" +"POT-Creation-Date: 2022-01-02 15:35+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -2415,7 +2415,7 @@ msgid "RecentEdits" msgstr "" -msgid "Deleted" +msgid "Removed" msgstr "已刪除" msgid "diff" @@ -3427,6 +3427,9 @@ msgid "No pages purged." msgstr "" +msgid "Purge" +msgstr "" + msgid "Confirm purge" msgstr "" @@ -3463,20 +3466,12 @@ msgid "Confirm removal" msgstr "" -msgid "Are you sure you want to remove the selected pages?" +msgid "Are you sure you want to remove the following pages?" msgstr "" msgid "Select the pages to remove" msgstr "" -#, php-format -msgid "Also pages which have been deleted at least %s days." -msgstr "也列出過去 %s 天被刪除的頁面." - -#, php-format -msgid "Pages which have been deleted at least %s days are already checked." -msgstr "列出過去 %s 天內已被刪除且檢查過的頁面." - msgid "Rename selected pages" msgstr "更名已選定的頁面" @@ -5457,9 +5452,6 @@ msgid "Access Rights" msgstr "" -msgid "Purge" -msgstr "" - msgid "This revision of the page does not exist." msgstr "" @@ -5666,6 +5658,15 @@ msgid "Edit this page" msgstr "編輯此頁面" +#~ msgid "Deleted" +#~ msgstr "已刪除" + +#~ msgid "Also pages which have been deleted at least %s days." +#~ msgstr "也列出過去 %s 天被刪除的頁面." + +#~ msgid "Pages which have been deleted at least %s days are already checked." +#~ msgstr "列出過去 %s 天內已被刪除且檢查過的頁面." + #~ msgid "no cache used" #~ 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. |
From: <var...@us...> - 2022-01-02 14:29:08
|
Revision: 10805 http://sourceforge.net/p/phpwiki/code/10805 Author: vargenau Date: 2022-01-02 14:29:06 +0000 (Sun, 02 Jan 2022) Log Message: ----------- WikiAdminRemove: remove 'min_age' and 'max_age' arguments; 'info' is already in WikiAdminSelect Modified Paths: -------------- trunk/lib/plugin/WikiAdminPurge.php trunk/lib/plugin/WikiAdminRemove.php Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2022-01-02 12:05:05 UTC (rev 10804) +++ trunk/lib/plugin/WikiAdminPurge.php 2022-01-02 14:29:06 UTC (rev 10805) @@ -39,8 +39,6 @@ return _("Permanently purge selected pages")."."; } - /* getDefaultArguments() is inherited from WikiAdminSelect class */ - protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '') { Modified: trunk/lib/plugin/WikiAdminRemove.php =================================================================== --- trunk/lib/plugin/WikiAdminRemove.php 2022-01-02 12:05:05 UTC (rev 10804) +++ trunk/lib/plugin/WikiAdminRemove.php 2022-01-02 14:29:06 UTC (rev 10805) @@ -25,7 +25,7 @@ /** * Usage: <<WikiAdminRemove>> - * Author: Reini Urban <ru...@x-...> + * Author: Reini Urban * * KNOWN ISSUES: * Currently we must be Admin. @@ -43,58 +43,18 @@ return _("Remove selected pages")."."; } - function getDefaultArguments() - { - return array_merge - ( - parent::getDefaultArguments(), - array( - /* - * Show only pages which have been 'deleted' this - * long (in days). (negative or non-numeric - * means show all pages, even non-deleted ones.) - * - * FIXME: could use a better name. - */ - 'min_age' => 0, - - /* - * Automatically check the checkboxes for files - * which have been 'deleted' this long (in days). - * - * FIXME: could use a better name. - */ - 'max_age' => 31, - /* Columns to include in listing */ - 'info' => 'most', - )); - } - protected function collectPages(&$list, &$dbi, $sortby, $limit = 0, $exclude = '') { - extract($this->_args); - $now = time(); - $allPages = $dbi->getAllPages('include_empty', $sortby, $limit); while ($pagehandle = $allPages->next()) { $pagename = $pagehandle->getName(); $current = $pagehandle->getCurrentRevision(); - if ($current->getVersion() < 1) + if ($current->getVersion() < 1) { continue; // No versions in database - - $empty = $current->hasDefaultContents(); - if ($empty) { - $age = ($now - $current->get('mtime')) / (24 * 3600.0); - $checked = $age >= $max_age; - } else { - $age = 0; - $checked = false; } - - if ($age >= $min_age) { - if (empty($list[$pagename])) - $list[$pagename] = $checked; + if (empty($list[$pagename])) { + $list[$pagename] = false; } } return $list; @@ -148,13 +108,7 @@ } $args = $this->getArgs($argstr, $request); - if (!is_numeric($args['min_age'])) - $args['min_age'] = -1; - $this->_args =& $args; - /*if (!empty($args['exclude'])) - $exclude = explodePageList($args['exclude']); - else - $exclude = false;*/ + $this->_args = $args; $this->preSelectS($args, $request); $p = $request->getArg('p'); @@ -166,7 +120,6 @@ if ($p && $request->isPost() && !empty($post_args['remove']) && empty($post_args['cancel']) ) { - // check individual PagePermissions if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) { $request->_notAuthorized(WIKIAUTH_ADMIN); @@ -176,7 +129,6 @@ // Real delete. return $this->removePages($request, array_keys($p)); } - if ($post_args['action'] == 'select') { $next_action = 'verify'; foreach ($p as $name => $c) { @@ -201,28 +153,16 @@ $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array('types' => array('remove' - => new _PageList_Column_remove('remove', _("Remove"))))); + => new PageList_Column_remove('remove', _("Remove"))))); $pagelist->addPageList($pages); if ($next_action == 'verify') { $button_label = _("Yes"); $header->pushContent(HTML::legend(_("Confirm removal"))); $header->pushContent(HTML::p(HTML::strong( - _("Are you sure you want to remove the selected pages?")))); + _("Are you sure you want to remove the following pages?")))); } else { $button_label = _("Remove selected pages"); $header->pushContent(HTML::legend(_("Select the pages to remove"))); - if ($args['min_age'] > 0) { - $header->pushContent( - fmt("Also pages which have been deleted at least %s days.", - $args['min_age'])); - } - - if ($args['max_age'] > 0) { - $header->pushContent( - " ", - fmt("Pages which have been deleted at least %s days are already checked.", - $args['max_age'])); - } } $buttons = HTML::p(Button('submit:admin_remove[remove]', $button_label, 'wikiadmin'), @@ -230,7 +170,6 @@ Button('submit:admin_remove[cancel]', _("Cancel"), 'button')); $header->pushContent($buttons); - // TODO: quick select by regex javascript? return HTML::form(array('action' => $request->getPostURL(), 'method' => 'post'), $header, @@ -243,7 +182,7 @@ } } -class _PageList_Column_remove extends _PageList_Column +class PageList_Column_remove extends _PageList_Column { function _getValue($page_handle, $revision_handle) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-02 12:05:07
|
Revision: 10804 http://sourceforge.net/p/phpwiki/code/10804 Author: vargenau Date: 2022-01-02 12:05:05 +0000 (Sun, 02 Jan 2022) Log Message: ----------- WikiAdminPurge: add new column "Purge" (like in WikiAdminRemove) Modified Paths: -------------- trunk/lib/plugin/WikiAdminPurge.php Modified: trunk/lib/plugin/WikiAdminPurge.php =================================================================== --- trunk/lib/plugin/WikiAdminPurge.php 2022-01-01 13:06:07 UTC (rev 10803) +++ trunk/lib/plugin/WikiAdminPurge.php 2022-01-02 12:05:05 UTC (rev 10804) @@ -25,6 +25,7 @@ /** * Usage: <<WikiAdminPurge>> + * Author: Marc-Etienne Vargenau, based on WikiAdminRemove by Reini Urban */ require_once 'lib/PageList.php'; @@ -117,7 +118,7 @@ if ($p && $request->isPost() && !empty($post_args['purge']) && empty($post_args['cancel']) ) { - // without individual PagePermissions: + // check individual PagePermissions if (!ENABLE_PAGEPERM and !$request->_user->isAdmin()) { $request->_notAuthorized(WIKIAUTH_ADMIN); $this->disabled("! user->isAdmin"); @@ -147,7 +148,10 @@ } $header = HTML::fieldset(); - $pagelist = new PageList_Selectable($args['info'], $args['exclude'], array()); + $pagelist = new PageList_Selectable($args['info'], $args['exclude'], + array('types' => + array('purge' + => new PageList_Column_purge('purge', _("Purge"))))); $pagelist->addPageList($pages); if ($next_action == 'verify') { $button_label = _("Yes"); @@ -175,3 +179,12 @@ 'require_authority_for_post' => WIKIAUTH_ADMIN))); } } + +class PageList_Column_purge extends _PageList_Column +{ + function _getValue($page_handle, $revision_handle) + { + return Button(array('action' => 'purge'), _("Purge"), + $page_handle->getName()); + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2022-01-01 13:06:09
|
Revision: 10803 http://sourceforge.net/p/phpwiki/code/10803 Author: vargenau Date: 2022-01-01 13:06:07 +0000 (Sat, 01 Jan 2022) Log Message: ----------- Add {} Modified Paths: -------------- trunk/lib/Template.php Modified: trunk/lib/Template.php =================================================================== --- trunk/lib/Template.php 2021-12-30 09:44:07 UTC (rev 10802) +++ trunk/lib/Template.php 2022-01-01 13:06:07 UTC (rev 10803) @@ -70,11 +70,13 @@ $this->_tmpl = fread($fp, filesize($file)); if ($fp) fclose($fp); //$userid = $request->_user->_userid; - if (is_array($args)) + if (is_array($args)) { $this->_locals = $args; - elseif ($args) - $this->_locals = array('CONTENT' => $args); else + } elseif ($args) { + $this->_locals = array('CONTENT' => $args); + } else { $this->_locals = array(); + } } private function _munge_input($template) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-30 09:44:09
|
Revision: 10802 http://sourceforge.net/p/phpwiki/code/10802 Author: vargenau Date: 2021-12-30 09:44:07 +0000 (Thu, 30 Dec 2021) Log Message: ----------- Page locking and unlocking is now saved in page history Modified Paths: -------------- trunk/lib/editpage.php trunk/locale/it/pgsrc/NoteDiRilascio trunk/pgsrc/ReleaseNotes Modified: trunk/lib/editpage.php =================================================================== --- trunk/lib/editpage.php 2021-12-25 10:56:37 UTC (rev 10801) +++ trunk/lib/editpage.php 2021-12-30 09:44:07 UTC (rev 10802) @@ -286,10 +286,11 @@ $this->tokens['LOCK_CHANGED_MSG'] .= ($this->locked ? _("Page now locked.") - : _("Page now unlocked.") . " "); + : _("Page now unlocked.")); $changed = true; } - if (defined('ENABLE_PAGE_PUBLIC') and ENABLE_PAGE_PUBLIC and (bool)$this->page->get('public') != (bool)$this->public) { + if (defined('ENABLE_PAGE_PUBLIC') and ENABLE_PAGE_PUBLIC + and (bool)$this->page->get('public') != (bool)$this->public) { $this->page->set('public', (bool)$this->public); $this->tokens['LOCK_CHANGED_MSG'] .= ($this->public @@ -298,15 +299,14 @@ $changed = true; } - if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES) { - if ((bool)$this->page->get('external') != (bool)$this->external) { - $this->page->set('external', (bool)$this->external); - $this->tokens['LOCK_CHANGED_MSG'] - = ($this->external - ? _("Page now external.") - : _("Page now not-external.")) . " "; - $changed = true; - } + if (defined('ENABLE_EXTERNAL_PAGES') and ENABLE_EXTERNAL_PAGES + and (bool)$this->page->get('external') != (bool)$this->external) { + $this->page->set('external', (bool)$this->external); + $this->tokens['LOCK_CHANGED_MSG'] + .= ($this->external + ? _("Page now external.") + : _("Page now not-external.")); + $changed = true; } return $changed; // lock changed. } @@ -318,13 +318,14 @@ if ($this->isUnchanged()) { // Allow admin lock/unlock even if // no text changes were made. + $lock_changed = false; if ($this->updateLock()) { - $dbi = $request->getDbh(); - $dbi->touch(); + $lock_changed = true; + } else { + // Save failed. No changes made. + $this->_redirectToBrowsePage(); + return true; } - // Save failed. No changes made. - $this->_redirectToBrowsePage(); - return true; } if (!$this->user->isAdmin() and $this->isSpam()) { @@ -338,6 +339,9 @@ // has not been explicitly updated. $meta = $this->selected->getMetaData(); $meta = array_merge($meta, $this->meta); + if ($lock_changed) { + $meta['summary'] = $this->tokens['LOCK_CHANGED_MSG']; + } // Save new revision $this->_content = $this->getContent(); Modified: trunk/locale/it/pgsrc/NoteDiRilascio =================================================================== --- trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-25 10:56:37 UTC (rev 10801) +++ trunk/locale/it/pgsrc/NoteDiRilascio 2021-12-30 09:44:07 UTC (rev 10802) @@ -1,4 +1,4 @@ -Date: Wed, 15 Dec 2021 18:48:29 +0000 +Date: Thu, 30 Dec 2021 10:43:13 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=NoteDiRilascio; @@ -20,7 +20,8 @@ === Changes === * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO. * Add “Rename” tab in Sidebar theme. -* Add sample images for ~PhotoAlbum in blog theme +* Page locking and unlocking is now saved in page history. +* Add sample images for ~PhotoAlbum in blog theme. * Remove EDITING_POLICY * Remove ENABLE_XHTML_XML * Remove USECACHE, always true Modified: trunk/pgsrc/ReleaseNotes =================================================================== --- trunk/pgsrc/ReleaseNotes 2021-12-25 10:56:37 UTC (rev 10801) +++ trunk/pgsrc/ReleaseNotes 2021-12-30 09:44:07 UTC (rev 10802) @@ -1,4 +1,4 @@ -Date: Wed, 15 Dec 2021 18:48:29 +0000 +Date: Thu, 30 Dec 2021 10:43:13 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0) Content-Type: application/x-phpwiki; pagename=ReleaseNotes; @@ -20,7 +20,8 @@ === Changes === * Remove ADODB DATABASE_TYPE. Use SQL (Pear) or PDO. * Add “Rename” tab in Sidebar theme. -* Add sample images for ~PhotoAlbum in blog theme +* Page locking and unlocking is now saved in page history. +* Add sample images for ~PhotoAlbum in blog theme. * Remove EDITING_POLICY * Remove ENABLE_XHTML_XML * Remove USECACHE, always true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2021-12-25 10:56:39
|
Revision: 10801 http://sourceforge.net/p/phpwiki/code/10801 Author: vargenau Date: 2021-12-25 10:56:37 +0000 (Sat, 25 Dec 2021) Log Message: ----------- Remove unused buttons UPLOAD_B and SPELLCHECK_B Modified Paths: -------------- trunk/lib/editpage.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/editpage.php =================================================================== --- trunk/lib/editpage.php 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/lib/editpage.php 2021-12-25 10:56:37 UTC (rev 10801) @@ -1067,12 +1067,6 @@ $el['CHANGES_B'] = Button('submit:edit[diff]', _("Changes"), 'wikiaction', array('title' => _('Preview the current changes as diff'))); - $el['UPLOAD_B'] = Button('submit:edit[upload]', - _("Upload"), 'wikiaction', - array('title' => _('Select a local file and press Upload to attach into this page'))); - $el['SPELLCHECK_B'] = Button('submit:edit[SpellCheck]', - _("Spell Check"), 'wikiaction', - array('title' => _('Check the spelling'))); $el['IS_CURRENT'] = $this->version == $this->current->getVersion(); $el['SEP'] = $WikiTheme->getButtonSeparator(); $el['AUTHOR_MESSAGE'] = fmt("Author will be logged as %s.", 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 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/de.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\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." @@ -439,18 +439,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "Hochladen" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "%s wird als Autor aufgenommen." @@ -3227,6 +3215,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "Hochladen" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/es.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -437,18 +437,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "Registrarán al autor como %s." @@ -3152,6 +3140,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/fr.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\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." @@ -445,20 +445,6 @@ msgid "Preview the current changes as diff" msgstr "Prévisualiser les modifications actuelles en tant que diff" -msgid "Upload" -msgstr "Télécharger" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" -"Sélectionnez un fichier local et cliquez sur Télécharger pour le joindre à " -"cette page" - -msgid "Spell Check" -msgstr "Vérifier l'orthographe" - -msgid "Check the spelling" -msgstr "Vérifier l'orthographe" - #, php-format msgid "Author will be logged as %s." msgstr "L'auteur sera enregistré sous le nom %s." @@ -3213,6 +3199,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "Transférer les fichiers vers [[Upload:fichier]]" +msgid "Upload" +msgstr "Télécharger" + msgid "You cannot upload files." msgstr "" @@ -5826,6 +5815,17 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "Select a local file and press Upload to attach into this page" +#~ msgstr "" +#~ "Sélectionnez un fichier local et cliquez sur Télécharger pour le joindre " +#~ "à cette page" + +#~ msgid "Spell Check" +#~ msgstr "Vérifier l'orthographe" + +#~ msgid "Check the spelling" +#~ msgstr "Vérifier l'orthographe" + #~ msgid "no cache used" #~ msgstr "pas de cache utilisé" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/it.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\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" @@ -427,18 +427,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "L'autore sarà annotato come %s." @@ -3129,6 +3117,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/ja.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -415,18 +415,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "アップロード" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "" @@ -3115,6 +3103,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "アップロード" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/nl.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -421,18 +421,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "" @@ -3121,6 +3109,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/phpwiki.pot 2021-12-25 10:56:37 UTC (rev 10801) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -415,18 +415,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "" @@ -3115,6 +3103,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/sv.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -416,18 +416,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "" @@ -3116,6 +3104,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "" +msgid "Upload" +msgstr "" + msgid "You cannot upload files." msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2021-12-25 08:50:52 UTC (rev 10800) +++ trunk/locale/po/zh.po 2021-12-25 10:56:37 UTC (rev 10801) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-22 15:23+0100\n" +"POT-Creation-Date: 2021-12-25 11:54+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -418,18 +418,6 @@ msgid "Preview the current changes as diff" msgstr "" -msgid "Upload" -msgstr "上傳" - -msgid "Select a local file and press Upload to attach into this page" -msgstr "" - -msgid "Spell Check" -msgstr "" - -msgid "Check the spelling" -msgstr "" - #, php-format msgid "Author will be logged as %s." msgstr "作者將登入為 %s." @@ -3125,6 +3113,9 @@ msgid "Upload files to the local InterWiki [[Upload:filename]]" msgstr "上傳檔案到本地 InterWiki. [[Upload:filename]]" +msgid "Upload" +msgstr "上傳" + msgid "You cannot upload files." 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. |
From: <var...@us...> - 2021-12-25 08:50:55
|
Revision: 10800 http://sourceforge.net/p/phpwiki/code/10800 Author: vargenau Date: 2021-12-25 08:50:52 +0000 (Sat, 25 Dec 2021) Log Message: ----------- No need to translate this, modern browsers will display their own message Modified Paths: -------------- 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 trunk/themes/fusionforge/templates/editpage.tmpl 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 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/de.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\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." @@ -2950,9 +2950,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "kein Cache verwendet" - msgid "cached pagedata:" msgstr "Seitendaten in den Cachespeicher aufgenommen:" @@ -5628,9 +5625,6 @@ msgid "This revision of the page does not exist." msgstr "Leider, Version ist nicht in der Datenbank." -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" @@ -5837,6 +5831,9 @@ msgid "Edit this page" msgstr "Diese Seite bearbeiten" +#~ msgid "no cache used" +#~ msgstr "kein Cache verwendet" + #~ msgid "External Links" #~ msgstr "Externe Links" Modified: trunk/locale/po/es.po =================================================================== --- trunk/locale/po/es.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/es.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\n" "PO-Revision-Date: 2000-02-01 00:50-0500\n" "Last-Translator: Pablo Roca <pr...@cl...>\n" "Language-Team: \n" @@ -2884,9 +2884,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "" - msgid "cached pagedata:" msgstr "Página archivada:" @@ -5501,9 +5498,6 @@ msgid "This revision of the page does not exist." msgstr "Esta revisión de la página no existe." -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" Modified: trunk/locale/po/fr.po =================================================================== --- trunk/locale/po/fr.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/fr.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\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." @@ -2935,9 +2935,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "Affiche les informations de bas niveau pour PhpWiki." -msgid "no cache used" -msgstr "pas de cache utilisé" - msgid "cached pagedata:" msgstr "page en cache :" @@ -5622,9 +5619,6 @@ msgid "This revision of the page does not exist." msgstr "Cette version de la page n'existe pas." -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "Attention : quitter cette page annulera toutes vos modifications !" - msgid "Make the page public?" msgstr "Rendre la page publique ?" @@ -5832,6 +5826,12 @@ msgid "Edit this page" msgstr "Modifier cette page" +#~ msgid "no cache used" +#~ msgstr "pas de cache utilisé" + +#~ msgid "Warning: leaving the page will lose all your modifications!" +#~ msgstr "Attention : quitter cette page annulera toutes vos modifications !" + #~ msgid "Tutorial" #~ msgstr "Tutoriel" Modified: trunk/locale/po/it.po =================================================================== --- trunk/locale/po/it.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/it.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\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" @@ -2861,9 +2861,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "" - msgid "cached pagedata:" msgstr "" @@ -5461,9 +5458,6 @@ msgid "This revision of the page does not exist." msgstr "" -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" Modified: trunk/locale/po/ja.po =================================================================== --- trunk/locale/po/ja.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/ja.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\n" "PO-Revision-Date: 2003-06-07 09:01+0900\n" "Last-Translator: Tadashi Jokagi <web...@el...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2847,9 +2847,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "キャッシュを使いません" - msgid "cached pagedata:" msgstr "ページデータをキャッシュ:" @@ -5447,9 +5444,6 @@ msgid "This revision of the page does not exist." msgstr "" -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" @@ -5653,6 +5647,9 @@ msgid "Edit this page" msgstr "ページを編集しています" +#~ msgid "no cache used" +#~ msgstr "キャッシュを使いません" + #~ msgid "Submit country" #~ msgstr "国名送信" Modified: trunk/locale/po/nl.po =================================================================== --- trunk/locale/po/nl.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/nl.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\n" "PO-Revision-Date: 2000-09-30 02:23+0200\n" "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n" "Language-Team: Dutch <nl...@li...>\n" @@ -2853,9 +2853,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "" - msgid "cached pagedata:" msgstr "" @@ -5453,9 +5450,6 @@ msgid "This revision of the page does not exist." msgstr "" -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" Modified: trunk/locale/po/phpwiki.pot =================================================================== --- trunk/locale/po/phpwiki.pot 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/phpwiki.pot 2021-12-25 08:50:52 UTC (rev 10800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki-1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\n" "PO-Revision-Date: 2002-12-14 17:51-0500\n" "Last-Translator: Reini Urban <ru...@us...>\n" "Language-Team: LANGUAGE <LL...@li...>\n" @@ -2847,9 +2847,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "" - msgid "cached pagedata:" msgstr "" @@ -5447,9 +5444,6 @@ msgid "This revision of the page does not exist." msgstr "" -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" Modified: trunk/locale/po/sv.po =================================================================== --- trunk/locale/po/sv.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/sv.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\n" "PO-Revision-Date: 2001-01-27 01:58+0200\n" "Last-Translator: Jon Åslund <jo...@he...>\n" "Language-Team: \n" @@ -2848,9 +2848,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "" -msgid "no cache used" -msgstr "" - msgid "cached pagedata:" msgstr "" @@ -5448,9 +5445,6 @@ msgid "This revision of the page does not exist." msgstr "" -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" Modified: trunk/locale/po/zh.po =================================================================== --- trunk/locale/po/zh.po 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/locale/po/zh.po 2021-12-25 08:50:52 UTC (rev 10800) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: PhpWiki 1.6.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-12-15 16:33+0100\n" +"POT-Creation-Date: 2021-12-22 15:23+0100\n" "PO-Revision-Date: 2004-04-21 10:08+0800\n" "Last-Translator: DruryL <dr...@us...>\n" "Language-Team: DruryL <dr...@us...>\n" @@ -2856,9 +2856,6 @@ msgid "Provide access to PhpWiki's lower level system information." msgstr "提供存取 PhpWiki 下層系統資訊." -msgid "no cache used" -msgstr "沒有快取被使用" - msgid "cached pagedata:" msgstr "已置於快取的頁面資料:" @@ -5475,9 +5472,6 @@ msgid "This revision of the page does not exist." msgstr "" -msgid "Warning: leaving the page will lose all your modifications!" -msgstr "" - msgid "Make the page public?" msgstr "" @@ -5681,6 +5675,9 @@ msgid "Edit this page" msgstr "編輯此頁面" +#~ msgid "no cache used" +#~ msgstr "沒有快取被使用" + #~ msgid "External Links" #~ msgstr "外部連結" Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo =================================================================== (Binary files differ) Modified: trunk/themes/fusionforge/templates/editpage.tmpl =================================================================== --- trunk/themes/fusionforge/templates/editpage.tmpl 2021-12-16 17:24:40 UTC (rev 10799) +++ trunk/themes/fusionforge/templates/editpage.tmpl 2021-12-25 08:50:52 UTC (rev 10800) @@ -25,7 +25,7 @@ } } $(document).ready(function() { - $("#editpage").FormNavigate('<?php echo _('Warning: leaving the page will lose all your modifications!') ?>'); + $("#editpage").FormNavigate('<?php echo 'Warning: leaving the page will lose all your modifications!' ?>'); jQuery(this).find(":submit").unbind('click'); jQuery(this).on('click', "input[name='edit[save]']", function () { global_formNavigate = true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |