Item13883: Merge branch 'Release02x01'

foswiki · Jun 1, 2017 · c534520 · c534520
2 parents 9acb49b + bbb8d41
commit c534520
Show file tree

Hide file tree

Showing 29 changed files with 91 additions and 108 deletions.
diff --git a/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt b/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" comment="" date="1495415159" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" comment="" date="1496065343" format="1.1" version="1"}%
 ---+!! <nop>FastCGI Engine Contrib
 %$SHORTDESCRIPTION%
 
@@ -160,8 +160,8 @@ server {
            #fastcgi_pass             unix:/var/run/nginx/foswiki.sock;
            fastcgi_pass             127.0.0.1:9000;
            fastcgi_split_path_info  ^(/bin/\w+)(.*);
-           #  Captures two variables   ($ffastcgi_script_name) and ($fastcgi_path_info)
-           fastcgi_param            SCRIPT_FILENAME $foswiki_root/$fastcgi_script_name;
+           #  Captures two variables   ($fastcgi_script_name) and ($fastcgi_path_info)
+           fastcgi_param            SCRIPT_FILENAME $foswiki_root/bin/$fastcgi_script_name;
            fastcgi_param            SCRIPT_NAME     $fastcgi_script_name;
            fastcgi_param            PATH_INFO       $fastcgi_path_info;
            include fastcgi_params;
@@ -232,7 +232,7 @@ After the update, each process will still serve one more request before reloadin
 ---++ Info
 
 | Change History: | |
-|  21 May 2017 | (1.04) Foswikitask:Item14346 - Fix issues in the systemd service file. Improve documentation.<br/>
+|  21 May 2017 | (1.04) Foswikitask:Item14346 - Fix issues in the systemd service file. Improve documentation.<br/>\
                         Foswikitask:Item14402 - Fix default Foswiki root location. along with more doc improvements. |
 |  04 Oct 2016 | (1.03) Foswikitask:Item13883 - Documentation updates, Foswikitask:Item14086 - Add a systemd example service file. |
 |  14 Jun 2015 | (1.02) Foswikitask:Item10751 - Prepare for Unicode core. |

diff --git a/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin/build.pl b/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin/build.pl
@@ -1,26 +1,15 @@
 #!/usr/bin/perl -w
-BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }
-use Foswiki::Contrib::Build;
-
-# Create the build object
-$build = new Foswiki::Contrib::Build('UpdatesPlugin');
 
-# (Optional) Set the details of the repository for uploads.
-# This can be any web on any accessible Foswiki installation.
-# These defaults will be used when expanding tokens in .txt
-# files, but be warned, they can be overridden at upload time!
+# Standard preamble
+use strict;
+use warnings;
 
-# name of web to upload to
-$build->{UPLOADTARGETWEB} = 'Extensions';
-
-# Full URL of pub directory
-$build->{UPLOADTARGETPUB} = 'http://foswiki.org/pub';
+BEGIN { unshift @INC, split( /:/, $ENV{FOSWIKI_LIBS} ); }
 
-# Full URL of bin directory
-$build->{UPLOADTARGETSCRIPT} = 'http://foswiki.org/bin';
+use Foswiki::Contrib::Build;
 
-# Script extension
-$build->{UPLOADTARGETSUFFIX} = '';
+# Create the build object
+my $build = new Foswiki::Contrib::Build('UpdatesPlugin');
 
 # Build the target on the command line, or the default target
 $build->build( $build->{target} );

diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1495512067" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1496113409" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 History of Foswiki
 %STARTINCLUDE%
@@ -7,17 +7,9 @@ History of Foswiki
 ---+ Appendix A: Foswiki Development Time-line
 
 %TOC%
----++ Foswiki Release 2.1.4-RC3 - 23 May 2017
+---++ Foswiki Release 2.1.4 - 31 May 2017
 
-Foswiki 2.1.4-RC3 was built on 23 May 2017. It is a release that contains 30 fixes.
-
----++ Foswiki Release 2.1.4-RC2 - 15 May 2017
-
-Foswiki 2.1.4-RC2 was built on 15 May 2017. It is a release that contains 25 fixes.
-
----++ Foswiki Release 2.1.4-RC1 - 4 May 2017
-
-Foswiki 2.1.4-RC1 was built on 04 May 2017. It is a release that contains 21 fixes.
+Foswiki 2.1.4 was built on 31 May 2017. It is a release that contains 31 fixes.
 
 ---++ Foswiki Release 2.1.3 - 12 Feb 2017
 

diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt
@@ -1,6 +1,6 @@
-%META:TOPICINFO{author="ProjectContributor" date="1495512067" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1496113409" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
----+!! Foswiki Release 2.1.4-RC3
+---+!! Foswiki Release 2.1.4
 
 %TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
 %TOC%
@@ -53,9 +53,9 @@ Foswiki is released under the GNU General Public License.
 %ENDTWISTY{}%
    * Foswiki 2.1.0 was built on 02 Feb 2016. It is a release that contains 37 fixes and 14 enhancements. It closes 7 Feature Requests.
    * Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements.
-   * Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
+   * Foswiki 2.1.2 was built on 02 May 2016. It is a release that contains 1 fix.
    * Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
-   * Foswiki 2.1.4-RC3 was built on 23 May 2017. It is a release that contains 30 fixes.
+   * Foswiki 2.1.4 was built on 31 May 2017. It is a release that contains 31 fixes.
 
 
 ---++ Pre-installed Extensions
@@ -503,11 +503,12 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14388][Item14388]] | NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |
 | [[%BUGS%/Item14392][Item14392]] | WebPreferences topics contain empty DENY rules that would be honored if ={AccessControlACL}{EnableDeprecatedEmptyDeny}= is enabled. |
 | [[%BUGS%/Item14396][Item14396]] | Don't redirect to relative paths. 302 redirects should be absolute Locations. |
-| [[%BUGS%/Item14400][Item14440]] | Configure settings leak into the global $Foswiki::cfg hash in fcgi environment |
+| [[%BUGS%/Item14400][Item14440]] | Configure settings leak into the global $Foswiki::cfg hash in fcgi environment. |
 | [[%BUGS%/Item14401][Item14401]] | Foswiki crashes if PageCache is enabled with missing dependencies. |
 | [[%BUGS%/Item14402][Item14402]] | Invalid default in FastCGIEngineContrib example foswiki.defaults file. |
 | [[%BUGS%/Item14404][Item14404]] | NatEdit Save and Continue action fails on mod_perl systems. |
 | [[%BUGS%/Item14405][Item14405]] | Redirect after validation with HTTPS proxy for HTTP site results in unsafe redirect. |
+| [[%BUGS%/Item14406][Item14406]] | Configue LANGUAGES pluggable crashes in Locale::Code for unknown languages with Perl 5.26. |
 
 </noautolink>
 

