@@ -, +, @@ http://schema.koha-community.org/master/tables/table.html http://schema.koha-community.org/16_11/tables/table.html http://schema.koha-community.org/16_05/tables/table.html http://schema.koha-community.org/tables/table.html --- Koha/Template/Plugin/Koha.pm | 1 + admin/preferences.pl | 9 +++++++++ .../prog/en/modules/admin/preferences/acquisitions.pref | 2 +- .../intranet-tmpl/prog/en/modules/admin/preferences/opac.pref | 6 +++--- .../intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref | 4 ++-- 5 files changed, 16 insertions(+), 6 deletions(-) --- a/Koha/Template/Plugin/Koha.pm +++ a/Koha/Template/Plugin/Koha.pm @@ -51,6 +51,7 @@ sub Version { return { major => $major, + minor => $minor, release => $major . "." . $minor, maintenance => $major . "." . $minor . "." . $maintenance, development => ( $development ne '000' ) ? $development : undef, --- a/admin/preferences.pl +++ a/admin/preferences.pl @@ -186,6 +186,15 @@ sub TransformPrefsToHTML { push @chunks, $piece; } } else { + if ( $piece ) { + my $version = Koha::version(); + my ( $major, $minor, $maintenance, $development ) = split( '\.', $version ); + if ( $minor % 2 ) { + $piece =~ s|__VERSION__|${major}_${minor}|g; + } else { + $piece =~ s|__VERSION__|master|g; + } + } push @chunks, { type_text => 1, contents => $piece }; } } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -9,7 +9,7 @@ Acquisitions: receiving: receiving an order. cataloguing: cataloging the record. - - - "The following database columns should be unique in an item:" + - "The following database columns should be unique in an item:" - pref: UniqueItemFields - (separated by a space) - --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -728,17 +728,17 @@ OPAC: class: integer - "days." - - - "The following database columns must be filled in on the patron entry screen:" + - "The following database columns must be filled in on the patron entry screen:" - pref: PatronSelfRegistrationBorrowerMandatoryField class: multi - (separate columns with |) - - - "The following database columns will not appear on the patron self-registration screen:" + - "The following database columns will not appear on the patron self-registration screen:" - pref: PatronSelfRegistrationBorrowerUnwantedField class: multi - (separate columns with |) - - - "The following database columns will not appear on the patron self-modification screen:" + - "The following database columns will not appear on the patron self-modification screen:" - pref: PatronSelfModificationBorrowerUnwantedField class: multi - (separate columns with |) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -24,12 +24,12 @@ Patrons: no: "Don't" - default the card number field on the patron addition screen to the next available card number (for example, if the largest currently used card number is 26345000012941, then this field will default to 26345000012942). - - - "The following database columns must be filled in on the patron entry screen:" + - "The following database columns must be filled in on the patron entry screen:" - pref: BorrowerMandatoryField class: multi - (separate columns with |) - - - "The following database columns will not appear on the patron entry screen:" + - "The following database columns will not appear on the patron entry screen:" - pref: BorrowerUnwantedField class: multi - (separate columns with |) --