[freeside-commits] freeside/FS/FS Maketext.pm, NONE, 1.1 Mason.pm, 1.73, 1.74

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv3696/FS/FS

Modified Files:
	Mason.pm 
Added Files:
	Maketext.pm 
Log Message:
i18n, RT#12515

--- NEW FILE: Maketext.pm ---
package FS::Maketext;

use base qw( Exporter );
use FS::CurrentUser;
use FS::Conf;
use FS::L10N;

our @EXPORT_OK = qw( mt );

our $lh;

sub mt {
  $lh ||= lh();
  $lh->maketext(@_);
}

sub lh {
  my $locale =  $FS::CurrentUser::CurrentUser->option('locale')
             || FS::Conf->new->config('locale')
             || 'en_US';
  $locale =~ s/_/-/g;
  FS::L10N->get_handle($locale) || die "Unknown locale $locale";
}

# XXX pod me

1;

Index: Mason.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason.pm,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -w -d -r1.73 -r1.74
--- Mason.pm	13 May 2011 20:03:20 -0000	1.73
+++ Mason.pm	14 May 2011 00:30:43 -0000	1.74
@@ -140,7 +140,7 @@
   use FS::NetworkMonitoringSystem;
   use FS::Tron qw( tron_lint );
   use FS::Locales;
-  use FS::L10N;
+  use FS::Maketext qw( mt );
 
   use FS::agent;
   use FS::agent_type;
@@ -410,11 +410,6 @@
     $m->comp('/elements/errorpage-popup.html', @_);
   }
 
-  sub mt {
-    use vars qw($lh);
-    $lh->maketext(@_);
-  }
-
   sub redirect {
     my( $location ) = @_;
     use vars qw($m);