diff --git a/core/lib/Foswiki/Configure/Pluggables/LANGUAGES.pm b/core/lib/Foswiki/Configure/Pluggables/LANGUAGES.pm
@@ -45,36 +45,37 @@ sub construct {
 
         my $label;
 
-        try {
-            if ( $lang =~ m/^(\w+)-(\w+)$/ ) {
-                my ( $lname, $cname ) = (
-                    ( Locale::Language::code2language($1) || '' ),
-                    ( Locale::Country::code2country($2)   || '' )
-                );
-                if ( $lname && $cname ) {
-                    $label = "$lname ($cname)";
-                }
-                elsif ($lname) {
-                    $label = "$lname ($2)";
-                }
-                elsif ($cname) {
-                    $label = "$1 ($cname)";
+        if ( $lang eq 'tlh' ) {
+            $label = "Klingon";
+        }
+        else {
+            try {
+                if ( $lang =~ m/^(\w+)-(\w+)$/ ) {
+                    my ( $lname, $cname ) = (
+                        ( Locale::Language::code2language($1) || '' ),
+                        ( Locale::Country::code2country($2)   || '' )
+                    );
+                    if ( $lname && $cname ) {
+                        $label = "$lname ($cname)";
+                    }
+                    elsif ($lname) {
+                        $label = "$lname ($2)";
+                    }
+                    elsif ($cname) {
+                        $label = "$1 ($cname)";
+                    }
+                    else {
+                        $label = "$lang";
+                    }
                 }
                 else {
-                    $label = "$lang";
+                    $label = Locale::Language::code2language($lang)
+                      || "$lang";
                 }
             }
-            else {
-                $label = Locale::Language::code2language($lang)
-                  || "$lang";
-            }
-        }
-        otherwise {
-            $label = $lang;
-        };
-
-        if ( $label eq 'tlh' ) {
-            $label = "Klingon";
+            otherwise {
+                $label = $lang;
+            };
         }
 
         my $value = Foswiki::Configure::Value->new(

diff --git a/core/locale/Foswiki.pot b/core/locale/Foswiki.pot
@@ -4994,7 +4994,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr ""
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/bg.po b/core/locale/bg.po
@@ -5398,7 +5398,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Внимание: Този сайт не разрешава %<nop>INCLUDE% на уеб-адреси"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/cs.po b/core/locale/cs.po
@@ -5322,7 +5322,7 @@ msgstr "Varování: Nemohu zaslat potvrzovací email, zasílání emailů je vyp
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Varování: Tento server nepovoluje %<nop>INCLUDE% odkazů"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr "Varování: Nalezeny aktualizace pro %1 rozšíření."
 

diff --git a/core/locale/da.po b/core/locale/da.po
@@ -9,8 +9,8 @@ msgstr ""
 "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "PO-Revision-Date: 2017-02-14 07:24+0200\n"
 "Last-Translator: Martin Dahlem <martin@dahlem.dk>\n"
-"Language-Team: Danish <http://translate.foswiki.org/projects/foswiki"
-"/distribution-master/da/>\n"
+"Language-Team: Danish <http://translate.foswiki.org/projects/foswiki/"
+"distribution-master/da/>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5369,7 +5369,7 @@ msgstr ""
 "Advarsel: Dette websted tillader ikke brug af %<nop>INCLUDE% til inkludering "
 "af URL'er"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr "Advarsel: Opdateringer fundet for %1 extension(s)."
 

diff --git a/core/locale/de.po b/core/locale/de.po
@@ -5439,7 +5439,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Warnung: Diese Seite erlaubt kein %<nop>INCLUDE% von URLs"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr "Warnung: Updates für %1 Erweiterung(en) gefunden."
 

diff --git a/core/locale/el.po b/core/locale/el.po
@@ -5521,7 +5521,7 @@ msgstr "Warning: Could not send confirmation email, email has been disabled"
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/es.po b/core/locale/es.po
@@ -5527,7 +5527,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Advertencia: Este sitio no permite %<nop>INCLUDE% de direcciones web"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/fi.po b/core/locale/fi.po
@@ -5484,7 +5484,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Varoitus: Tämä sivusto ei salli URLien %<nop>INCLUDE%"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/fr.po b/core/locale/fr.po
@@ -5458,7 +5458,7 @@ msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr ""
 "Attention : ce site n'autorise pas l'inclusion d'URLs avec %<nop>INCLUDE%"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr "Attention : Mises à jour trouvées pour %1 extension(s)."
 

diff --git a/core/locale/it.po b/core/locale/it.po
@@ -5396,7 +5396,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Attenzione: questo sito non permette l'%<nop>INCLUDE% degli URL"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr "Attenzione: Trovati aggiornamenti per %1 estensioni(e)."
 

diff --git a/core/locale/ja.po b/core/locale/ja.po
@@ -5462,7 +5462,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "警告： このウェブサイトでは %<nop>INCLUDE% リンクは使用できません"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/ko.po b/core/locale/ko.po
@@ -5244,7 +5244,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr ""
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/nl.po b/core/locale/nl.po
@@ -5329,7 +5329,7 @@ msgstr ""
 "Waarschuwing: Op deze site is het niet toegestaan om %<nop>INCLUDE% van URLs "
 "te gebruiken"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/no.po b/core/locale/no.po
@@ -5359,7 +5359,7 @@ msgstr "Advarsel: Kunne ikke sende bekreftekses epost, epost er deaktivert"
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Advarsel: Denne webløsningen tillater ikke %<nop>INCLUDE% av URLs"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/pl.po b/core/locale/pl.po
@@ -5516,7 +5516,7 @@ msgstr "Uwaga: Nie można wysłać listu z potwierdzeniem, email został wyłąc
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Uwaga: dołączanie (INCLUDE) stron jest zabronione"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/pt-br.po b/core/locale/pt-br.po
@@ -5390,7 +5390,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Aviso: Esse sítio não permite %<nop>INCLUDE% de URLs"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/pt.po b/core/locale/pt.po
@@ -5535,7 +5535,7 @@ msgstr ""
 msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr "Aviso: Esse sítio não permite %<nop>INCLUDE% de URLs"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/ru.po b/core/locale/ru.po
@@ -5555,7 +5555,7 @@ msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr ""
 "Внимание: Этот сайт не позволяет использовать %<nop>INCLUDE% для URL адресов"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""
 

diff --git a/core/locale/sv.po b/core/locale/sv.po
@@ -5493,7 +5493,7 @@ msgid "Warning: This site does not allow %<nop>INCLUDE% of URLs"
 msgstr ""
 "Varning: Denna webbplats tillåter inte %<nop>INCLUDE% för att inkludera URLer"
 
-#: UpdatesPlugin/templates/updatesplugin.tmpl:11
+#: UpdatesPlugin/templates/updatesplugin.tmpl:12
 msgid "Warning: Updates found for %1 extension(s)."
 msgstr ""