[Rt-commit] r6994 - in rt/branches/3.7-EXPERIMENTAL-RTIR-2.2: lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Tue Feb 13 09:43:45 2007
New Revision: 6994

Modified:
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/   (props changed)
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/I18N.pm
   rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Record.pm

Log:
 r4539 at cubic-pc (orig r6965):  ruz | 2007-02-08 04:45:29 +0300
 * we depend on perl 5.8 so we don't need Encode::compat at all


Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/I18N.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/I18N.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/I18N.pm	Tue Feb 13 09:43:45 2007
@@ -53,23 +53,19 @@
 package RT::I18N;
 
 use strict;
+use warnings;
+
 use Locale::Maketext 1.04;
 use Locale::Maketext::Lexicon 0.25;
 use base ('Locale::Maketext::Fuzzy');
-use vars qw( %Lexicon );
 
-#If we're running on 5.6, we desperately need Encode::compat. But if we're on 5.8, we don't really need it.
-BEGIN { if ($] < 5.007001) {
-require Encode::compat;
-} }
 use Encode;
-
 use MIME::Entity;
 use MIME::Head;
 
 # I decree that this project's first language is English.
 
-%Lexicon = (
+our %Lexicon = (
    'TEST_STRING' => 'Concrete Mixer',
 
     '__Content-Type' => 'text/plain; charset=utf-8',

Modified: rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Record.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Record.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL-RTIR-2.2/lib/RT/Record.pm	Tue Feb 13 09:43:45 2007
@@ -2,7 +2,7 @@
 # 
 # COPYRIGHT:
 #  
-# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+# This software is Copyright (c) 1996-2006 Best Practical Solutions, LLC 
 #                                          <jesse at bestpractical.com>
 # 
 # (Except where explicitly superseded by other copyright notices)
@@ -65,14 +65,18 @@
 =cut
 
 package RT::Record;
+
+use strict;
+use warnings;
+
 use RT::Date;
 use RT::User;
 use RT::Attributes;
-use RT::Base;
+use Encode qw();
 
-use strict;
+our $_TABLE_ATTR = { };
 
-our $_TABLE_ATTR;
+use RT::Base;
 our @ISA = qw(RT::Base);
 my $base = 'DBIx::SearchBuilder::Record::Cachable';
 if ( $RT::Config && $RT::Config->Get('DontCacheSearchBuilderRecords') ) {
@@ -653,11 +657,6 @@
 
 }
 
-require Encode::compat if $] < 5.007001;
-require Encode;
-
-
-
 
 sub __Value {
     my $self  = shift;