[interchange-cvs] interchange - racke modified lib/Vend/Util.pm
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Wed Feb 4 09:54:10 EST 2004
User: racke
Date: 2004-02-04 14:54:09 GMT
Modified: lib/Vend Util.pm
Log:
use DefaultLocale for [LC] if [scratch mv_locale] is empty
Revision Changes Path
2.67 +5 -3 interchange/lib/Vend/Util.pm
rev 2.67, prev_rev 2.66
Index: Util.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Util.pm,v
retrieving revision 2.66
retrieving revision 2.67
diff -u -r2.66 -r2.67
--- Util.pm 16 Dec 2003 14:07:56 -0000 2.66
+++ Util.pm 4 Feb 2004 14:54:09 -0000 2.67
@@ -1,6 +1,6 @@
# Vend::Util - Interchange utility functions
#
-# $Id: Util.pm,v 2.66 2003/12/16 14:07:56 jon Exp $
+# $Id: Util.pm,v 2.67 2004/02/04 14:54:09 racke Exp $
#
# Copyright (C) 2002-2003 Interchange Development Group
# Copyright (C) 1996-2002 Red Hat, Inc.
@@ -87,7 +87,7 @@
use Vend::File;
use subs qw(logError logGlobal);
use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION = substr(q$Revision: 2.66 $, 10);
+$VERSION = substr(q$Revision: 2.67 $, 10);
my $Eval_routine;
my $Eval_routine_file;
@@ -954,7 +954,9 @@
sub find_locale_bit {
my $text = shift;
- $Lang = $::Scratch->{mv_locale} unless defined $Lang;
+ unless (defined $Lang) {
+ $Lang = $::Scratch->{mv_locale} || $Vend::Cfg->{DefaultLocale};
+ }
$text =~ m{\[$Lang\](.*)\[/$Lang\]}s
and return $1;
$text =~ s{\[(\w+)\].*\[/\1\].*}{}s;
More information about the interchange-cvs
mailing list