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.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 \