@@ -561,6 +562,8 @@ with what's in the database).
+ @param keeplocal Overwrites the package parameter to keep local changes regardless what happened in the + catalog file. @param file_path The absolute path of the XML file to import messages from. The path must be on valid format, see apm_is_catalog_file @@ -606,7 +609,8 @@ array set message_count [lang::catalog::import_messages \ -file_messages_list [array get messages_array] \ -package_key $package_key \ - -locale $locale] + -locale $locale \ + -keeplocal_p $keeplocal_p] # Register descriptions foreach message_key $messages_array_names { @@ -630,6 +634,7 @@ {-file_messages_list:required} {-package_key:required} {-locale:required} + {-keeplocal_p ""} } {Import a given set of messages from a catalog file to the database @@ -706,11 +711,22 @@ 14. All different. upgrade_action=update, conflict_p=t +
+ Introduction of a package parameter 'KeepLocalTranslations'. + If this parameter is set then we change the behaviour of the + following cases to upgrade_action=none: 4, 6, 7, 8, 12, 14. + A conflict is raised in this case. + + The parameter -keeplocal_p overwrites this package paramter if set. +
+ @param file_messages_list An array list with message keys as keys and the message of those keys as values, i.e. (key, value, key, value, ...) @param package_key The package_key for the messages. + + @param keeplocal_p Overwrites the package parameter if set @param locale The locale of the messages. @@ -721,6 +737,18 @@ @author Peter Marklund @author Lars Pind } { + + # package parameter or argument -keeplocal_p + if {![string length $keeplocal_p]} { + set keeplocal_p [parameter::get -parameter KeepLocalTranslations -default 1] + } + + if { [string is true $keeplocal_p] } { + ns_log Notice "Keep Local Changes while updating catalog for $package_key/$locale (keeplocal_p=$keeplocal_p)" + } else { + ns_log Notice "Overwrite Changes while updating catalog for $package_key/$locale (keeplocal_p=$keeplocal_p)" + } + set message_count(processed) 0 set message_count(added) 0 set message_count(updated) 0 @@ -828,14 +856,24 @@ update { # case 12 set import_case 12 - # update db with file message - set upgrade_status "updated" + + if {! $keeplocal_p} { + # update db with file message + set upgrade_status "updated" + } else { + set conflict_p "t" + } } delete { # case 7 set import_case 7 - # mark message in db deleted - set upgrade_status "deleted" + + if {! $keeplocal_p} { + # mark message in db deleted + set upgrade_status "deleted" + } else { + set conflict_p "t" + } } } } @@ -846,8 +884,10 @@ if { $db_messages($message_key) ne $file_messages($message_key) } { # case 8 set import_case 8 - # differing additions in db and file - set upgrade_status "updated" + if {! $keeplocal_p} { + # differing additions in db and file + set upgrade_status "updated" + } set conflict_p "t" } } @@ -860,16 +900,22 @@ if { $db_messages($message_key) ne $file_messages($message_key) } { # case 14 set import_case 14 - # differing updates in file and db - set upgrade_status "updated" + + if {! $keeplocal_p} { + # differing updates in file and db + set upgrade_status "updated" + } set conflict_p "t" } } delete { # case 6 set import_case 6 - # deletion in file but update in db - set upgrade_status "deleted" + + if {! $keeplocal_p} + # deletion in file but update in db + set upgrade_status "deleted" + } set conflict_p "t" } } @@ -880,8 +926,11 @@ update { # case 4 set import_case 4 - # deletion in db but update in file - set upgrade_status "added" ;# resurrect + + if {! $keeplocal_p} { + # deletion in db but update in file + set upgrade_status "added" ;# resurrect + } set conflict_p "t" } delete { @@ -972,6 +1021,7 @@ ad_proc -public lang::catalog::import { {-package_key {}} {-locales {}} + {-keeplocal_p {}} {-initialize:boolean} {-cache:boolean} } { @@ -982,6 +1032,7 @@ @param package_key Restrict the import to the package with this key @param locales A list of locales to restrict the import to + @param keeplocal_p Overwrites the package parameter if set @param initialize Only load messages from packages that have never before had any message imported @param cache Provide this switch if you want the proc to cache all the imported messages @@ -1033,7 +1084,7 @@ foreach file_path $catalog_files { # Use a catch so that parse failure of one file doesn't cause the import of all files to fail array unset loop_message_count - if { [catch { array set loop_message_count [lang::catalog::import_from_file $file_path] } errMsg] } { + if { [catch { array set loop_message_count [lang::catalog::import_from_file -keeplocal_p $keeplocal_p $file_path] } errMsg] } { global errorInfo ns_log Error "The import of file $file_path failed, error message is:\n\n${errMsg}\n\nstack trace:\n\n$errorInfo\n\n" Index: openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl,v diff -u -r1.48 -r1.49 --- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 10 Jan 2007 21:22:04 -0000 1.48 +++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 13 Aug 2007 11:13:45 -0000 1.49 @@ -78,6 +78,13 @@ set locale [lang::util::default_locale_from_lang $locale] } + # check for a valid package_key, or we end up with zombie-packages + if {![apm_package_installed_p_not_cached $package_key]} { + set error_message "lang::message::register - refusing to register message. The package key in ${package_key}.${message_key} is invalid!" + ns_log Error $error_message + error $error_message + } + # Create a globally (across packages) unique key for the cache set key "${package_key}.${message_key}" 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.20 -r1.21 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 10 Jan 2007 21:22:04 -0000 1.20 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 13 Aug 2007 11:13:45 -0000 1.21 @@ -231,86 +231,138 @@ ad_proc -private lc_monetary { { -label_p 0 } { -style local } + { -truncate_p "t"} num locale {forced_frac_digits ""} {forced_currency_symbol ""} } { - Formats a monetary amount. + Returns the monetary amount formatted with (optional) currency symbol, decimal character and group separator. + Accepts as input a number num and the user's locale. Returns the number formatted as money with (optional) currency + symbol, decimal character and group separator based on the locale. It uses message keys to control these symbols - + the message keys are stored in the acs-lang catalog files. We should call lc_monetary with label_p set to "t", as we + want to display the currency symbol. We can override the locale's currency symbol by setting forced_currency_symbol + to whatever symbol we want to display (but should rarely need to do this). + + By default, lc_monetary will truncate (round down) to the number of decimal places given by the + acs-lang.localization-trunc_decimal_places message key for the locale. This truncating behaviour can be changed to + instead round up by passing in to lc_monetary the value "f" for truncate_p. The lc_monetary proc will then round up + to the value of the acs-lang frac_digits message key for the locale (the value of which in turn can be over-ridden by + passing forced_frac_digits to lc_monetary). If truncate_p is true, forced_frac_digits will be ignored. + + - @param label Specify this switch if you want to specify the label used for the currency. + + @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 flag to take effect. @param num Number to format as a monetary amount. If this number could be negative you should put "--" in your call before it. - @param currency ISO currency code. - @param locale Locale used for formatting the number. + @param locale Locale used for formatting the number - this uses the acs-lang message keys. + @param forced_frac_digits Pass this in to override the acs-lang frac_digits or int_frac_digits. If truncate_p is true, forced_frac_digits will be ignored. + @param forced_currency_symbol Pass this in to override the acs-lang int_curr_symbol or currency_symbol. + @param truncate_p Pass this in if you want to to truncate (round down) to a number of decimal places. The number of + decimal places is determined by the acs-lang.localization-trunc_decimal_places message key, and should be a positive integer. For AIMS + we default this to true. @return Formatted monetary amount } { - if {$forced_frac_digits ne "" && [string is integer $forced_frac_digits]} { - set dig $forced_frac_digits + if {$num eq ""} { + #if they enter empty string, return empty string + #pages like payments end up getting 0.00 in empty cells otherwise + return $num } else { - # look up the digits - if {$style eq "int" } { - set dig [lc_get -locale $locale "int_frac_digits"] - } else { - set dig [lc_get -locale $locale "frac_digits"] - } - } + #first escape the locale's decimal character (dec) if it's in the list of chars that need to be escaped in regular expressions + set dec [lc_get -locale $locale "mon_decimal_point"] + set esc_dec $dec + set special_chars {[\^$.|?*+()} + if {[regexp $dec $special_chars]} {set esc_dec "\\$dec"} + #need to strip all non-numerics except the locale's decimal character + if {![regexp {^\-?[0-9]+$} $num]} { + regexp {^(\-?)(.*)} $num "" negg numm + regsub -all "\[^0-9$esc_dec\]" $numm "" numm + set num "" + append num $negg $numm + } + #replace the locale's decimal character with the database's decimal character (assuming for now that it's ".") + regsub -all "$esc_dec" $num "." num - # figure out if negative - if {$num < 0} { - set num [expr {abs($num)}] - set neg 1 - } else { - set neg 0 - } - - # generate formatted number - set out [format "%.${dig}f" $num] + if {![empty_string_p $forced_frac_digits] && [string is integer $forced_frac_digits]} { + set dig $forced_frac_digits + } else { + # look up the digits + if {[string compare $style int] == 0} { + set dig [lc_get -locale $locale "int_frac_digits"] + } else { + set dig [lc_get -locale $locale "frac_digits"] + } + } - # look up the label if needed - if {$forced_currency_symbol eq ""} { - if {$label_p} { - if {$style eq "int" } { - set sym [lc_get -locale $locale "int_curr_symbol"] - } else { - set sym [lc_get -locale $locale "currency_symbol"] - } - } else { - set sym {} - } - } else { - set sym $forced_currency_symbol - } + # figure out if negative + if {$num < 0} { + set num [expr abs($num)] + set neg 1 + } else { + set neg 0 + } - # signorama - if {$neg} { - set cs_precedes [lc_get -locale $locale "n_cs_precedes"] - set sep_by_space [lc_get -locale $locale "n_sep_by_space"] - set sign_pos [lc_get -locale $locale "n_sign_posn"] - set sign [lc_get -locale $locale "negative_sign"] - } else { - set cs_precedes [lc_get -locale $locale "p_cs_precedes"] - set sep_by_space [lc_get -locale $locale "p_sep_by_space"] - set sign_pos [lc_get -locale $locale "p_sign_posn"] - set sign [lc_get -locale $locale "positive_sign"] - } - - # decimal seperator - set dec [lc_get -locale $locale "mon_decimal_point"] - regsub {\.} $out $dec out + # generate formatted number + # Check if we are truncating + if {$truncate_p} { + set trunc_decimal_places [lc_get -locale $locale "trunc_decimal_places"] + set truncated_num [expr [expr floor([expr $num * pow(10,$trunc_decimal_places)])]/pow(10,$trunc_decimal_places)] + set out [format "%.${trunc_decimal_places}f" $truncated_num] + } else { + set out [format "%.${dig}f" $num] + } - # commify - set sep [lc_get -locale $locale "mon_thousands_sep"] - set grouping [lc_get -locale $locale "mon_grouping"] - set num [lc_sepfmt $out $grouping $sep] - - return [subst [nsv_get locale "money:$cs_precedes$sign_pos$sep_by_space"]] -} + # look up the label if needed + if {[empty_string_p $forced_currency_symbol]} { + if {$label_p} { + if {[string compare $style int] == 0} { + set sym [lc_get -locale $locale "int_curr_symbol"] + } else { + set sym [lc_get -locale $locale "currency_symbol"] + } + } else { + set sym {} + } + } else { + set sym $forced_currency_symbol + } + + # signorama + if {$neg} { + set cs_precedes [lc_get -locale $locale "n_cs_precedes"] + set sep_by_space [lc_get -locale $locale "n_sep_by_space"] + set sign_pos [lc_get -locale $locale "n_sign_posn"] + set sign [lc_get -locale $locale "negative_sign"] + } else { + set cs_precedes [lc_get -locale $locale "p_cs_precedes"] + set sep_by_space [lc_get -locale $locale "p_sep_by_space"] + set sign_pos [lc_get -locale $locale "p_sign_posn"] + set sign [lc_get -locale $locale "positive_sign"] + } + + # change decimal seperator back from dot to locales version + regsub {\.} $out $dec out + + # commify + set sep [lc_get -locale $locale "mon_thousands_sep"] + if {[ad_var_type_check_number_p $sep]} { + # The separator is a number. This is bad as it will bring bogus results and crash the server + set sep "," + } + + set grouping [lc_get -locale $locale "mon_grouping"] + set num [lc_sepfmt $out $grouping $sep] + + return [subst [nsv_get locale "money:$cs_precedes$sign_pos$sep_by_space"]] + } +} + ad_proc -public clock_to_ansi { seconds } { Index: openacs-4/packages/acs-lang/www/admin/export-messages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/export-messages.adp 30 Jan 2004 14:53:06 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/export-messages.adp 13 Aug 2007 11:13:46 -0000 1.4 @@ -1,32 +1,37 @@ -- Export complete. -
- -- Catalog files are stored in the directory @catalog_dir@. -
--
-
- Return -
+Export results for +
+
+
+ + Export complete. +
+ ++ Catalog files are stored in the directory @catalog_dir@. +
++
-
+
- Return +
+
Please confirm that you want to overwrite the message catalog and lose your local changes: Yes, that is what I want!
++
Import finished. Number of messages processed: @message_count.processed@, added: @message_count.added@, updated: @message_count.updated@,
deleted: @message_count.deleted@.
@@ -39,7 +47,8 @@
+
- Deleting message for key @package_key@.@message_key@ in locale @locale@. -
- - ++
+ Deleting message for key @package_key@.@message_key@ in locale @locale@. +
++ +
+
+ + Index: openacs-4/packages/acs-lang/www/admin/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/message-delete.tcl 26 Feb 2005 16:00:10 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl 13 Aug 2007 11:13:46 -0000 1.4 @@ -13,6 +13,10 @@ message_key show:optional confirm_p:optional + unregister_p:optional + {subm_delete {}} + {subm_unreg {}} + {return_url {}} } @@ -28,15 +32,30 @@ [list "message-list?[export_vars { locale package_key show }]" $package_key] \ $page_title] -set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }] +# We let you unregister the messages key if you're in the default locale +set unregister_p [string equal $current_locale $default_locale] +set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} unregister_p return_url}] - if { [exists_and_not_null confirm_p] && [template::util::is_true $confirm_p] } { - lang::message::delete \ - -package_key $package_key \ - -message_key $message_key \ - -locale $locale + # check if we delete or unregister + + if {[string length $subm_delete]} { + lang::message::delete \ + -package_key $package_key \ + -message_key $message_key \ + -locale $locale + } - ad_returnredirect "message-list?[export_vars { locale package_key show }]" + if {[string length $subm_unreg]} { + lang::message::unregister \ + $package_key \ + $message_key + } + + if {[string length $return_url]} { + ad_returnredirect $return_url + } else { + ad_returnredirect "message-list?[export_vars { locale package_key show }]" + } ad_script_abort } Index: openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/message-list-oracle.xql,v diff -u -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql 26 Feb 2004 15:28:47 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql 13 Aug 2007 11:13:46 -0000 1.5 @@ -22,7 +22,6 @@ and lm2.locale (+) = :locale and lm2.message_key (+) = lmk.message_key and lm2.package_key (+) = lmk.package_key - and lm1.deleted_p = 'f' $where_clause order by upper(lm1.message_key), lm1.message_key Index: openacs-4/packages/acs-lang/www/admin/message-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-lang/www/admin/message-list.adp 3 Jul 2006 12:29:50 -0000 1.10 +++ openacs-4/packages/acs-lang/www/admin/message-list.adp 13 Aug 2007 11:13:46 -0000 1.11 @@ -1,91 +1,94 @@ -
-
-
-
-
-
-
-| Language | -|
- Show:
-
-
-
- Create new message -
- Batch edit these messages -
- Import messages for this package and locale from catalog files -
- Export messages for this package and locale to catalog files -
-
|
-
+ Show:
+
-
+
- Create new message +
- Batch edit these messages +
-
+
+ Import messages for this package and locale from catalog files: @import_messages_normal_text@ + | [@import_messages_special_text@] + ++ Import messages for this package and locale from catalog files + +
+ - Export messages for this package and locale to catalog files + +
- List all Packages in locale: @locale@ +
+
+
+
+
|
+