Browse Source

Adding stable / major release differences

if the 3rd digit is a 0, it's a major release, don't display the same text

Other minor changes:
 * always ucfirst the description (for consistency)
 * change some wordings
 * set enhancements first (for maintainance that should not change anything, because there are no ENH, but for major release that's important because most bugfixes have already been published so what is interesting is the ENH list !
 * add the tranlation for Ehara taku toa i te toa takitahi, engari he toa takitini
merge-requests/5/head
Paul Poulain 8 years ago
parent
commit
66fb81f35d
4 changed files with 63 additions and 36 deletions
  1. +4
    -2
      announcement.html.tt
  2. +2
    -0
      get_bugs.pl
  3. +25
    -14
      release_notes_tmpl.tt
  4. +32
    -20
      release_notes_tmpl_html.tt

+ 4
- 2
announcement.html.tt View File

@@ -1,7 +1,9 @@
The Koha release team is happy to announce the release of Koha [% VERSION %].

[% if MAJOR %]
This version is a major release, that comes with a lot of new features and enhancements or existing features
[% ELSE %]
This is a stable release and contains bugfixes as well as updated translations.

[% END %]
You can download it at

<a href="http://download.koha-community.org/" target="_blank">http://download.koha-community.org/</a>


+ 2
- 0
get_bugs.pl View File

@@ -105,6 +105,7 @@ $arguments{shortversion} .= "$additional" if ($additional);
$arguments{expandedversion} = "$major.$expanded_minor.$expanded_release";
$arguments{expandedversion} .= "$additional" if ($additional);
$arguments{line} = "$major." . ($minor % 2 ? $minor + 1 : $minor);
$arguments{MAJOR} = $release?0:1; # major release if the last number is 0

# description is a hash used to store bugzilla descriptions
# bugzilla descriptions are slow to retrieve from bugzilla, and can't be updated
@@ -206,6 +207,7 @@ if (scalar @bug_list) {
while (scalar @csv_file) {
$csv->parse(shift @csv_file);
my @fields = $csv->fields;
$fields[2] = ucfirst($fields[2]);
if ($fields[1] =~ m/(blocker|critical|major)/) {
if ($current_highlight && $fields[3] ne $current_highlight) {
my @t=@component_highlights;


+ 25
- 14
release_notes_tmpl.tt View File

@@ -19,11 +19,28 @@ Installation instructions can be found at:
OR in the INSTALL files that come in the tarball

[% IF MAJOR %]
Koha [% shortversion %] is a major release, that comes with many new features and enhancement of previously existing features.
[% ELSE %]
Koha [% shortversion %] is a bugfix/maintenance release.
[% END %]

[% IF enhancements %]
Enhancements and new features in [% shortversion %]
======================
[% FOREACH enhancement IN enhancements %]
[% enhancement.component %]
----------
[% FOREACH line IN enhancement.list %] [% line.number %] [% line.short_desc %][% IF line.description %]
[% line.description %][% END %]
[% END %][% END %][% END -%]

[% IF highlights %]
Highlights of [% shortversion %]
Critical bugs fixed in [% shortversion %]
======================
[% IF MAJOR %]
(this list include all bugfixes since the previous major version. Most of them have already been fixed in maintainance release)
[% END %]
[% FOREACH highlight IN highlights %]
[% highlight.component %]
----------
@@ -31,24 +48,17 @@ Highlights of [% shortversion %]
[% END %][% END %][% END -%]

[% IF bugfixes %]
Bugs fixed in [% shortversion %]
Other bugs fixed in [% shortversion %]
======================
[% IF MAJOR %]
(this list include all bugfixes since the previous major version. Most of them have already been fixed in maintainance release)
[% END %]
[% FOREACH bugfix IN bugfixes %]
[% bugfix.component %]
----------
[% FOREACH line IN bugfix.list %] [% line.number %] [% line.severity %] [% line.short_desc %]
[% END %][% END %][% END -%]

[% IF enhancements %]
Enhancements in [% shortversion %]
======================
[% FOREACH enhancement IN enhancements %]
[% enhancement.component %]
----------
[% FOREACH line IN enhancement.list %] [% line.number %] [% line.short_desc %][% IF line.description %]
[% line.description %][% END %]
[% END %][% END %][% END -%]

[% IF sysprefs %]
New sysprefs in [% shortversion %]
======================
@@ -68,8 +78,8 @@ System requirements
Documentation
======================

As of Koha 3.2, the Koha manual is now maintained in DocBook. The
home page for Koha documentation is
The Koha manual is maintained in DocBook.The home page for Koha
documentation is

http://koha-community.org/documentation/

@@ -170,4 +180,5 @@ tracker at


Ehara taku toa i te toa takitahi, engari he toa takitini
My strength is not that of a single warrior but that of many
[% timestamp %]

+ 32
- 20
release_notes_tmpl_html.tt View File

@@ -6,41 +6,53 @@

<p>Installation instructions can be found at <a href="http://wiki.koha-community.org/wiki/Installation_Documentation">http://wiki.koha-community.org/wiki/Installation_Documentation</a> or in the INSTALL files that come in the tarball</p>

[% IF MAJOR %]
Koha [% shortversion %] is a major release, that comes with many new features and enhancement of previously existing features.
[% ELSE %]
Koha [% shortversion %] is a bugfix/maintenance release.
[% END %]

[% IF highlights %]
[% FOREACH highlight IN highlights %]
<h3>[% highlight.component %]</h3>
[% IF enhancements %]
<h3>Enhancements and new features in [% shortversion %]</h3>
[% FOREACH enhancement IN enhancements %]
<h4>[% enhancement.component %]</h4>
<ul>
[% FOREACH line IN highlight.list %]<li> [% line.number %] [% line.severity %] [% line.short_desc %]</li>
[% FOREACH line IN enhancement.list %]<li>[% line.short_desc %] <i>(bug #[% line.number %])</i></li>
<ul><p>[% line.description %]</p></ul>
[% END %]
</ul>
[% END %][% END %]

[% IF bugfixes %]
<h3>Bugs fixed in [% shortversion %]</h3>
[% FOREACH bugfix IN bugfixes %]
<h4>[% bugfix.component %]</h4>

[% IF highlights %]
<h3>Critical bugs fixed in Koha [% shortversion %]</h3>
[% IF MAJOR %]
<p>(this list include all bugfixes since the previous major version. Most of them have already been fixed in maintainance release)</p>
[% END %]
[% FOREACH highlight IN highlights %]
<h4>[% highlight.component %]</h4>
<ul>
[% FOREACH line IN bugfix.list %]<li>[% line.number %] [% line.severity %] [% line.short_desc %]</li>
[% FOREACH line IN highlight.list %]<li>[% line.short_desc %] <i>([% line.severity %] - [% line.number %])</i></li>
[% END %]
</ul>
[% END %][% END %]

[% IF enhancements %]
<h3>Enhancements in [% shortversion %]</h3>
[% FOREACH enhancement IN enhancements %]
<h4>[% enhancement.component %]</h4>
[% IF bugfixes %]
<h3>Other bugs fixed in Koha [% shortversion %]</h3>
[% IF MAJOR %]
<p>(this list include all bugfixes since the previous major version. Most of them have already been fixed in maintainance release)</p>
[% END %]

[% FOREACH bugfix IN bugfixes %]
<h4>[% bugfix.component %]</h4>
<ul>
[% FOREACH line IN enhancement.list %]<li>[% line.number %] [% line.short_desc %]</li>
<ul><p>[% line.description %]</p></ul>
[% FOREACH line IN bugfix.list %]<li>[% line.short_desc %]<i>([% line.severity %]- [% line.number %])</i></li>
[% END %]
</ul>
[% END %][% END %]


[%- IF sysprefs %]
<h3>New sysprefs in [% shortversion %]</h3>
<h3>New system preferences in Koha [% shortversion %]</h3>
<ul>
[% FOREACH syspref IN sysprefs %]
<li>[% syspref.name %]</li>
@@ -58,7 +70,7 @@ Koha [% shortversion %] is a bugfix/maintenance release.

<h3>Documentation</h3>

<p>As of Koha 3.2, the Koha manual is now maintained in DocBook. The home page for Koha documentation is <a href="http://koha-community.org/documentation/">http://koha-community.org/documentation</a></p>
<p>The Koha manual is maintained in DocBook. The home page for Koha documentation is <a href="http://koha-community.org/documentation/">http://koha-community.org/documentation</a></p>
<p>As of the date of these release notes, only the English version of the Koha manual is available at <a href="http://manual.koha-community.org/[% line %]/en/">http://manual.koha-community.org/[% shortversion %]/en/</a></p>
<p>The Git repository for the Koha manual can be found at <a href="http://git.koha-community.org/gitweb/?p=kohadocs.git;a=summary">http://git.koha-community.org/gitweb/?p=kohadocs.git;a=summary</a></p>

@@ -137,7 +149,7 @@ The release team for Koha [% shortversion %] is

<h3>Bugs and feature requests</h3>

<p>Bug reports and feature requests can be filed at the Koha bugi tracker at <a href="http://bugs.koha-community.org/">http://bugs.koha-community.org</a></p>
<p>Bug reports and feature requests can be filed at the Koha bug tracker at <a href="http://bugs.koha-community.org/">http://bugs.koha-community.org</a></p>

<p>Ehara taku toa i te toa takitahi, engari he toa takitini </p>
<p>Ehara taku toa i te toa takitahi, engari he toa takitini (My strength is not that of a single warrior but that of many) </p>
[% timestamp %]

Loading…
Cancel
Save