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 -r1.16 -r1.17 --- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 12 Nov 2002 08:34:50 -0000 1.16 +++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl 12 Nov 2002 15:33:15 -0000 1.17 @@ -350,6 +350,8 @@ @param locale Name of a locale, as language_COUNTRY using ISO 639 and ISO 3166 @return IANA MIME character set name } { + # LARS: + # This should probably be cached return [db_string charset_for_locale {}] } @@ -491,7 +493,7 @@ && ![string is space $text_wo_variables] && [string length $text] > 1 && [string match -nocase {*[A-Z]*} $text] - && ![regexp {(?:\s* \s*)+} $text_wo_variables match] + && ![regexp {^(?:\s* \s*)+$} $text_wo_variables match] && ![regexp {^\s*#[a-zA-Z\._-]+#\s*$} $text_wo_variables match] } { # Peter: texts with a hash or curly brace used to be excluded, my thinking @@ -500,7 +502,6 @@ #&& ![string match {*\#*} $text] #&& ![string match {*\{*} $text] #&& ![string match {*\}*} $text] - regexp {^(\s*)(.*?)(\s*)$} $text match lead text lag set text_w_percentages [convert_adp_variables_to_percentage_signs $text] @@ -627,9 +628,9 @@ } { ad_set_client_property acs-lang translator_mode_p $translator_mode_p } +} -} ##### #