Changeset 2361

Timestamp:

05/16/08 10:14:07 (21 months ago)

Author:

fumiakiy

Message:

Do not double translate a phrase. BugId:79792

Location:

branches/release-38/lib/MT

Files:

• CMS/Template.pm (modified) (2 diffs)
• Template.pm (modified) (1 diff)

branches/release-38/lib/MT/CMS/Template.pm

@@ -1029 +1029 @@
     my @arch_tmpl;
     for my $val (@$tmpl_list) {
-        $val->{name} = $app->translate( $val->{name} );
         $val->{text} = $app->translate_templatized( $val->{text} );
         my $tmpl = MT::Template->new;
@@ -1736 +1735 @@
             if ( !$val->{orig_name} ) {
                 $val->{orig_name} = $val->{name};
-                $val->{name}      = $app->translate( $val->{name} );
                 $val->{text}      = $app->translate_templatized( $val->{text} );
             }

branches/release-38/lib/MT/Template.pm

@@ -289 +289 @@
     return unless $widgets && @$widgets;
 
-    my @widgets = map { MT->translate( $_ ) } @$widgets;
-
     my @wtmpls = $pkg->load(
-        { name => \@widgets, blog_id => $blog_id ? [ $blog_id, 0 ] : 0, type => 'widget' }
-    ) if @widgets;
+        { name => $widgets, blog_id => $blog_id ? [ $blog_id, 0 ] : 0, type => 'widget' }
+    ) if $widgets && @$widgets;
     my @wids;
-    foreach my $name ( @widgets ) {
+    foreach my $name ( @$widgets ) {
         my ( $widget ) = grep { $_->name eq $name } @wtmpls;
         next unless $widget;