Changeset 1549 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Timestamp:

12/28/15 17:45:18 (9 years ago)

Author:

nanardon

Message:

Fix I18N

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases.pm (modified) (1 diff)
• Bases/Sql/User.pm (modified) (3 diffs)
• I18N.pm (modified) (3 diffs)
• I18N/fr.po (deleted)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm

@@ -384 +384 @@
     my ($self, $otype, $id, %data) = @_;
     "$id" or do {
-        $self->log(LA_ERR, _("Cannot create %s object with empty id"),
+        $self->log(LA_ERR, l("Cannot create %s object with empty id"),
             $otype);
         return;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -13 +13 @@
 use DateTime::TimeZone;
 use base qw(LATMOS::Accounts::Bases::Sql::objects);
+use LATMOS::Accounts::I18N;
 
 our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
@@ -194 +195 @@
                 formopts => { rawvalue => 1, },
                 monitored => 1,
+                label => sub { l('Locked') },
             },
             expire        => {
@@ -493 +495 @@
             },
             manager => {
+                label => l('Manager'),
                 reference => 'user',
                 ro => 1,

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/I18N.pm

@@ -19 +19 @@
 
 @ISA = qw(Exporter);
-@EXPORT = qw(N);
-@EXPORT_OK = qw(N);
+@EXPORT = 'l';
+@EXPORT_OK = 'l';
 
 my $init;
 
 if (!$init) {
-    POSIX::setlocale(POSIX::LC_ALL(), "");
-    Locale::gettext::bind_textdomain_codeset('LATMOS::Accounts', 'UTF-8');
+    #POSIX::setlocale(POSIX::LC_ALL(), "");
+    if (-d 'po') {
+        Locale::gettext::bindtextdomain('linkaccounts', 'po')
+    }
+    Locale::gettext::bind_textdomain_codeset('linkaccounts', 'UTF-8');
     $init = 1;
 }
@@ -32 +35 @@
 =head1 FUNCTIONS
 
-=head2 N($text, @args)
+=head2 l($text, @args)
 
 Return the translate messsage, using printf.
@@ -38 +41 @@
 =cut
 
+sub l { 
+    my ($text, @args) = @_;
+    my $trans = Locale::gettext::dgettext('linkaccounts', $text || '');
 
-sub N { 
-    my ($text, @args) = @_;
-    my $trans = Locale::gettext::dgettext('LATMOS::Accounts', $text || '');
     return sprintf($trans || $text, @args);
 }