[interchange-cvs] interchange - racke modified lib/Vend/Config.pm
interchange-core@interchange.redhat.com
interchange-core@interchange.redhat.com
Mon Jun 10 16:35:01 2002
User: racke
Date: 2002-06-10 20:34:40 GMT
Modified: lib/Vend Config.pm
Log:
merged changes 2.2.2.7 vs 2.2.2.8
+++ 2.2.2.8 +++
introduced MV_LOCALE_NO_DEFAULTS to avoid defaults for currency
settings if necessary
Revision Changes Path
2.45 +11 -8 interchange/lib/Vend/Config.pm
rev 2.45, prev_rev 2.44
Index: Config.pm
===================================================================
RCS file: /anon_cvs/repository/interchange/lib/Vend/Config.pm,v
retrieving revision 2.44
retrieving revision 2.45
diff -u -r2.44 -r2.45
--- Config.pm 3 Jun 2002 17:43:01 -0000 2.44
+++ Config.pm 10 Jun 2002 20:34:40 -0000 2.45
@@ -1,6 +1,6 @@
# Vend::Config - Configure Interchange
#
-# $Id: Config.pm,v 2.44 2002/06/03 17:43:01 kwalsh Exp $
+# $Id: Config.pm,v 2.45 2002/06/10 20:34:40 racke Exp $
#
# Copyright (C) 1996-2001 Red Hat, Inc. <interchange@redhat.com>
#
@@ -44,7 +44,7 @@
use Vend::Parse;
use Vend::Util;
-$VERSION = substr(q$Revision: 2.44 $, 10);
+$VERSION = substr(q$Revision: 2.45 $, 10);
my %CDname;
@@ -1871,17 +1871,20 @@
%{$sethash} = Text::ParseWords::shellwords($settings);
}
$c = $store->{$name} || {};
+ my $nodefaults = delete $sethash->{MV_LOCALE_NO_DEFAULTS};
for (keys %{$sethash}) {
$c->{$_} = $sethash->{$_};
}
if($item eq 'Locale') {
$Vend::Cfg->{DefaultLocale} = $name;
- $c->{mon_thousands_sep} = ','
- unless defined $c->{mon_thousands_sep};
- $c->{decimal_point} = '.'
- unless $c->{decimal_point};
- $c->{frac_digits} = 2
- unless defined $c->{frac_digits};
+ unless ($nodefaults) {
+ $c->{mon_thousands_sep} = ','
+ unless defined $c->{mon_thousands_sep};
+ $c->{decimal_point} = '.'
+ unless $c->{decimal_point};
+ $c->{frac_digits} = 2
+ unless defined $c->{frac_digits};
+ }
}
}
else {