Index: openacs-4/contrib/packages/vocabulary/lib/word-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/lib/word-list.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/vocabulary/lib/word-list.tcl 23 Feb 2004 23:00:06 -0000 1.1 +++ openacs-4/contrib/packages/vocabulary/lib/word-list.tcl 26 Feb 2005 16:00:09 -0000 1.2 @@ -21,7 +21,7 @@ vocab::conn set action [list "Add a word" [export_vars -base word-edit {return_url}] "Add a word"] set action [concat $action [list "Import word list" [export_vars -base word-list-add {return_url}] "Import a word list"]] -set locale_b_label [ad_locale_get_label $locale_b] +set locale_b_label [lang::util::get_label $locale_b] template::list::create \ -name words \ -multirow words \ Index: openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl 24 Feb 2004 13:58:50 -0000 1.2 +++ openacs-4/contrib/packages/vocabulary/tcl/util-procs.tcl 26 Feb 2005 16:00:09 -0000 1.3 @@ -91,14 +91,14 @@ } # since these are tamper_susceptible cookies, check them for bad data - if { [catch {set label_a [ad_locale_get_label $locale_a] } ] } { + if { [catch {set label_a [lang::util::get_label $locale_a] } ] } { set locale_a [lang::user::locale] - set label_a [ad_locale_get_label $locale_a ] + set label_a [lang::util::get_label $locale_a ] } - if { [catch {set label_b [ad_locale_get_label $locale_b] } ] } { + if { [catch {set label_b [lang::util::get_label $locale_b] } ] } { set locale_b [lang::user::locale] - set label_b [ad_locale_get_label $locale_b ] + set label_b [lang::util::get_label $locale_b ] } return 0 Index: openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl 23 Feb 2004 23:00:08 -0000 1.1 +++ openacs-4/contrib/packages/vocabulary/tcl/vocabulary-train-procs.tcl 26 Feb 2005 16:00:09 -0000 1.2 @@ -80,7 +80,7 @@ } else { set phonetic "" } - set label [ad_locale_get_label $locale_b] + set label [lang::util::get_label $locale_b] set question "What does $word(word) $phonetic mean in $label?" } if { ![exists_and_not_null answer] } { Index: openacs-4/contrib/packages/vocabulary/www/locale.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/locale.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/vocabulary/www/locale.tcl 23 Feb 2004 23:00:09 -0000 1.1 +++ openacs-4/contrib/packages/vocabulary/www/locale.tcl 26 Feb 2005 16:00:09 -0000 1.2 @@ -40,11 +40,11 @@ } -validate { # just in case { locale_a - { [catch ad_locale_get_label $locale_a] } + { [catch lang::util::get_label $locale_a] } "$locale_a is not a valid locale" } { locale_b - { [catch ad_locale_get_label $locale_b] } + { [catch lang::util::get_label $locale_b] } "$locale_b is not a valid locale" } } -on_submit { Index: openacs-4/contrib/packages/vocabulary/www/word-list-csv.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/word-list-csv.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/vocabulary/www/word-list-csv.tcl 23 Feb 2004 23:00:11 -0000 1.1 +++ openacs-4/contrib/packages/vocabulary/www/word-list-csv.tcl 26 Feb 2005 16:00:09 -0000 1.2 @@ -9,7 +9,7 @@ vocab::conn set subnavbar_link [vocab::subnav_prep -package_id $package_id] -set locale_b_label [ad_locale_get_label $locale_b] +set locale_b_label [lang::util::get_label $locale_b] template::list::create \ -name words \ Index: openacs-4/contrib/packages/vocabulary/www/word-list-export.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/vocabulary/www/word-list-export.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/contrib/packages/vocabulary/www/word-list-export.tcl 23 Feb 2004 23:00:11 -0000 1.1 +++ openacs-4/contrib/packages/vocabulary/www/word-list-export.tcl 26 Feb 2005 16:00:09 -0000 1.2 @@ -6,7 +6,7 @@ orderby:optional } -set locale_b_label [ad_locale_get_label $locale_b] +set locale_b_label [lang::util::get_label $locale_b] template::list::create \ -name words \ 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.39 -r1.40 --- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 26 Feb 2004 15:28:46 -0000 1.39 +++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.tcl 26 Feb 2005 16:00:09 -0000 1.40 @@ -180,7 +180,7 @@ # ISO-8859-1 an exception is that some developers may make the shortcut of editing # the en_US catalog files directly to add keys and they might mess up the # utf-8 encoding of the files when doing so. - set system_charset [ad_locale charset $locale] + set system_charset [lang::util::charset_for_locale $locale] set file_charset [ad_decode $system_charset "ISO-8859-1" $system_charset utf-8] } 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.43 -r1.44 --- openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 20 Apr 2004 21:12:45 -0000 1.43 +++ openacs-4/packages/acs-lang/tcl/lang-message-procs.tcl 26 Feb 2005 16:00:09 -0000 1.44 @@ -937,58 +937,7 @@ # ##### -ad_proc -private -deprecated -warn lang_message_register { locale key message } { - Normally accessed through the _mr procedure. - Registers a message in a given locale or language. - Inserts the message into the table lang_messages - if it does not exist and updates if it does. - - @author Jeff Davis (davis@arsdigita.com) - @author Bruno Mattarollo (bruno.mattarollo@ams.greenpeace.org) - @see _mr - - @param locale Locale or language of the message. If a language is supplied, - the default locale for the language is looked up. - Taken from ad_locales table. - @param key Unique identifier for this message. Will be the same identifier - for each language - @param message Text of the message - - @see lang::message::register -} { - return [lang::message::register $locale $key $message] -} - -ad_proc -private -deprecated -warn lang_message_lookup { - locale - key - {default "TRANSLATION MISSING"} -} { - @see lang::message::lookup -} { - return [lang::message::lookup $locale $key $default {} 2] -} - -ad_proc -deprecated -warn lang_babel_translate { - msg - lang -} { - Translates an English string into a different language - using Babelfish. - - @author Henry Minsky (hqm@mit.edu) - - @param msg String to translate - @param lang Abbreviation for lang in which to translate string - @return Translated string - - @see lang::message::translate -} { - return [lang::message::translate $msg $lang] -} - - ad_proc -public lang::message::update_description { {-package_key:required} {-message_key:required} Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v diff -u -N -r1.34 -r1.35 --- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 13 Jan 2005 13:55:26 -0000 1.34 +++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 26 Feb 2005 16:00:09 -0000 1.35 @@ -675,8 +675,8 @@ translator_mode_p } { Sets whether translator mode is enabled for this session or - not. - + not. + @author Lars Pind (lars@collaboraid.biz) @creation-date October 24, 2002 @@ -686,7 +686,7 @@ } { ad_set_client_property acs-lang translator_mode_p $translator_mode_p } - + ad_proc -private lang::util::record_message_lookup { message_key } { @@ -714,81 +714,43 @@ @author Peter Marklund } { global __lang_message_lookups - + if { [info exists __lang_message_lookups] } { return $__lang_message_lookups } else { return {} } } -##### -# -# Compatibility procs -# -##### -ad_proc -deprecated -warn lang_sort { - field - {locale {}} -} { - Each locale can have a different alphabetical sort order. You can test - this proc with the following data: - 
-    insert into lang_testsort values ('lama');
-    insert into lang_testsort values ('lhasa');
-    insert into lang_testsort values ('llama');
-    insert into lang_testsort values ('lzim');  
-
+ad_proc -public lang::util::get_label { locale } { - @author Jeff Davis (davis@arsdigita.com) + Returns the label (name) of locale - @param field Name of Oracle column - @param locale Locale for sorting. - If locale is unspecified just return the column name - @return Language aware version of field for Oracle ORDER BY clause. + @author Bruno Mattarollo (bruno.mattarollo@ams.greenpeace.org) - @see lang::util::sort -} { - return [lang::util::sort $field $locale] -} + @param locale Code for the locale, eg "en_US" -ad_proc -deprecated -warn ad_locale_charset_for_locale { - locale -} { - Returns the MIME charset name corresponding to a locale. + @return String containing the label for the locale - @see ad_locale - @author Henry Minsky (hqm@mit.edu) - @param locale Name of a locale, as language_COUNTRY using ISO 639 and ISO 3166 - @return IANA MIME character set name - @see lang::util::charset_for_locale } { - return [lang::util::charset_for_locale $locale] + return [db_string select {}] } -ad_proc -deprecated -warn ad_locale_locale_from_lang { - language -} { - Returns the default locale for a language - - @author Henry Minsky (hqm@mit.edu) - @param language Name of a country, using ISO-3166 two letter code - @return Default locale - @see lang::util::default_locale_from_lang -} { - return [lang::util::default_locale_from_lang $language] -} -ad_proc -deprecated -warn ad_locale_language_name { - language +ad_proc -private lang::util::escape_vars_if_not_null { + list } { - Returns the nls_language name for a language + Processes a list of variables before they are passed into + a regexp command. - @author Henry Minsky (hqm@mit.edu) - @param language Name of a country, using ISO-3166 two letter code - @return The nls_language name of the language. - @see lang::util::nls_language_from_language + @param list List of variable names } { - return [lang::util::nls_language_from_language $language] + foreach lm $list { + upvar $lm foreign_var + if { [exists_and_not_null foreign_var] } { + set foreign_var "\[$foreign_var\]" + } + } } + Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.xql,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-lang/tcl/lang-util-procs.xql 21 Aug 2003 08:45:26 -0000 1.3 +++ openacs-4/packages/acs-lang/tcl/lang-util-procs.xql 26 Feb 2005 16:00:09 -0000 1.4 @@ -25,4 +25,12 @@ + + + select label + from ad_locales + where lower(locale) = lower(:locale) + + + Index: openacs-4/packages/acs-lang/tcl/locale-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/locale-procs.tcl,v diff -u -N -r1.29 -r1.30 --- openacs-4/packages/acs-lang/tcl/locale-procs.tcl 24 Jul 2004 08:34:05 -0000 1.29 +++ openacs-4/packages/acs-lang/tcl/locale-procs.tcl 26 Feb 2005 16:00:09 -0000 1.30 @@ -50,7 +50,7 @@ return $parameter_locale } -ad_proc -public lang::system::package_level_locale_not_cached { +ad_proc -private lang::system::package_level_locale_not_cached { package_id } { return [db_string get_system_locale {} -default {}] @@ -230,7 +230,7 @@ }] } -ad_proc -public lang::system::get_locale_options_not_cached {} { +ad_proc -private lang::system::get_locale_options_not_cached {} { Return all enabled locales in the system in a format suitable for the options argument of a form. @author Lars Pind @@ -245,7 +245,7 @@ # ##### -ad_proc -public lang::user::package_level_locale_not_cached { +ad_proc -private lang::user::package_level_locale_not_cached { user_id package_id } { @@ -296,7 +296,7 @@ return [util_memoize [list lang::user::site_wide_locale_not_cached $user_id] [sec_session_timeout]] } -ad_proc -public lang::user::site_wide_locale_not_cached { +ad_proc -private lang::user::site_wide_locale_not_cached { user_id } { Get the user's preferred site wide locale. @@ -648,162 +648,24 @@ } - ##### # # Backwards compatibility procs # ##### +ad_proc -deprecated -warn -public ad_locale_get_label { locale } { -ad_proc -deprecated -warn ad_locale { - context - {item "locale"} -} { - Returns the value of a locale item in a particular context. For example, to - get the language, locale, and timezone preference for the current user: - - 
-    set user_lang [ad_locale user language] => en
-
-    set user_locale [ad_locale user locale] => en_US
-
-    set user_tz [ad_locale user timezone] => PST
-
- - To get the preferred language of the current subsite: - - 
-    set user_lang [ad_locale subsite language] => ja
-
- - Requires ad_locale_establish_vars to be run as a filter on each web page - before this procedure is called. - @see ad_locale_establish_vars - @author Henry Minsky (hqm@mit.edu) - - @param context Context in which a locale value can be obtained. - The only context that is currently implemented is user (for the current user). - Examples of other contexts that could be implemented are: - subsite (for the group that owns the current web page) - @param item Specific item of data. - The only items that are implemented are locale, timezone and language. - You can change the implementation to add other items as required. - @return Value of the item in the specified context - - @see lang::conn::locale - @see lang::user::locale - @see lang::user::language - @see lang::user::timezone - @see lang::util::charset_for_locale -} { - switch $context { - request { - switch $item { - locale { - return [lang::conn::locale -site_wide] - } - language { - return [lang::conn::language -site_wide] - } - timezone { - return [lang::conn::timezone] - } - default { - error "unsupported option to ad_locale: $item" - } - } - } - user { - switch $item { - locale { - return [lang::user::locale -site_wide] - } - language { - return [lang::user::language -site_wide] - } - timezone { - return [lang::user::timezone] - } - default { - error "unsupported option to ad_locale: $item" - } - } - } - charset { - return [lang::util::charset_for_locale $item] - } - default { - error "ad_locale: unknown context $context" - } - } -} - -ad_proc -deprecated -warn ad_locale_set { - item - value -} { - Sets the user's preferred locale info as a session var -

- usage: - 

-    ad_locale_set locale "en_US"
-    ad_locale_set timezone "PST"
-
- @see lang::user::set_locale - @see lang::user::set_timezone -} { - switch $item { - locale { - lang::user::set_locale $value - } - timezone { - lang::user::set_timezone $value - } - default { - error "Unknown item, $item" - } - } -} - -ad_proc -deprecated -warn ad_locale_set_system_timezone { - timezone -} { - Tell OpenACS what timezone we think it's running in. - - @param timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York) - @see lang::system::set_timezone -} { - lang::system::set_timezone $timezone -} - - -ad_proc -deprecated -warn ad_locale_get_system_timezone { } { - Ask OpenACS what it thinks our timezone is. - - @return a timezone name from acs-reference package (e.g., Asia/Tokyo, America/New_York) - @see lang::system::timezone -} { - return [lang::system::timezone] -} - - -ad_proc -deprecated -warn ad_locale_system_tz_offset { } { - @return number of hours to subtract from local (Oracle) time to get UTC - @see lang::system::timezone_utc_offset -} { - return [lang::system::timezone_utc_offset] -} - -ad_proc -deprecated -public ad_locale_get_label { locale } { - Returns the label (name) of locale + To be removed in 5.3 + @author Bruno Mattarollo (bruno.mattarollo@ams.greenpeace.org) @param locale Code for the locale, eg "en_US" @return String containing the label for the locale + @see lang::util::get_label } { return [db_string select_locale_label { select label 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.16 -r1.17 --- openacs-4/packages/acs-lang/tcl/localization-procs.tcl 8 Feb 2005 01:14:27 -0000 1.16 +++ openacs-4/packages/acs-lang/tcl/localization-procs.tcl 26 Feb 2005 16:00:10 -0000 1.17 @@ -14,22 +14,6 @@ } -ad_proc -private ad_locale_escape_vars_if_not_null { - list -} { - Processes a list of variables before they are passed into - a regexp command. - - @param list List of variable names -} { - foreach lm $list { - upvar $lm foreign_var - if { [exists_and_not_null foreign_var] } { - set foreign_var "\[$foreign_var\]" - } - } -} - ad_proc -public lc_parse_number { num locale @@ -64,7 +48,7 @@ set neg [lc_get -locale $locale "negative_sign"] set pos [lc_get -locale $locale "positive_sign"] - ad_locale_escape_vars_if_not_null {dec thou neg pos} + lang::util::escape_vars_if_not_null {dec thou neg pos} # Pattern actually looks like this (separators notwithstanding): # {^\ *([-]|[+])?\ *([0-9]+|[1-9][0-9]{1,2}([,][0-9]{3})+)([.][0-9]*)?\ *$} Index: openacs-4/packages/acs-lang/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/index.tcl 15 Nov 2002 09:22:43 -0000 1.3 +++ openacs-4/packages/acs-lang/www/index.tcl 26 Feb 2005 16:00:10 -0000 1.4 @@ -12,6 +12,6 @@ # Get user pref setting # -set locale [ad_locale user locale] -set language [ad_locale user language] +set locale [lang::user::locale] +set language [lang::user::language] set admin_p [ad_permission_p [ad_conn package_id] admin] Index: openacs-4/packages/acs-lang/www/locale-set.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/Attic/locale-set.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/locale-set.tcl 9 May 2004 14:57:58 -0000 1.4 +++ openacs-4/packages/acs-lang/www/locale-set.tcl 26 Feb 2005 16:00:10 -0000 1.5 @@ -12,7 +12,7 @@ } # set the locale property -ad_locale_set locale $locale +lang::user::set_locale $locale ad_returnredirect $redirect_url Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl 21 Oct 2003 14:27:59 -0000 1.5 +++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl 26 Feb 2005 16:00:10 -0000 1.6 @@ -13,8 +13,8 @@ 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 "Batch edit messages" set context [list [list "package-list?[export_vars { locale }]" $locale_label] \ Index: openacs-4/packages/acs-lang/www/admin/edit-description.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-description.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-lang/www/admin/edit-description.tcl 15 Aug 2003 07:50:44 -0000 1.2 +++ openacs-4/packages/acs-lang/www/admin/edit-description.tcl 26 Feb 2005 16:00:10 -0000 1.3 @@ -15,8 +15,8 @@ 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 "Edit description" set context [list [list "package-list?[export_vars { locale }]" $locale_label] \ Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v diff -u -N -r1.13 -r1.14 --- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl 24 Feb 2005 13:33:01 -0000 1.13 +++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl 26 Feb 2005 16:00:10 -0000 1.14 @@ -21,8 +21,8 @@ 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 "Edit $package_key.$message_key" set context [list [list [export_vars -base package-list { locale }] $locale_label] \ Index: openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl 22 Oct 2003 13:30:31 -0000 1.1 +++ openacs-4/packages/acs-lang/www/admin/export-locale-to-files.tcl 26 Feb 2005 16:00:10 -0000 1.2 @@ -7,7 +7,7 @@ locale } -set locale_label [ad_locale_get_label $locale] +set locale_label [lang::util::get_label $locale] set page_title "Export all messages for locale $locale" set return_url [export_vars -base package-list { locale }] set context [list [list $return_url $locale_label] $page_title] Index: openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl 22 Oct 2003 11:17:50 -0000 1.3 +++ openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl 26 Feb 2005 16:00:10 -0000 1.4 @@ -9,7 +9,7 @@ locale } -set locale_label [ad_locale_get_label $locale] +set locale_label [lang::util::get_label $locale] set page_title "Import all messages for locale $locale" set return_url [export_vars -base package-list { locale }] set context [list [list $return_url $locale_label] $page_title] Index: openacs-4/packages/acs-lang/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v diff -u -N -r1.7 -r1.8 --- openacs-4/packages/acs-lang/www/admin/index.tcl 11 Dec 2003 21:39:53 -0000 1.7 +++ openacs-4/packages/acs-lang/www/admin/index.tcl 26 Feb 2005 16:00:10 -0000 1.8 @@ -12,7 +12,7 @@ # We rename to avoid conflict in queries set system_locale [lang::system::locale -site_wide] -set system_locale_label [ad_locale_get_label $system_locale] +set system_locale_label [lang::util::get_label $system_locale] set page_title "Administration of Localization" set context [list] Index: openacs-4/packages/acs-lang/www/admin/locale-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-delete.tcl,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/acs-lang/www/admin/locale-delete.tcl 14 Aug 2003 16:06:20 -0000 1.4 +++ openacs-4/packages/acs-lang/www/admin/locale-delete.tcl 26 Feb 2005 16:00:10 -0000 1.5 @@ -17,8 +17,8 @@ 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 "Delete $locale_label" set context [list $page_title] Index: openacs-4/packages/acs-lang/www/admin/locale-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.tcl,v diff -u -N -r1.6 -r1.7 --- openacs-4/packages/acs-lang/www/admin/locale-edit.tcl 14 Aug 2003 16:06:20 -0000 1.6 +++ openacs-4/packages/acs-lang/www/admin/locale-edit.tcl 26 Feb 2005 16:00:10 -0000 1.7 @@ -127,7 +127,7 @@ form get_values locale_editing - set locale_label [ad_locale_get_label $locale] + set locale_label [lang::util::get_label $locale] if { $label == "" } { element set_error locale_editing label "Label is required" Index: openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl 21 Aug 2003 08:45:26 -0000 1.5 +++ openacs-4/packages/acs-lang/www/admin/locale-make-default.tcl 26 Feb 2005 16:00:10 -0000 1.6 @@ -23,9 +23,6 @@ db_dml make_locale_default "update ad_locales set default_p = 't' where locale = :locale" - - util_memoize_flush [list ad_locale_locale_from_lang $locale] - } # Flush caches 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.6 -r1.7 --- openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 22 Oct 2003 16:33:43 -0000 1.6 +++ openacs-4/packages/acs-lang/www/admin/localized-message-new.tcl 26 Feb 2005 16:00:10 -0000 1.7 @@ -20,8 +20,8 @@ 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] \ 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.2 -r1.3 --- openacs-4/packages/acs-lang/www/admin/message-delete.tcl 11 Dec 2003 21:39:53 -0000 1.2 +++ openacs-4/packages/acs-lang/www/admin/message-delete.tcl 26 Feb 2005 16:00:10 -0000 1.3 @@ -20,8 +20,8 @@ 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 "Delete Message" set context [list [list "package-list?[export_vars { locale }]" $locale_label] \ 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.9 -r1.10 --- openacs-4/packages/acs-lang/www/admin/message-list.tcl 29 Jun 2004 10:17:41 -0000 1.9 +++ openacs-4/packages/acs-lang/www/admin/message-list.tcl 26 Feb 2005 16:00:10 -0000 1.10 @@ -24,8 +24,8 @@ 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 $package_key set context [list [list [export_vars -base package-list { locale }] $locale_label] $page_title] Index: openacs-4/packages/acs-lang/www/admin/message-search.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-search.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/acs-lang/www/admin/message-search.tcl 14 Aug 2003 16:06:20 -0000 1.2 +++ openacs-4/packages/acs-lang/www/admin/message-search.tcl 26 Feb 2005 16:00:10 -0000 1.3 @@ -13,17 +13,17 @@ 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 "Search Messages" set context [list [list "package-list?[export_vars { locale }]" $locale_label] $page_title] set default_locale en_US set search_locales [list] -lappend search_locales [list "Current locale - [ad_locale_get_label $locale]" $locale ] -lappend search_locales [list "Master locale - [ad_locale_get_label $default_locale]" $default_locale] +lappend search_locales [list "Current locale - [lang::util::get_label $locale]" $locale ] +lappend search_locales [list "Master locale - [lang::util::get_label $default_locale]" $default_locale] set submit_p 0 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.5 -r1.6 --- openacs-4/packages/acs-lang/www/admin/package-list.tcl 11 Dec 2003 21:39:53 -0000 1.5 +++ openacs-4/packages/acs-lang/www/admin/package-list.tcl 26 Feb 2005 16:00:10 -0000 1.6 @@ -22,8 +22,8 @@ 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 $locale_label set context [list $page_title] @@ -85,8 +85,8 @@ ##### set search_locales [list \ - [list "Current locale - [ad_locale_get_label $current_locale]" $current_locale] \ - [list "Master locale - [ad_locale_get_label $default_locale]" $default_locale]] + [list "Current locale - [lang::util::get_label $current_locale]" $current_locale] \ + [list "Master locale - [lang::util::get_label $default_locale]" $default_locale]] ad_form -name search -action message-search -form { {locale:text(hidden) {value $locale}} Index: openacs-4/packages/acs-lang/www/admin/test/catalog-test.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/test/catalog-test.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-lang/www/admin/test/catalog-test.tcl 7 Oct 2002 14:32:49 -0000 1.1 +++ openacs-4/packages/acs-lang/www/admin/test/catalog-test.tcl 26 Feb 2005 16:00:10 -0000 1.2 @@ -20,10 +20,10 @@ set german [_ de test.German] -set locale [ad_locale user locale] +set locale [lang::user::locale] #set locale "ja_JP" -set language [ad_locale user language] +set language [lang::user::language] #set language ja set language_name [ad_locale_language_name $language] Index: openacs-4/packages/acs-lang/www/admin/test/test.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/test/test.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/acs-lang/www/admin/test/test.tcl 7 Oct 2002 14:32:49 -0000 1.1 +++ openacs-4/packages/acs-lang/www/admin/test/test.tcl 26 Feb 2005 16:00:10 -0000 1.2 @@ -19,7 +19,7 @@ set spanish [_ es test.Spanish] set german [_ de test.German] -#set lang [ad_locale user language] +#set lang [lang::user::language] set lang [ad_get_client_property lang locale] if {[empty_string_p $lang]} { set lang "en" Index: openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl 29 Jun 2004 10:17:45 -0000 1.10 +++ openacs-4/packages/acs-templating/tcl/spellcheck-init.tcl 26 Feb 2005 16:00:10 -0000 1.11 @@ -85,7 +85,7 @@ } # Some five-char aspell dicts (locales) are missing in ad_locales so we # need to catch those cases and use the locale as the pretty name, ugh ... - if { [catch { lappend wanted_dicts [list [string totitle [ad_locale_get_label $dict]] $dict] }] } { + if { [catch { lappend wanted_dicts [list [string totitle [lang::util::get_label $dict]] $dict] }] } { lappend wanted_dicts [list "Locale $dict" $dict] } } Index: openacs-4/packages/webmail/tcl/webmail-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/tcl/webmail-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/tcl/webmail-procs.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/tcl/webmail-procs.tcl 26 Feb 2005 16:00:10 -0000 1.2 @@ -79,7 +79,7 @@ } } with_catch errmsg { - set client_tz [ad_locale_get_system_timezone] + set client_tz [lang::system::timezone] } { set client_tz "GMT" } Index: openacs-4/packages/webmail/tcl/wm-util-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/webmail/tcl/wm-util-procs.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/webmail/tcl/wm-util-procs.tcl 20 Apr 2001 20:51:23 -0000 1.1 +++ openacs-4/packages/webmail/tcl/wm-util-procs.tcl 26 Feb 2005 16:00:10 -0000 1.2 @@ -24,7 +24,7 @@ SELECT ( (sysdate - timezone.local_to_utc (:client_tz, sysdate)) * 24 ) FROM dual }] - set client_tz_offset [expr [ad_locale_system_tz_offset] - $client_oracle_offset] + set client_tz_offset [expr [lang::system::timezone_utc_offset] - $client_oracle_offset] } { # They probably have not installed acs-lang; return no offset return 0