Index: openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml,v
diff -u -r1.23 -r1.23.6.1
--- openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml 13 Jan 2010 00:34:46 -0000 1.23
+++ openacs-4/packages/acs-tcl/catalog/acs-tcl.en_US.ISO-8859-1.xml 16 Sep 2013 08:05:09 -0000 1.23.6.1
@@ -83,6 +83,7 @@
You must supply a value for %formal_name%
You specified a path to a file that is not allowed on the system.
You've supplied two values for '%formal_name%'
+ Deprecated
Immature
Maturity level is visible in the Installer and when browsing the repository
Index: openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl,v
diff -u -r1.108.2.4 -r1.108.2.5
--- openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 7 Sep 2013 08:37:59 -0000 1.108.2.4
+++ openacs-4/packages/acs-tcl/tcl/apm-install-procs.tcl 16 Sep 2013 08:05:09 -0000 1.108.2.5
@@ -2394,10 +2394,10 @@
ad_proc -private apm::package_version::attributes::validate_maturity { maturity } {
set error_message ""
if { $maturity ne "" } {
- if { ![regexp {^-?[0-9]+$} $maturity] } {
+ if { ![string is integer $maturity] } {
set error_message "Maturity must be integer"
- } elseif { $maturity < -1 || $maturity > 3 } {
- set error_message "Maturity must be integer between -1 and 3"
+ } elseif { $maturity < -1 || $maturity > 4 } {
+ set error_message "Maturity must be integer between -1 and 4"
}
}
@@ -2410,17 +2410,18 @@
@author Peter Marklund
} {
- if {[exists_and_not_null maturity]} {
+ if { $maturity ne "" } {
- if { !($maturity >= -1 && $maturity <= 3) } {
- error "Maturity must be between -1 and 3 but is \"$maturity\""
+ if { !($maturity >= -1 && $maturity <= 4) } {
+ error "Maturity must be between -1 and 4 but is \"$maturity\""
}
set maturity_key(-1) "#acs-tcl.maturity_incompatible#"
set maturity_key(0) "#acs-tcl.maturity_new_submission#"
set maturity_key(1) "#acs-tcl.maturity_immature#"
set maturity_key(2) "#acs-tcl.maturity_mature#"
set maturity_key(3) "#acs-tcl.maturity_mature_and_standard#"
+ set maturity_key(4) "#acs-tcl.maturity_deprecated#"
set result [lang::util::localize $maturity_key($maturity)]