Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl,v diff -u -r1.44 -r1.45 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 13 Aug 2007 12:30:41 -0000 1.44 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 29 Aug 2007 14:16:56 -0000 1.45 @@ -740,7 +740,7 @@ # package parameter or argument -keeplocal_p if {![string length $keeplocal_p]} { - set keeplocal_p [parameter::get -parameter KeepLocalTranslations -default 1] + set keeplocal_p [parameter::get_from_package_key -package_key "acs-lang" -parameter KeepLocalTranslations -default 1] } if { [string is true $keeplocal_p] } { @@ -1021,7 +1021,7 @@ ad_proc -public lang::catalog::import { {-package_key {}} {-locales {}} - {-keeplocal_p {}} + {-keeplocal_p ""} {-initialize:boolean} {-cache:boolean} } { @@ -1060,6 +1060,13 @@ set uninitialized_packages [uninitialized_packages] } + # package parameter or argument -keeplocal_p + if {$keeplocal_p eq ""} { + set keeplocal_p [parameter::get_from_package_key -package_key "acs-lang" -parameter KeepLocalTranslations -default 1] + } + + ns_log Notice "KEEPLOCAL:: $keeplocal_p" + foreach package_key $package_key_list { if {$initialize_p && [lsearch -exact $uninitialized_packages $package_key] == -1} { # The package is already initialized Index: openacs-4/packages/acs-lang/tcl/localization-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/localization-procs.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 13 Aug 2007 11:13:45 -0000 1.21 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 29 Aug 2007 14:16:58 -0000 1.22 @@ -251,8 +251,6 @@ passing forced_frac_digits to lc_monetary). If truncate_p is true, forced_frac_digits will be ignored. - - @param label_p Specify this switch if you want to specify the label used for the currency. @param style Set to int to display the ISO code as the currency label. Otherwise displays an HTML entity for the currency. The label parameter must be specified for this