[Rt-commit] rt branch, 4.0-trunk, updated. rt-3.9.7-1182-gd8acb6f

? sunnavy sunnavy at bestpractical.com
Wed Jan 5 01:56:09 EST 2011


The branch, 4.0-trunk has been updated
       via  d8acb6fc2bbc9b4798b0ae414f77c553153dbfbc (commit)
       via  d96389725adb26b282df938f31adb7636ff659cc (commit)
      from  e3f2d7df42aa8395034c5371b2ced69b82f42de1 (commit)

Summary of changes:
 share/html/Articles/Article/Delete.html            |    2 +-
 share/html/Articles/Article/Edit.html              |    2 +-
 share/html/Articles/Article/ExtractFromTicket.html |    2 +-
 share/html/Articles/Article/ExtractIntoTopic.html  |    2 +-
 t/api/versions_sorter.t                            |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit d96389725adb26b282df938f31adb7636ff659cc
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jan 5 14:29:34 2011 +0800

    loc fixes for articles

diff --git a/share/html/Articles/Article/Delete.html b/share/html/Articles/Article/Delete.html
index 0f6c97e..a4ad5eb 100644
--- a/share/html/Articles/Article/Delete.html
+++ b/share/html/Articles/Article/Delete.html
@@ -90,7 +90,7 @@ unless ( $ArticleObj->id ) {
 
 
 unless ( $ArticleObj->CurrentUserHasRight('ModifyArticle') ) {
-    $m->comp("/Elements/Error", Why => "No permission to modify article");
+    $m->comp("/Elements/Error", Why => loc("No permission to modify article"));
 }
 
 if ($ARGS{'Delete'} eq 'yes') {
diff --git a/share/html/Articles/Article/Edit.html b/share/html/Articles/Article/Edit.html
index 1842e79..4c1c84f 100644
--- a/share/html/Articles/Article/Edit.html
+++ b/share/html/Articles/Article/Edit.html
@@ -320,7 +320,7 @@ else {
 if ( $ArticleObj->id ) {
     unless ( $ArticleObj->CurrentUserHasRight('ShowArticle') ) {
         $m->comp( "/Elements/Error",
-            Why => "No permission to view Article" );
+            Why => loc("No permission to view Article") );
     }
 }
 
diff --git a/share/html/Articles/Article/ExtractFromTicket.html b/share/html/Articles/Article/ExtractFromTicket.html
index b65c205..81dfc76 100644
--- a/share/html/Articles/Article/ExtractFromTicket.html
+++ b/share/html/Articles/Article/ExtractFromTicket.html
@@ -89,7 +89,7 @@ my $transactions = $ticket->Transactions;
 my $ClassObj = RT::Class->new($session{'CurrentUser'});
 $ClassObj->Load($Class);
 unless ($ClassObj->Id) {
-    $m->comp("/Elements/Error", Why => "'%1' isn't a valid class identifier", $Class);
+    $m->comp("/Elements/Error", Why => loc("'[_1]' isn't a valid class identifier", $Class));
 }
 my     $CustomFields = $ClassObj->ArticleCustomFields();
 
diff --git a/share/html/Articles/Article/ExtractIntoTopic.html b/share/html/Articles/Article/ExtractIntoTopic.html
index f046aa0..853ae3b 100644
--- a/share/html/Articles/Article/ExtractIntoTopic.html
+++ b/share/html/Articles/Article/ExtractIntoTopic.html
@@ -66,6 +66,6 @@ $Class => undef
 my $ClassObj = RT::Class->new($session{'CurrentUser'});
 $ClassObj->Load($Class);
 unless ($ClassObj->Id) {
-    $m->comp("/Elements/Error", Why => "'%1' isn't a valid class identifier", $Class);
+    $m->comp("/Elements/Error", Why => loc("'[_1]' isn't a valid class identifier", $Class));
 }
 </%init>

commit d8acb6fc2bbc9b4798b0ae414f77c553153dbfbc
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Jan 5 14:52:57 2011 +0800

    tests number fix

diff --git a/t/api/versions_sorter.t b/t/api/versions_sorter.t
index 28307bf..b2ec547 100644
--- a/t/api/versions_sorter.t
+++ b/t/api/versions_sorter.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-use RT::Test nodata => 1, tests => 264;
+use RT::Test nodata => 1, tests => 3;
 
 use strict;
 use warnings;

-----------------------------------------------------------------------


More information about the Rt-commit mailing list