From a6836df277867d73a71c55797984c947449772cc Mon Sep 17 00:00:00 2001 From: Yorhel Date: Tue, 19 Jan 2016 20:29:40 +0100 Subject: L10N: Intern all VNDB::Util::* stuff With some related edits in other parts of the code, mostly due to interface changes to htmlRevision() and htmlFormError(). Trivial replacements were automated by a super awesome script. --- lib/VNDB/Handler/Traits.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/VNDB/Handler/Traits.pm') diff --git a/lib/VNDB/Handler/Traits.pm b/lib/VNDB/Handler/Traits.pm index 4b106fa2..979ea0d6 100644 --- a/lib/VNDB/Handler/Traits.pm +++ b/lib/VNDB/Handler/Traits.pm @@ -3,7 +3,7 @@ package VNDB::Handler::Traits; use strict; use warnings; -use TUWF ':html', ':xml', 'html_escape'; +use TUWF ':html', ':xml', 'html_escape', 'xml_escape'; use VNDB::Func; @@ -158,12 +158,9 @@ sub traitedit { } } if(!$frm->{_err}) { - my $c = $self->dbTraitGet(name => $frm->{name}, noid => $trait, group => $group); - push @{$frm->{_err}}, [ 'name', 'traitexists', $c->[0] ] if @$c; - for (split /[\t\s]*\n[\t\s]*/, $frm->{alias}) { - $c = $self->dbTraitGet(name => $_, noid => $trait, group => $group); - push @{$frm->{_err}}, [ 'alias', 'traitexists', $c->[0] ] if @$c; - } + my @dups = @{$self->dbTraitGet(name => $frm->{name}, noid => $trait, group => $group)}; + push @dups, @{$self->dbTraitGet(name => $_, noid => $trait, group => $group)} for split /[\t\s]*\n[\t\s]*/, $frm->{alias}; + push @{$frm->{_err}}, \sprintf 'Trait %s already exists within the same group.', $_->{id}, xml_escape $_->{name} for @dups; } if(!$frm->{_err}) { -- cgit v1.2.3