Changeset 1752

Timestamp:

04/03/08 09:56:03 (15 months ago)

Author:

fumiakiy

Message:

Do not double-translate the name of permissions. They are labels and automatically translated.

Files:

• branches/release-33/lib/MT/CMS/User.pm (modified) (7 diffs)

branches/release-33/lib/MT/CMS/User.pm

@@ -150 +150 @@
         $param{ 'have_access-' . $ref->[0] } =
           ( $role && $role->has( $ref->[0] ) ) ? 1 : 0;
-        $param{ 'prompt-' . $ref->[0] } = $app->translate( $ref->[1] );
+        $param{ 'prompt-' . $ref->[0] } = $ref->[1];
     }
     $param{saved}          = $q->param('saved');
@@ -334 +334 @@
     $param->{object_type} = 'author';
 
-    my $all_perms;
-    my @all_perms = @{ MT::Permission->perms() };
-    $all_perms = [@all_perms];
-    foreach (@$all_perms) {
-        $_->[1] = $app->translate( $_->[1] );
-    }
-
     require MT::Association;
     require MT::Role;
@@ -400 +393 @@
         foreach my $role (@roles) {
             my @perms;
-            foreach (@$all_perms) {
+            my @all_perms = @{ MT::Permission->perms() };
+            foreach (@all_perms) {
                 next unless length( $_->[1] || '' );
-                push @perms, $app->translate( $_->[1] )
+                push @perms, $_->[1]
                   if $role->has( $_->[0] );
             }
@@ -494 +488 @@
 
     my $pref = $app->list_pref('association');
-    my $all_perms;
-    if ( $pref->{view_expanded} ) {
-        my @all_perms = @{ MT::Permission->perms() };
-        $all_perms = [@all_perms];
-        foreach (@$all_perms) {
-            $_->[1] = $app->translate( $_->[1] );
-        }
-    }
 
     # Supplies additional parameters for the row being listed
@@ -518 +504 @@
             if ( $pref->{view_expanded} ) {
                 my @perms;
-                foreach (@$all_perms) {
+                my @all_perms = @{ MT::Permission->perms() };
+                foreach (@all_perms) {
                     next unless length( $_->[1] || '' );
-                    push @perms, { name => $app->translate( $_->[1] ) }
+                    push @perms, { name => $_->[1] }
                       if $role->has( $_->[0] );
                 }
@@ -655 +642 @@
 
     my $pref = $app->list_pref('role');
-    my $all_perms;
-    if ( $pref->{view_expanded} ) {
-        my @all_perms = @{ MT::Permission->perms() };
-        $all_perms = [@all_perms];
-        foreach (@$all_perms) {
-            $_->[1] = $app->translate( $_->[1] );
-        }
-    }
 
     my $author_class = $app->model('author');
@@ -700 +679 @@
         if ( $pref->{view_expanded} ) {
             my @perms;
-            foreach (@$all_perms) {
+            my @all_perms = @{ MT::Permission->perms() };
+            foreach (@all_perms) {
                 next unless length( $_->[1] || '' );
-                push @perms, { name => $app->translate( $_->[1] ) }
+                push @perms, { name => $_->[1] }
                   if $obj->has( $_->[0] );
             }