Index: openacs-4/packages/acs-lang/acs-lang.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/acs-lang.info,v diff -u -N -r1.49.2.7 -r1.49.2.8 --- openacs-4/packages/acs-lang/acs-lang.info 6 Apr 2008 22:39:14 -0000 1.49.2.7 +++ openacs-4/packages/acs-lang/acs-lang.info 18 Apr 2008 06:51:05 -0000 1.49.2.8 @@ -16,11 +16,7 @@ 3 Internationalization and localization support routines and admin UI for manipulating Locales, request processor hooks, templating, accessing and managing the message catalog, and -locale-specific formatting functions for localizing dates, times, monetary amounts etc. -package changed by Quest so that messages in database are not overwritten by default. -Also fixed message::register, so that no messages with wrong package key can be added. -Added the possibility to unregister messages. - +locale-specific formatting functions for localizing dates, times, monetary amounts etc. @@ -30,7 +26,6 @@ - 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 -N -r1.46 -r1.46.2.1 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 18 Nov 2007 21:27:10 -0000 1.46 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 18 Apr 2008 06:51:05 -0000 1.46.2.1 @@ -534,7 +534,6 @@ } ad_proc -private lang::catalog::import_from_file { - {-keeplocal_p ""} file_path } {

@@ -551,8 +550,6 @@ 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 @@ -598,8 +595,7 @@ array set message_count [lang::catalog::import_messages \ -file_messages_list [array get messages_array] \ -package_key $package_key \ - -locale $locale \ - -keeplocal_p $keeplocal_p] + -locale $locale] # Register descriptions foreach message_key $messages_array_names { @@ -623,7 +619,6 @@ {-file_messages_list:required} {-package_key:required} {-locale:required} - {-keeplocal_p ""} } {

