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 -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/admin/import-messages.tcl 26 Feb 2004 15:28:47 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl 13 Aug 2007 11:13:46 -0000 1.5 @@ -15,9 +15,26 @@ 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] + -locales $locale \ + -keeplocal_p $keeplocal_p ] set conflict_count [lang::message::conflict_count \ -package_key $package_key \