[interchange-cvs] interchange - racke modified lib/Vend/Search.pm

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2008-01-29 10:31:12 GMT
Modified:  lib/Vend Search.pm
Log:
applied patch from Rene Hertell to localize search string error messsage (#157)

Revision  Changes    Path
2.37      +5 -11     interchange/lib/Vend/Search.pm


rev 2.37, prev_rev 2.36
Index: Search.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Search.pm,v
retrieving revision 2.36
retrieving revision 2.37
diff -u -r2.36 -r2.37
--- Search.pm	9 Aug 2007 13:40:54 -0000	2.36
+++ Search.pm	29 Jan 2008 10:31:11 -0000	2.37
@@ -1,8 +1,8 @@
 # Vend::Search - Base class for search engines
 #
-# $Id: Search.pm,v 2.36 2007/08/09 13:40:54 pajamian Exp $
+# $Id: Search.pm,v 2.37 2008/01/29 10:31:11 racke Exp $
 #
-# Copyright (C) 2002-2007 Interchange Development Group
+# Copyright (C) 2002-2008 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 
 package Vend::Search;
 
-$VERSION = substr(q$Revision: 2.36 $, 10);
+$VERSION = substr(q$Revision: 2.37 $, 10);
 
 use strict;
 no warnings qw(uninitialized numeric);
@@ -316,19 +316,13 @@
 		for (@specs) {
 			$passed = 1;
 		    next if length($_) >= $s->{mv_min_string};
-			$msg = <<EOF;
-Search strings must be at least $s->{mv_min_string} characters.
-You had '$_' as one of your search strings.
-EOF
+			$msg = ::errmsg(q{Search strings must be at least %s characters. You had '%s' as one of your search strings.}, $s->{mv_min_string}, $_);
 			undef $passed;
 			last;
 		}
 		$passed = 1 if ! $s->{mv_min_string};
 		if(! defined $passed) {
-			$msg = <<EOF if ! $msg;
-Search strings must be at least $s->{mv_min_string} characters.
-You had no search string specified.
-EOF
+			$msg = ::errmsg(q{Search strings must be at least %s characters. You had no search string specified.}, $s->{mv_min_string}) if ! $msg;
 			return $s->search_error($msg);
 		}
 	}