Import a given set of messages from a catalog file to the database @@ -700,22 +695,11 @@ 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. @@ -726,18 +710,6 @@ @author Peter Marklund @author Lars Pind } { - - # package parameter or argument -keeplocal_p - if {![string length $keeplocal_p]} { - set keeplocal_p [parameter::get_from_package_key -package_key "acs-lang" -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 @@ -845,24 +817,14 @@ update { # case 12 set import_case 12 - - if {! $keeplocal_p} { - # update db with file message - set upgrade_status "updated" - } else { - set conflict_p "t" - } + # update db with file message + set upgrade_status "updated" } delete { # case 7 set import_case 7 - - if {! $keeplocal_p} { - # mark message in db deleted - set upgrade_status "deleted" - } else { - set conflict_p "t" - } + # mark message in db deleted + set upgrade_status "deleted" } } } @@ -873,10 +835,8 @@ if { $db_messages($message_key) ne $file_messages($message_key) } { # case 8 set import_case 8 - if {! $keeplocal_p} { - # differing additions in db and file - set upgrade_status "updated" - } + # differing additions in db and file + set upgrade_status "updated" set conflict_p "t" } } @@ -889,22 +849,16 @@ if { $db_messages($message_key) ne $file_messages($message_key) } { # case 14 set import_case 14 - - if {! $keeplocal_p} { - # differing updates in file and db - set upgrade_status "updated" - } + # differing updates in file and db + set upgrade_status "updated" set conflict_p "t" } } delete { # case 6 set import_case 6 - - if {! $keeplocal_p} { - # deletion in file but update in db - set upgrade_status "deleted" - } + # deletion in file but update in db + set upgrade_status "deleted" set conflict_p "t" } } @@ -915,11 +869,8 @@ update { # case 4 set import_case 4 - - if {! $keeplocal_p} { - # deletion in db but update in file - set upgrade_status "added" ;# resurrect - } + # deletion in db but update in file + set upgrade_status "added" ;# resurrect set conflict_p "t" } delete { @@ -1010,7 +961,6 @@ ad_proc -public lang::catalog::import { {-package_key {}} {-locales {}} - {-keeplocal_p ""} {-initialize:boolean} {-cache:boolean} } { @@ -1021,7 +971,6 @@ @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 @@ -1049,13 +998,6 @@ 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 @@ -1080,7 +1022,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 -keeplocal_p $keeplocal_p $file_path] } errMsg] } { + if { [catch { array set loop_message_count [lang::catalog::import_from_file $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 -N -r1.49.2.2 -r1.49.2.3 --- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 7 Mar 2008 08:25:45 -0000 1.49.2.2 +++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 18 Apr 2008 06:51:05 -0000 1.49.2.3 @@ -78,13 +78,6 @@ 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 -N -r1.22 -r1.22.2.1 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 29 Aug 2007 14:16:58 -0000 1.22 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 18 Apr 2008 06:51:05 -0000 1.22.2.1 @@ -231,136 +231,86 @@ ad_proc -private lc_monetary { { -label_p 0 } { -style local } - { -truncate_p "t"} num locale {forced_frac_digits ""} {forced_currency_symbol ""} } { - 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_p Specify this switch if you want to specify the label used for the currency. + Formats a monetary amount. + + @param label 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 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. + @param currency ISO currency code. + @param locale Locale used for formatting the number. @return Formatted monetary amount } { - 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 + if {$forced_frac_digits ne "" && [string is integer $forced_frac_digits]} { + set dig $forced_frac_digits } else { - #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 + # 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"] + } + } - 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"] - } - } + # 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] - # figure out if negative - if {$num < 0} { - set num [expr abs($num)] - set neg 1 - } else { - set neg 0 - } + # 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 + } - # 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] - } + # 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 + # 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 -N -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-lang/www/admin/export-messages.adp 13 Aug 2007 11:13:46 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/export-messages.adp 18 Apr 2008 06:51:05 -0000 1.4.2.1 @@ -1,37 +1,32 @@ - - @page_title;noquote@ - -
-Export results for - - all packages - - -package @package_key@ - -and - - all locales - - -locale @locale@ -. - -
-
-

- - Export complete. -

- - -

- Catalog files are stored in the directory @catalog_dir@. -

- - -


-

- + + @page_title;noquote@ + +Export results for + + all packages + + +package @package_key@ + +and + + all locales + + +locale @locale@ +. + +

+ Export complete. +

+ + +

+ Catalog files are stored in the directory @catalog_dir@. +

+ + + + Index: openacs-4/packages/acs-lang/www/admin/import-messages.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.adp,v diff -u -N -r1.6 -r1.6.2.1 --- openacs-4/packages/acs-lang/www/admin/import-messages.adp 13 Aug 2007 12:30:42 -0000 1.6 +++ openacs-4/packages/acs-lang/www/admin/import-messages.adp 18 Apr 2008 06:51:05 -0000 1.6.2.1 @@ -1,12 +1,5 @@ @page_title;noquote@ -
- -

Please confirm that you want to overwrite the message catalog and lose your local changes: Yes, that is what I want!

-


-

No, go back!

- - Import results for @@ -22,10 +15,9 @@ locale @locale@ . -
-
+

- Import finished. Number of messages processed: @message_count.processed@, added: @message_count.added@, updated: @message_count.updated@, + Import finished. Number of messages processed: @message_count.processed@, added: @message_count.added@, updated: @message_count.updated@, deleted: @message_count.deleted@.

@@ -47,8 +39,7 @@ There are currently no conflicts in the database. -


+

- \ No newline at end of file Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v diff -u -N -r1.6 -r1.6.2.1 --- openacs-4/packages/acs-lang/www/admin/import-messages.tcl 13 Aug 2007 12:30:42 -0000 1.6 +++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl 18 Apr 2008 06:51:05 -0000 1.6.2.1 @@ -5,8 +5,6 @@ } { {locale ""} {package_key ""} - {keeplocal_p ""} - {confirmed_p ""} {return_url "/acs-lang/admin"} } @@ -17,26 +15,9 @@ ad_script_abort } -set confirm_url {} -if {[string length $keeplocal_p]} { - if {[string is true $keeplocal_p]} { - append page_title " (keep local changes)" - } else { - append page_title " (overwrite local changes)" - if {[string length $confirmed_p]} { - set confirmed_p 1 - } else { - set confirmed_p 0 - set confirm_url [export_vars -base [ad_conn url] { locale package_key keeplocal_p confirmed_p return_url}] - return - } - } -} - array set message_count [lang::catalog::import \ -package_key $package_key \ - -locales $locale \ - -keeplocal_p $keeplocal_p ] + -locales $locale] set conflict_count [lang::message::conflict_count \ -package_key $package_key \ Index: openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl,v diff -u -N -r1.10 -r1.10.2.1 --- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 13 Aug 2007 11:13:46 -0000 1.10 +++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 18 Apr 2008 06:51:05 -0000 1.10.2.1 @@ -5,59 +5,43 @@ @author Bruno Mattarollo @author Christian Hvid - @author Christian Eva ( Error-handling, return / loop / cancel @creation-date 15 April 2002 @cvs-id $Id$ } { locale package_key {message_key ""} - {return_url {}} + {return_url {[export_vars -base message-list { locale package_key }]}} } -# cjeva: changed the way the return va is handled, so that it can be called from -# other parts of oacs and return there. So if it is called with a message-key, it will -# not display the two buttons. - -set default_return [export_vars -base message-list { locale package_key }] - # We rename to avoid conflict in queries set current_locale $locale set default_locale en_US -set locale_label [ad_locale_get_label $current_locale] -set default_locale_label [ad_locale_get_label $default_locale] +set locale_label [lang::util::get_label $current_locale] +set default_locale_label [lang::util::get_label $default_locale] set page_title "Create New Message" set context [list [list "package-list?[export_vars { locale }]" $locale_label] \ [list "message-list?[export_vars { locale package_key show }]" $package_key] \ $page_title] -set next_url [export_vars -base [ad_conn url] { locale package_key return_url}] + # We check that this request is coming for the system wide default # locale. If not, we can't allow the creation of a new localized # message. -if { ![string equal $current_locale $default_locale] } { +if { $current_locale ne $default_locale } { ad_return_error "Can only create messages in the default locale" "Can only create messages in the default locale" ad_script_abort } -set Lbutt [list [list Insert ok]] +form create message_new -if {![string length $return_url]} { - lappend Lbutt [list Return cancel] -} else { - set next_url $return_url -} - -form create message_new \ - -edit_buttons $Lbutt - element create message_new package_key_display -label "Package" -datatype text \ -widget inform -value $package_key @@ -74,14 +58,13 @@ # processing of the form element create message_new locale -label "locale" -datatype text -widget hidden -set focus message_new.message_key if { [form is_request message_new] } { element set_value message_new package_key $package_key element set_value message_new locale $current_locale element set_value message_new message_key $message_key element set_value message_new return_url $return_url - if { [empty_string_p $message_key] } { + if { $message_key eq "" } { set focus message_new.message_key } else { set focus message_new.message @@ -92,17 +75,6 @@ # We are not getting a request, so it's a post. Get and validate # the values - set button [form get_button message_new] - if {[string match cancel $button]} { - # go back - if {![string length $return_url]} { - - set return_url $default_return - } - ad_returnredirect $return_url - ad_script_abort - } - form get_values message_new # We have to check the format of the key submitted by the user, @@ -131,16 +103,14 @@ # We use the acs-lang registration of a translation. Simple, eh? - set err [catch {lang::message::register $locale $package_key $message_key $message} err_mess] - if { $err } { - util_user_message -message $err_mess - element set_error message_new package_key_display \ - $err_mess - } else { - - set escaped_locale [ns_urlencode $locale] + lang::message::register $locale $package_key $message_key $message - ##forward $return_url - forward $next_url - } + set escaped_locale [ns_urlencode $locale] + + forward $return_url + } + +set focus "" + +ad_return_template \ No newline at end of file Index: openacs-4/packages/acs-lang/www/admin/message-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-delete.adp,v diff -u -N -r1.3 -r1.3.2.1 --- openacs-4/packages/acs-lang/www/admin/message-delete.adp 13 Aug 2007 11:13:46 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/message-delete.adp 18 Apr 2008 06:51:05 -0000 1.3.2.1 @@ -1,28 +1,14 @@ - - @page_title@ - @context;noquote@ - -

-
-

- Deleting message for key @package_key@.@message_key@ in locale @locale@. -

-
- -

- - If you confirm with "Confirm unregister", then the message @package_key@.@message_key@ - is completely removed from all locales. - -

- -

-
- -

- @form_export_vars;noquote@ - - - - -
+ + @page_title@ + @context;noquote@ + +

+ +

+ Deleting message for key @package_key@.@message_key@ in locale @locale@. +

+ +
+@form_export_vars;noquote@ + +
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 -N -r1.4 -r1.4.2.1 --- openacs-4/packages/acs-lang/www/admin/message-delete.tcl 13 Aug 2007 11:13:46 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl 18 Apr 2008 06:51:05 -0000 1.4.2.1 @@ -13,10 +13,6 @@ message_key show:optional confirm_p:optional - unregister_p:optional - {subm_delete {}} - {subm_unreg {}} - {return_url {}} } @@ -32,30 +28,15 @@ [list "message-list?[export_vars { locale package_key show }]" $package_key] \ $page_title] -# 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}] +set form_export_vars [export_vars -form { locale package_key message_key show {confirm_p 1} }] + if { [exists_and_not_null confirm_p] && [template::util::is_true $confirm_p] } { - # check if we delete or unregister - - if {[string length $subm_delete]} { - lang::message::delete \ - -package_key $package_key \ - -message_key $message_key \ - -locale $locale - } + lang::message::delete \ + -package_key $package_key \ + -message_key $message_key \ + -locale $locale - 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_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 -N -r1.5 -r1.5.2.1 --- openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql 13 Aug 2007 11:13:46 -0000 1.5 +++ openacs-4/packages/acs-lang/www/admin/message-list-oracle.xql 18 Apr 2008 06:51:06 -0000 1.5.2.1 @@ -22,6 +22,7 @@ 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 -N -r1.11.2.1 -r1.11.2.2 --- openacs-4/packages/acs-lang/www/admin/message-list.adp 3 Apr 2008 12:27:24 -0000 1.11.2.1 +++ openacs-4/packages/acs-lang/www/admin/message-list.adp 18 Apr 2008 06:51:06 -0000 1.11.2.2 @@ -1,109 +1,91 @@ - - @page_title@ - @context;noquote@ - -
- - @form_vars;noquote@ - - - - - - - - -
Language
- -
- -

