SF.net SVN: phpwiki:[10750] trunk

vargenau--- via phpwiki-checkins <[email protected]>
Newsgroups gmane.comp.web.wiki.phpwiki.checkins
Message-ID <[email protected]> 
Revision: 10750
          http://sourceforge.net/p/phpwiki/code/10750
Author:   vargenau
Date:     2021-12-08 18:47:39 +0000 (Wed, 08 Dec 2021)
Log Message:
-----------
Generic messages with %s

Modified Paths:
--------------
    trunk/lib/plugin/RedirectTo.php
    trunk/lib/plugin/Video.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/RedirectTo.php
===================================================================
--- trunk/lib/plugin/RedirectTo.php	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/lib/plugin/RedirectTo.php	2021-12-08 18:47:39 UTC (rev 10750)
@@ -67,9 +67,9 @@
         $page = $args['page'];
 
         if (!$href && !$page) {
-            return $this->error(_("Both 'href' and 'page' parameters missing."));
+            return $this->error(sprintf(_("Both '%s' and '%s' parameters missing."), 'href', 'page'));
         } elseif ($href && $page) {
-            return $this->error(_("Choose only one of 'href' or 'page' parameters."));
+            return $this->error(sprintf(_("Choose only one of '%s' or '%s' parameters."), 'href', 'page'));
         } 
 
         if ($href) {
@@ -90,8 +90,6 @@
             }
         } elseif ($page) {
             $url = WikiURL($page, array('redirectfrom' => $request->getArg('pagename')));
-        } else {
-            return $this->error(_("'href' or 'page' parameter missing."));
         }
 
         if ($page == $request->getArg('pagename')) {

Modified: trunk/lib/plugin/Video.php
===================================================================
--- trunk/lib/plugin/Video.php	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/lib/plugin/Video.php	2021-12-08 18:47:39 UTC (rev 10750)
@@ -91,9 +91,9 @@
         }
 
         if (!$url && !$file) {
-            return $this->error(_("Both 'url' and 'file' parameters missing."));
+            return $this->error(sprintf(_("Both '%s' and '%s' parameters missing."), 'url', 'file'));
         } elseif ($url && $file) {
-            return $this->error(_("Choose only one of 'url' or 'file' parameters."));
+            return $this->error(sprintf(_("Choose only one of '%s' or '%s' parameters."), 'url', 'file'));
         } elseif ($file) {
             // $url = SERVER_URL . getUploadDataPath() . '/' . $file;
             $url = getUploadDataPath() . '/' . $file;

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-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/de.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2000-10-31 02:23+0200\n"
 "Last-Translator: Reini Urban <[email protected]>, Carsten Klapp "
 "<[email protected]>, Helmer Pardun <pardunpress@t-online."
@@ -2698,10 +2698,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "'href' oder 'page' Argument fehlt."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "'%s' oder '%s' Argument fehlt."
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2715,9 +2717,6 @@
 msgstr ""
 "Weiterleitung zu einer externen URL ist nur in gesperrten Seiten erlaubt."
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr "Eigenbezogene Selbstrückleitung: »%s«"
@@ -3374,12 +3373,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "'url' oder 'file' Argument fehlt."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/es.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2000-02-01 00:50-0500\n"
 "Last-Translator: Pablo Roca <[email protected]>\n"
 "Language-Team: \n"
@@ -2634,10 +2634,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2650,9 +2652,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3296,12 +3295,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/fr.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2004-06-22 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <[email protected]>, Roland "
 "Trique <[email protected]>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -2684,11 +2684,13 @@
 msgid "Redirect to another URL or page."
 msgstr "Redirige vers une autre URL ou page."
 
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "Les paramètres « href » et « page » manquent tous les deux."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "Les paramètres « %s » et « %s » manquent tous les deux."
 
-msgid "Choose only one of 'href' or 'page' parameters."
-msgstr "Choissez un seul des deux paramètres « href » ou « page »."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
+msgstr "Choissez un seul des deux paramètres « %s » ou « %s »."
 
 msgid "Illegal characters in external URL."
 msgstr "Caractère interdit dans une URL externe."
@@ -2700,9 +2702,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr "Redirection récursive vers soi-même : « %s »"
@@ -3364,12 +3363,6 @@
 msgid "Display video in HTML5."
 msgstr "Afficher une vidéo en HTML5."
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "Les paramètres « url » et « file » manquent tous les deux."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr "Choissez un seul des deux paramètres « url » ou «file»."
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr "Votre navigateur ne reconnaît pas la balise video du HTML 5."
 

Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/it.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+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"
@@ -2611,10 +2611,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2627,9 +2629,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3273,12 +3272,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/ja.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2003-06-07 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2597,10 +2597,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2613,9 +2615,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3259,12 +3258,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/nl.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2000-09-30 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <[email protected]>\n"
 "Language-Team: Dutch <[email protected]>\n"
@@ -2603,10 +2603,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2619,9 +2621,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3265,12 +3264,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/phpwiki.pot	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2002-12-14 17:51-0500\n"
 "Last-Translator: Reini Urban <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -2597,10 +2597,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2613,9 +2615,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3259,12 +3258,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/sv.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2001-01-27 01:58+0200\n"
 "Last-Translator: Jon Åslund <[email protected]>\n"
 "Language-Team: \n"
@@ -2598,10 +2598,12 @@
 msgid "Redirect to another URL or page."
 msgstr ""
 
-msgid "Both 'href' and 'page' parameters missing."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
 msgstr ""
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2614,9 +2616,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr ""
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr ""
@@ -3260,12 +3259,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr ""
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 msgstr ""
 

Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2021-12-08 18:34:56 UTC (rev 10749)
+++ trunk/locale/po/zh.po	2021-12-08 18:47:39 UTC (rev 10750)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-08 19:31+0100\n"
+"POT-Creation-Date: 2021-12-08 19:44+0100\n"
 "PO-Revision-Date: 2004-04-21 10:08+0800\n"
 "Last-Translator: DruryL <[email protected]>\n"
 "Language-Team: DruryL <[email protected]>\n"
@@ -2606,10 +2606,12 @@
 msgid "Redirect to another URL or page."
 msgstr "重導向到另一個 url 或頁面."
 
-msgid "Both 'href' and 'page' parameters missing."
-msgstr "'href' 或 'page' 參數遺漏."
+#, php-format
+msgid "Both '%s' and '%s' parameters missing."
+msgstr "'%s' 或 '%s' 參數遺漏."
 
-msgid "Choose only one of 'href' or 'page' parameters."
+#, php-format
+msgid "Choose only one of '%s' or '%s' parameters."
 msgstr ""
 
 msgid "Illegal characters in external URL."
@@ -2622,9 +2624,6 @@
 msgid "Redirect to an external URL is only allowed in locked pages."
 msgstr ""
 
-msgid "'href' or 'page' parameter missing."
-msgstr "'href' 或 'page' 參數遺漏."
-
 #, php-format
 msgid "Recursive redirect to self: “%s”"
 msgstr "遞迴重導向到自己: “%s”"
@@ -3270,12 +3269,6 @@
 msgid "Display video in HTML5."
 msgstr ""
 
-msgid "Both 'url' and 'file' parameters missing."
-msgstr "'url' 或 'file' 參數遺漏."
-
-msgid "Choose only one of 'url' or 'file' parameters."
-msgstr ""
-
 msgid "Your browser does not understand the HTML 5 video tag."
 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.



_______________________________________________
phpwiki-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpwiki-checkins
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.