From 6e0a9f479b8bbe6975beffbe7e650438e8c54f33 Mon Sep 17 00:00:00 2001 From: George Clark Date: Tue, 23 May 2017 23:37:45 -0400 Subject: [PATCH 1/9] Item13883: Update release notes. --- core/data/System/ReleaseHistory.txt | 6 +++--- core/data/System/ReleaseNotes02x01.txt | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt index 6ca511fee6..24a5b10560 100644 --- 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="1495596908" format="1.1" version="1"}% %META:TOPICPARENT{name="AdminDocumentationCategory"}% History of Foswiki %STARTINCLUDE% @@ -7,9 +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-RC3 - 24 May 2017 -Foswiki 2.1.4-RC3 was built on 23 May 2017. It is a release that contains 30 fixes. +Foswiki 2.1.4-RC3 was built on 24 May 2017. It is a release that contains 31 fixes. ---++ Foswiki Release 2.1.4-RC2 - 15 May 2017 diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt index 6c3260ae70..d6786fa76f 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1495512067" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" date="1495596908" format="1.1" version="1"}% %META:TOPICPARENT{name="ReleaseHistory"}% ---+!! Foswiki Release 2.1.4-RC3 @@ -55,7 +55,7 @@ Foswiki is released under the GNU General Public License. * 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.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-RC3 was built on 24 May 2017. It is a release that contains 31 fixes. ---++ Pre-installed Extensions @@ -515,6 +515,7 @@ Foswiki thanks the Translators for their efforts. If you are interesting in hel | [[%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. | From 496c0a819745d034dbf460565ff18af9c9085026 Mon Sep 17 00:00:00 2001 From: George Clark Date: Wed, 24 May 2017 20:29:13 -0400 Subject: [PATCH 2/9] Item000: Build 2.1.4-RC3 --- core/lib/Foswiki.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm index 7ecec70230..a156d1416d 100644 --- a/core/lib/Foswiki.pm +++ b/core/lib/Foswiki.pm @@ -211,8 +211,8 @@ BEGIN { # DO NOT CHANGE THE FORMAT OF $VERSION. # Use $RELEASE for a descriptive version. - use version 0.77; $VERSION = version->declare('v2.1.3_002'); - $RELEASE = 'Foswiki-2.1.4-RC2'; + use version 0.77; $VERSION = version->declare('v2.1.3_003'); + $RELEASE = 'Foswiki-2.1.4-RC3'; # Default handlers for different %TAGS% # Where an entry is set as 'undef', the tag will be demand-loaded From 64e9e517f5f73468dbde82a4ac77b945b894d4c9 Mon Sep 17 00:00:00 2001 From: George Clark Date: Sun, 28 May 2017 22:30:56 -0400 Subject: [PATCH 3/9] Item13883: Minor typo in nginx config. --- FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt b/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt index 8e726768bf..6ca3656acf 100644 --- 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="1496025040" format="1.1" version="1"}% ---+!! 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; From 902a4fc83f3955e7b00974c0db6df3855aa7143f Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 29 May 2017 09:42:25 -0400 Subject: [PATCH 4/9] Item13883: Typo in FastCGIEngineContrib changelog. --- FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt b/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt index 6ca3656acf..6c15785746 100644 --- a/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt +++ b/FastCGIEngineContrib/data/System/FastCGIEngineContrib.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" comment="" date="1496025040" format="1.1" version="1"}% +%META:TOPICINFO{author="ProjectContributor" comment="" date="1496065343" format="1.1" version="1"}% ---+!! FastCGI Engine Contrib %$SHORTDESCRIPTION% @@ -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.
+| 21 May 2017 | (1.04) Foswikitask:Item14346 - Fix issues in the systemd service file. Improve documentation.
\ 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. | From 2f70162f151a9aab1b94415a11f6bed8bf7a5929 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 29 May 2017 23:04:01 -0400 Subject: [PATCH 5/9] Item13883: Prepare for release. --- core/data/System/ReleaseHistory.txt | 14 +++----------- core/data/System/ReleaseNotes02x01.txt | 10 +++++----- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt index 24a5b10560..67b7fffbdc 100644 --- a/core/data/System/ReleaseHistory.txt +++ b/core/data/System/ReleaseHistory.txt @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="ProjectContributor" date="1495596908" 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 - 24 May 2017 +---++ Foswiki Release 2.1.4 - 30 May 2017 -Foswiki 2.1.4-RC3 was built on 24 May 2017. It is a release that contains 31 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 30 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 index d6786fa76f..7e2a61b1c4 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -1,6 +1,6 @@ -%META:TOPICINFO{author="ProjectContributor" date="1495596908" 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 24 May 2017. It is a release that contains 31 fixes. + * Foswiki 2.1.4 was built on 30 May 2017. It is a release that contains 31 fixes. ---++ Pre-installed Extensions @@ -510,7 +510,7 @@ 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. | From ab1d95b180bbca515077121513fd7366962e5dd7 Mon Sep 17 00:00:00 2001 From: George Clark Date: Mon, 29 May 2017 23:42:56 -0400 Subject: [PATCH 6/9] Item14406: Locale::Codes still is too noisy The version with perl 5.26 complains mightily about unknown language codes. Just hardcode tlh = Klingon for now. --- .../Foswiki/Configure/Pluggables/LANGUAGES.pm | 53 ++++++++++--------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/core/lib/Foswiki/Configure/Pluggables/LANGUAGES.pm b/core/lib/Foswiki/Configure/Pluggables/LANGUAGES.pm index 9f3f59938e..f826048854 100755 --- 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( From d75e38edbb067ff3a52d5b17b32e2be7b7d07338 Mon Sep 17 00:00:00 2001 From: George Clark Date: Wed, 31 May 2017 09:30:15 -0400 Subject: [PATCH 7/9] Item13883: Prepare for release. Update release notes, xgettext run --- core/data/System/ReleaseHistory.txt | 4 +-- core/data/System/ReleaseNotes02x01.txt | 2 +- core/locale/Foswiki.pot | 2 +- core/locale/bg.po | 2 +- core/locale/cs.po | 2 +- core/locale/da.po | 6 ++--- core/locale/de.po | 2 +- core/locale/el.po | 2 +- core/locale/es.po | 2 +- core/locale/fi.po | 2 +- core/locale/fr.po | 2 +- core/locale/it.po | 2 +- core/locale/ja.po | 2 +- core/locale/ko.po | 2 +- core/locale/nl.po | 2 +- core/locale/no.po | 2 +- core/locale/pl.po | 2 +- core/locale/pt-br.po | 2 +- core/locale/pt.po | 2 +- core/locale/ru.po | 2 +- core/locale/sv.po | 2 +- core/locale/tlh.po | 34 +++++++++++++------------- core/locale/tr.po | 2 +- core/locale/uk.po | 2 +- core/locale/zh-cn.po | 2 +- core/locale/zh-tw.po | 6 ++--- 26 files changed, 47 insertions(+), 47 deletions(-) diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt index 67b7fffbdc..038711e4ae 100644 --- a/core/data/System/ReleaseHistory.txt +++ b/core/data/System/ReleaseHistory.txt @@ -7,9 +7,9 @@ History of Foswiki ---+ Appendix A: Foswiki Development Time-line %TOC% ----++ Foswiki Release 2.1.4 - 30 May 2017 +---++ Foswiki Release 2.1.4 - 31 May 2017 -Foswiki 2.1.4 was built on 30 May 2017. It is a release that contains 31 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 index 7e2a61b1c4..82d3a35b60 100644 --- a/core/data/System/ReleaseNotes02x01.txt +++ b/core/data/System/ReleaseNotes02x01.txt @@ -55,7 +55,7 @@ Foswiki is released under the GNU General Public License. * 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 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 was built on 30 May 2017. It is a release that contains 31 fixes. + * Foswiki 2.1.4 was built on 31 May 2017. It is a release that contains 31 fixes. ---++ Pre-installed Extensions diff --git a/core/locale/Foswiki.pot b/core/locale/Foswiki.pot index 6583c931f7..36b8c692c3 100644 --- a/core/locale/Foswiki.pot +++ b/core/locale/Foswiki.pot @@ -4994,7 +4994,7 @@ msgstr "" msgid "Warning: This site does not allow %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 index 8fd5a2648b..756b127070 100644 --- a/core/locale/bg.po +++ b/core/locale/bg.po @@ -5398,7 +5398,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Внимание: Този сайт не разрешава %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 index 40def656d2..57308e8ba7 100755 --- 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 %INCLUDE% of URLs" msgstr "Varování: Tento server nepovoluje %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 index add0bd29fb..049f0425fa 100644 --- 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 \n" -"Language-Team: Danish \n" +"Language-Team: Danish \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 %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 index 5224442448..3d1537e96d 100644 --- a/core/locale/de.po +++ b/core/locale/de.po @@ -5439,7 +5439,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Warnung: Diese Seite erlaubt kein %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 index 59a0c51c1e..e1ad2cb79b 100644 --- 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 %INCLUDE% of URLs" msgstr "Warning: This site does not allow %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 index ba42711b4e..18dd424f1c 100644 --- a/core/locale/es.po +++ b/core/locale/es.po @@ -5527,7 +5527,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Advertencia: Este sitio no permite %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 index 340e3ed9c0..aaebc4b49f 100644 --- a/core/locale/fi.po +++ b/core/locale/fi.po @@ -5484,7 +5484,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Varoitus: Tämä sivusto ei salli URLien %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 index 4a609a6065..79872e35f5 100644 --- a/core/locale/fr.po +++ b/core/locale/fr.po @@ -5458,7 +5458,7 @@ msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "" "Attention : ce site n'autorise pas l'inclusion d'URLs avec %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 index d6e87a54b8..09187fe4b3 100644 --- a/core/locale/it.po +++ b/core/locale/it.po @@ -5396,7 +5396,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Attenzione: questo sito non permette l'%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 index a8a8d8593c..3568eec462 100644 --- a/core/locale/ja.po +++ b/core/locale/ja.po @@ -5462,7 +5462,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "警告： このウェブサイトでは %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 index d319cb9107..02bae48422 100644 --- a/core/locale/ko.po +++ b/core/locale/ko.po @@ -5244,7 +5244,7 @@ msgstr "" msgid "Warning: This site does not allow %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 index 58fd56f428..4be5a15c3e 100644 --- a/core/locale/nl.po +++ b/core/locale/nl.po @@ -5329,7 +5329,7 @@ msgstr "" "Waarschuwing: Op deze site is het niet toegestaan om %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 index 0bbb2e34ad..7aa57659c7 100644 --- 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 %INCLUDE% of URLs" msgstr "Advarsel: Denne webløsningen tillater ikke %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 index cb52f4b0ae..e6defb07ad 100644 --- 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 %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 index 8bbc1bcfcb..3696b6872b 100644 --- a/core/locale/pt-br.po +++ b/core/locale/pt-br.po @@ -5390,7 +5390,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Aviso: Esse sítio não permite %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 index f9e976ee15..eb61192ae2 100644 --- a/core/locale/pt.po +++ b/core/locale/pt.po @@ -5535,7 +5535,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Aviso: Esse sítio não permite %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 index 7c668008cc..788dd40705 100644 --- a/core/locale/ru.po +++ b/core/locale/ru.po @@ -5555,7 +5555,7 @@ msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "" "Внимание: Этот сайт не позволяет использовать %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 index 6895e64dd8..dcd73feb30 100644 --- a/core/locale/sv.po +++ b/core/locale/sv.po @@ -5493,7 +5493,7 @@ msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "" "Varning: Denna webbplats tillåter inte %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 "" diff --git a/core/locale/tlh.po b/core/locale/tlh.po index 14f195a405..f130ce577a 100644 --- a/core/locale/tlh.po +++ b/core/locale/tlh.po @@ -2321,8 +2321,8 @@ msgid "" "If you want to search for a word in the stop word list, prefix the word with " "a plus sign" msgstr "" -"mevmu&' tetlhDaq mu&' Danej DaneHchugh vaj mu&' " -"tlhopDaq chelwI&' ngutlh yIghItlh" +"mevmu&' tetlhDaq mu&' Danej DaneHchugh vaj mu&' " +"tlhopDaq chelwI&' ngutlh yIghItlh" #: core/templates/messages.tmpl:454 msgid "If you would like to create this web" @@ -2333,8 +2333,8 @@ msgid "" "If you would like to send an email and give them feedback, please type it " "below and hit 'Send mail'" msgstr "" -"jabbI&'IDDaq vuDlIj Daja&' DaneHchugh, vaj " -"bIngDaq &'oH yIghItlh &'ej 'QIn ngeH' yI&'uy&'" +"jabbI&'IDDaq vuDlIj Daja&' DaneHchugh, vaj " +"bIngDaq &'oH yIghItlh &'ej 'QIn ngeH' yI&'uy&'" #: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:17 #: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:59 @@ -3303,9 +3303,9 @@ msgid "" "Please go back in your browser and choose a topic name that is a [[%SYSTEMWEB" "%.WikiWord][WikiWord]] or clear the only-WikiWord box" msgstr "" -"weQmoQnaQ nIqHomDaq yIchegh &'ej " -"[[%SYSTEMWEB%.WikiWord][WikiWord]] rurbogh pong yIwIv pagh " -"WikiWord meyrI&' yIchu&'Ha&'" +"weQmoQnaQ nIqHomDaq yIchegh &'ej [[%SYSTEMWEB%.WikiWord]" +"[WikiWord]] rurbogh pong yIwIv pagh WikiWord meyrI&' " +"yIchu&'Ha&'" #: core/templates/messages.tmpl:116 core/templates/messages.tmpl:124 #: core/templates/messages.tmpl:139 core/templates/messages.tmpl:144 @@ -4294,8 +4294,8 @@ msgid "" "Thank you for registering in the %1 collaboration platform. Please save this " "e-mail for future reference." msgstr "" -"%1 Damuvmo&' maQuchqu&'. De&' potlh DaSammeH " -"QInvam yIpol." +"%1 Damuvmo&' maQuchqu&'. De&' potlh DaSammeH " +"QInvam yIpol." #: core/templates/registerconfirm.tmpl:9 msgid "" @@ -4473,8 +4473,8 @@ msgid "" "used internally by Foswiki." msgstr "" "roD lo&'wI&' ghItlhDaq QInQuv cha&'lu&'be&'. " -"QInQuvlIj Da&'ang DaneHchugh, vaj pa&' &'oH " -"DaghItlhlaHbej. Foswiki Quv rurnISbe&' Quvvetlh chu&'." +"QInQuvlIj Da&'ang DaneHchugh, vaj pa&' &'oH " +"DaghItlhlaHbej. Foswiki Quv rurnISbe&' Quvvetlh chu&'." #: core/templates/messages.tmpl:375 msgid "The entry for user %1 was missing in the password system." @@ -4533,12 +4533,12 @@ msgid "" "web. If not provided, the default topic is [[%USERSWEB%.NewUserTemplate]], " "or if that does not exist. [[%SYSTEMWEB%.NewUserTemplate]]." msgstr "" -"QaQHa&' pong DawIvta&'bogh, pagh ghItlhvetlh " -"tu&'be&'lu&'. %USERSWEB% mIchDaq lo&'wI&' ghItlh " -"chu&' &'oHnIS ghantoHghItlh&'e&'.\n" +"QaQHa&' pong DawIvta&'bogh, pagh ghItlhvetlh tu&'" +"be&'lu&'. %USERSWEB% mIchDaq lo&'wI&' ghItlh chu&' &'" +"oHnIS ghantoHghItlh&'e&'.\n" "pongbe&'lu&'chugh vaj [[%USERSWEB%.NewUserTemplate]] &'oH ghItlh " -"motlh&'e&'. taHbe&'chugh ghItlhvetlh vaj " -"[[%SYSTEMWEB%.NewUserTemplate]] &'oH." +"motlh&'e&'. taHbe&'chugh ghItlhvetlh vaj [[%SYSTEMWEB%." +"NewUserTemplate]] &'oH." #: core/data/System/UserName.txt:3 msgid "The name you log in with" @@ -5355,7 +5355,7 @@ msgstr "" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "Qu&'vatlh: URL %INCLUDE% chaw&'be&' weQmoQnaQ Daqvam" -#: UpdatesPlugin/templates/updatesplugin.tmpl:11 +#: UpdatesPlugin/templates/updatesplugin.tmpl:12 msgid "Warning: Updates found for %1 extension(s)." msgstr "" "Qu&'vatlh: %1 extension(mey)vaD chu&'moHwI&' luSamlu&'." diff --git a/core/locale/tr.po b/core/locale/tr.po index 49b6b0e362..e6bfc10980 100644 --- a/core/locale/tr.po +++ b/core/locale/tr.po @@ -5187,7 +5187,7 @@ msgstr "" msgid "Warning: This site does not allow %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/uk.po b/core/locale/uk.po index dc0aabd066..91de35d02e 100644 --- a/core/locale/uk.po +++ b/core/locale/uk.po @@ -5334,7 +5334,7 @@ msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "" "Увага: Цей сайт не дозволяє використовувати %INCLUDE% для URL адрес" -#: UpdatesPlugin/templates/updatesplugin.tmpl:11 +#: UpdatesPlugin/templates/updatesplugin.tmpl:12 msgid "Warning: Updates found for %1 extension(s)." msgstr "Увага: Знайдено оновлення для %1 розширень(я)." diff --git a/core/locale/zh-cn.po b/core/locale/zh-cn.po index a93fbc4238..4aeba01ad6 100644 --- a/core/locale/zh-cn.po +++ b/core/locale/zh-cn.po @@ -5361,7 +5361,7 @@ msgstr "警告: 无法寄送确认邮件，邮件已禁用。" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "警告: 本网站不允许 %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/zh-tw.po b/core/locale/zh-tw.po index d35e95fbb6..ce5ad8f022 100644 --- a/core/locale/zh-tw.po +++ b/core/locale/zh-tw.po @@ -9,8 +9,8 @@ msgstr "" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2017-01-31 09:15+0200\n" "Last-Translator: CH yang \n" -"Language-Team: Traditional Chinese " -"\n" +"Language-Team: Traditional Chinese \n" "Language: zh-tw\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5114,7 +5114,7 @@ msgstr "警告: 無法寄送確認郵件，郵件已禁用" msgid "Warning: This site does not allow %INCLUDE% of URLs" msgstr "警告: 本網站不允許 %INCLUDE% 連結" -#: UpdatesPlugin/templates/updatesplugin.tmpl:11 +#: UpdatesPlugin/templates/updatesplugin.tmpl:12 msgid "Warning: Updates found for %1 extension(s)." msgstr "警告: 找到擴充 %1 的更新。" From 1bf16045dabb4599bc71548de985022e351761fc Mon Sep 17 00:00:00 2001 From: George Clark Date: Wed, 31 May 2017 15:45:16 -0400 Subject: [PATCH 8/9] Item000: Build Foswiki-2.1.4 --- core/lib/Foswiki.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm index a156d1416d..747050f472 100644 --- a/core/lib/Foswiki.pm +++ b/core/lib/Foswiki.pm @@ -211,8 +211,8 @@ BEGIN { # DO NOT CHANGE THE FORMAT OF $VERSION. # Use $RELEASE for a descriptive version. - use version 0.77; $VERSION = version->declare('v2.1.3_003'); - $RELEASE = 'Foswiki-2.1.4-RC3'; + use version 0.77; $VERSION = version->declare('v2.1.3_004'); + $RELEASE = 'Foswiki-2.1.4'; # Default handlers for different %TAGS% # Where an entry is set as 'undef', the tag will be demand-loaded From bbb8d41591fd94b06e210d21bf02e0986c6d3ca0 Mon Sep 17 00:00:00 2001 From: George Clark Date: Wed, 31 May 2017 23:39:05 -0400 Subject: [PATCH 9/9] Item13907: Fix build.pl to get upload to work. --- .../Foswiki/Plugins/UpdatesPlugin/build.pl | 25 ++++++------------- 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin/build.pl b/UpdatesPlugin/lib/Foswiki/Plugins/UpdatesPlugin/build.pl index d214755f1a..481d6c1c91 100755 --- 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} );