- Show: - - | - @show_opts.label@ (@show_opts.count@) - @show_opts.label@ (@show_opts.count@) - -

- - - - -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
Message Key@default_locale_label@ Message@locale_label@ Message
- - - @messages.message_key_pretty@ - @messages.default_message@ - - DELETED (@messages.translated_message@) - - - @messages.translated_message@ - Not translated - - - -
-
- + + @page_title@ + @context;noquote@ +
+ + + + + @form_vars;noquote@ + + +
Language
+ +
+ +

+ Show: + + | + @show_opts.label@ (@show_opts.count@) + @show_opts.label@ (@show_opts.count@) + +

+ + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Message Key@default_locale_label@ Message@locale_label@ Message
+ + + @messages.message_key_pretty@ + @messages.default_message@ + + DELETED (@messages.translated_message@) + + + @messages.translated_message@ + Not translated + + + +
+
+ Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v diff -u -N -r1.13 -r1.13.2.1 --- openacs-4/packages/acs-lang/www/admin/message-list.tcl 13 Aug 2007 11:13:46 -0000 1.13 +++ openacs-4/packages/acs-lang/www/admin/message-list.tcl 18 Apr 2008 06:51:06 -0000 1.13.2.1 @@ -32,36 +32,16 @@ set site_wide_admin_p [acs_user::site_wide_admin_p] -set return_url [export_vars -base [ad_conn url] {locale package_key}] +set export_messages_url [export_vars -base "export-messages" { package_key locale { return_url {[ad_return_url]} } }] +set import_messages_url [export_vars -base "import-messages" { package_key locale { return_url {[ad_return_url]} } }] -set export_messages_url [export_vars -base "export-messages" { package_key locale return_url }] - -set keeplocal_p [parameter::get -parameter KeepLocalTranslations -default ""] -set import_messages_url [export_vars -base "import-messages" { package_key locale keeplocal_p return_url }] - -if {[string length $keeplocal_p]} { - # we have the parameter, turn to opposite for the special url - if {[string is true $keeplocal_p]} { - set keeplocal_p 0 - set import_messages_normal_text "Keep local changes" - set import_messages_special_text "Discard local changes" - } else { - set keeplocal_p 1 - set import_messages_normal_text "Discard local changes" - set import_messages_special_text "Keep local changes" - } - set import_messages_special_url [export_vars -base "import-messages" { package_key locale keeplocal_p { return_url {[ad_return_url]} } }] -} - # We let you create new messages keys if you're in the default locale set create_p [string equal $current_locale $default_locale] -set new_message_url "[export_vars -base localized-message-new { locale package_key }]" +set new_message_url "localized-message-new?[export_vars { locale package_key }]" -set package_list_url "[export_vars -base package-list { locale }]" - ##### # # Counting messages Index: openacs-4/packages/acs-lang/www/admin/package-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v diff -u -N -r1.7 -r1.7.2.1 --- openacs-4/packages/acs-lang/www/admin/package-list.adp 13 Aug 2007 11:13:46 -0000 1.7 +++ openacs-4/packages/acs-lang/www/admin/package-list.adp 18 Apr 2008 06:51:06 -0000 1.7.2.1 @@ -10,15 +10,8 @@ Index: openacs-4/packages/acs-lang/www/admin/package-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.tcl,v diff -u -N -r1.8 -r1.8.2.1 --- openacs-4/packages/acs-lang/www/admin/package-list.tcl 13 Aug 2007 11:13:46 -0000 1.8 +++ openacs-4/packages/acs-lang/www/admin/package-list.tcl 18 Apr 2008 06:51:06 -0000 1.8.2.1 @@ -31,30 +31,9 @@ set locale_enabled_p [expr [lsearch [lang::system::get_locales] $current_locale] != -1] set site_wide_admin_p [acs_user::site_wide_admin_p] -set import_all_url [export_vars -base import-messages { { locale $current_locale } {return_url {[ad_return_url]}} }] -set export_all_url [export_vars -base export-messages { { locale $current_locale } {return_url {[ad_return_url]}} }] -set keeplocal_p [parameter::get -parameter KeepLocalTranslations -default ""] -##qst::Debug "keeplocal_p=$keeplocal_p" ==1== -set import_all_url [export_vars -base "import-messages" { keeplocal_p {locale $current_locale} {return_url {[ad_return_url]}} }] -if {[string length $keeplocal_p]} { - # we have the parameter, turn to opposite for the special url - if {[string is true $keeplocal_p]} { - set keeplocal_p 0 - set import_all_normal_text "Keep local changes" - set import_all_special_text "Discard local changes" - } else { - set keeplocal_p 1 - set import_all_normal_text "Discard local changes" - set import_all_special_text "Keep local changes" - } - set import_all_special_url [export_vars -base "import-messages" { keeplocal_p {locale $current_locale} {return_url {[ad_return_url]}} }] -} else { - set import_all_special_url {} -} - ##### # # Package/message list @@ -134,3 +113,6 @@ } } + +set import_all_url [export_vars -base import-messages { { locale $current_locale } {return_url {[ad_return_url]}} }] +set export_all_url [export_vars -base export-messages { { locale $current_locale } {return_url {[ad_return_url]}} }]