Item13897: Merge branch 'master' into Item13897

foswiki · Nov 1, 2016 · 0cb9233 · 0cb9233
2 parents dbdb98a + 8d393a3
commit 0cb9233
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 27 deletions.
diff --git a/FastCGIEngineContrib/lib/Foswiki/Contrib/FastCGIEngineContrib/DEPENDENCIES b/FastCGIEngineContrib/lib/Foswiki/Contrib/FastCGIEngineContrib/DEPENDENCIES
@@ -1,2 +1,2 @@
-FCGI, >0.67, cpan, Required for nginx, and other web servers when configured for FastCGI support
-FCGI::ProcManager, >0.23, cpan, Optional. Required on nginx for dynamic FCGI handler management.
+FCGI, >0.67, cpan, Optional. Required for nginx, and other web servers when configured for FastCGI support
+FCGI::ProcManager, >0.23, cpan, Optional. Required on nginx for dynamic FCGI handler management. Not used with Apache.
diff --git a/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Server.pm b/JsonRpcContrib/lib/Foswiki/Contrib/JsonRpcContrib/Server.pm
@@ -201,17 +201,14 @@ sub dispatch {
 
     # finally
     my $redirectto = $request->param('redirectto');
+    my $url;
+
     if ( $code == 0 && defined $redirectto ) {
-        my $url;
-        if ( $redirectto =~ /^https?:/ ) {
-            $url = $redirectto;
-        }
-        else {
-            $url =
-              $app->cfg->getScriptUrl( 1, 'view', $app->request->web,
-                $redirectto );
-        }
-        $app->redirect($url);
+        $url = $session->redirectto($redirectto);
+    }
+
+    if ($url) {
+        $session->redirect($url);
     }
     else {
         Foswiki::Contrib::JsonRpcContrib::Response->print(

diff --git a/ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib/DEPENDENCIES b/ModPerlEngineContrib/lib/Foswiki/Contrib/ModPerlEngineContrib/DEPENDENCIES
@@ -1,4 +1,2 @@
-mod_perl,>=1.24,cpan,Required if you're using Apache 1.3 and plan to enable mod_perl
-mod_perl2,>=2.0,cpan,Required if you're using Apache 2.x and plan to enable mod_perl
-Apache::Request,>=1.30,cpan,Optional. Recommended if you're using Apache 1.3 and plan to enable mod_perl
-Apache2::Request,>=2.0,cpan,Optional. Recommended if you're using Apache 2.x and plan to enable mod_perl
+mod_perl2,>=2.0,cpan,Optional, but required if you're using Apache 2.x and plan to enable mod_perl
+Apache2::Request,>=2.0,cpan,Optional, but recommended if you're using Apache 2.x and plan to enable mod_perl
diff --git a/core/lib/Foswiki/Contrib/core/DEPENDENCIES b/core/lib/Foswiki/Contrib/core/DEPENDENCIES
@@ -6,7 +6,7 @@ CGI,>=3.15,cpan,Required, for base Foswiki (Versions 2.89, 3.37, 3.43, 3.47 and
 CGI::Cookie,>=1.24,cpan,Required, Installs as part of CGI.
 CGI::Session,>=4.30,cpan,Required, for configure and Sessions support, available from the CPAN archive.
 Compress::Zlib,>0, cpan, Optional, used if Cache compression is enabled.
-DBI,>=0,cpan,Optional Foswiki Page Cache
+DBI,>=0,cpan,Optional Foswiki Page Cache. Also install one DBD:: module 
 DBD::mysql,>=0,cpan,Optional Foswiki Page Cache using MySQL
 DBD::Pg,>=0,cpan,Optional Foswiki Page Cache using PostgreSQL
 DBD::SQLite,>=0,cpan,Optional Foswiki Page Cache using SQLite

diff --git a/core/locale/uk.po b/core/locale/uk.po
@@ -6,15 +6,15 @@ msgstr ""
 "Project-Id-Version: Foswiki $ld\n"
 "Report-Msgid-Bugs-To: foswiki-svn@lists.sourceforge.net\n"
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2016-09-06 17:51+0200\n"
+"PO-Revision-Date: 2016-10-15 01:45+0200\n"
 "Last-Translator: Vadim Belman <vrurg@lflat.org>\n"
 "Language-Team: <translation@linux.org.ua>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.4\n"
 "X-Poedit-Language: Ukrainian\n"
 "X-Poedit-Country: UKRAINE\n"
@@ -665,14 +665,12 @@ msgid "Actions"
 msgstr "Дії"
 
 #: core/templates/registermessages.tmpl:91
-#, fuzzy
 msgid "Activation Failed"
-msgstr "Невірний код активації"
+msgstr "Невдала активація"
 
 #: core/templates/registermessages.tmpl:92
-#, fuzzy
 msgid "Activation for code %1 failed with an internal error."
-msgstr "Операція %1 не вдалась через внутрішню помилку"
+msgstr "Внутрішня помилка активації за кодом %1."
 
 #: JQueryPlugin/data/System/JQueryButton.txt:29
 #: PatternSkin/data/System/PatternSkinElements.txt:452
@@ -4310,13 +4308,12 @@ msgstr ""
 "цільова тема вже містить додаток з таким ім'ям."
 
 #: core/templates/renameattachmentdelete.tmpl:43
-#, fuzzy
 msgid ""
 "The attachment may have to be renamed if an attachment called '%1' already "
 "exists in the target topic."
 msgstr ""
-"Додаток можливо доведеться перейменувати якщо цільова тема вже має додаток з "
-"іменем '%FILENAME%'."
+"Можливо треба перейменувати додаток якщо цільова тема вже має додаток з "
+"іменем '%1'."
 
 #: core/data/System/FAQWhyYouAreAskedToConfirm.txt:6
 msgid ""
@@ -4662,6 +4659,8 @@ msgid ""
 "This is an internal error.  You can try to register again, or contact %1 to "
 "report the error."
 msgstr ""
+"Це внутрішня помилка. Ви можете спробувати зареєструватись знову або "
+"зв'язатись із %1 що повідомити про проблему."
 
 #: TopicUserMappingContrib/data/System/UserRegistrationParts.txt:128
 msgid "This is not a valid WikiName."