[interchange-cvs] interchange - heins modified 2 files
interchange-cvs at icdevgroup.org
interchange-cvs at icdevgroup.org
Sat Jul 26 19:01:00 EDT 2003
User: heins
Date: 2003-07-26 22:01:12 GMT
Modified: code/UserTag loc.tag
Modified: lib/Vend Util.pm
Log:
* Allow return of page from readin (or readfile in locale mode) without
the locale language substitutions done. This allows proper edits of
pages.
Revision Changes Path
1.3 +6 -0 interchange/code/UserTag/loc.tag
rev 1.3, prev_rev 1.2
Index: loc.tag
===================================================================
RCS file: /var/cvs/interchange/code/UserTag/loc.tag,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- loc.tag 18 Mar 2003 11:34:49 -0000 1.2
+++ loc.tag 26 Jul 2003 22:01:12 -0000 1.3
@@ -10,6 +10,12 @@
UserTag loc Routine <<EOF
sub {
my ($locale, $message) = @_;
+ if($::Pragma->{no_locale_parse}) {
+ my $begin = '[L';
+ $begin .= " $locale" if $locale;
+ $begin .= ']';
+ return $begin . $message . '[/L]';
+ }
return $message unless $Vend::Cfg->{Locale};
my $ref;
if($locale) {
2.63 +4 -2 interchange/lib/Vend/Util.pm
rev 2.63, prev_rev 2.62
Index: Util.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.62
retrieving revision 2.63
diff -u -r2.62 -r2.63
--- Util.pm 12 Jul 2003 04:47:10 -0000 2.62
+++ Util.pm 26 Jul 2003 22:01:12 -0000 2.63
@@ -1,6 +1,6 @@
# Vend::Util - Interchange utility functions
#
-# $Id: Util.pm,v 2.62 2003/07/12 04:47:10 mheins Exp $
+# $Id: Util.pm,v 2.63 2003/07/26 22:01:12 mheins 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.62 $, 10);
+$VERSION = substr(q$Revision: 2.63 $, 10);
my $Eval_routine;
my $Eval_routine_file;
@@ -963,6 +963,8 @@
sub parse_locale {
my ($input) = @_;
+
+ return if $::Pragma->{no_locale_parse};
# avoid copying big strings
my $r = ref($input) ? $input : \$input;
More information about the interchange-cvs
mailing list