Changeset 1546

Timestamp:

12/28/15 15:45:11 (8 years ago)

Author:

nanardon

Message:

Add I18N support

Location:

trunk

Files:

• LATMOS-Accounts-Web/Makefile.PL (modified) (2 diffs)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N (added)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po (added)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot (added)
• LATMOS-Accounts-Web/root/html/includes/defs.tt (modified) (1 diff)
• LATMOS-Accounts-Web/root/html/includes/wrapper.tt (modified) (1 diff)
• LATMOS-Accounts/MANIFEST (modified) (1 diff)
• LATMOS-Accounts/Makefile.PL (modified) (4 diffs)
• LATMOS-Accounts/bin/la-query (modified) (2 diffs)
• LATMOS-Accounts/latmos-accounts.spec.in (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N (added)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N/fr.po (added)
• LATMOS-Accounts/lib/LATMOS/Accounts/I18N/messages.pot (added)

trunk/LATMOS-Accounts-Web/Makefile.PL

@@ -15 +15 @@
 requires 'Catalyst::Plugin::Session::State::Cookie' => '0';
 requires 'Catalyst::Plugin::Prototype' => '0';
+requires 'Catalyst::Plugin::I18N' => '0';
 requires 'Catalyst::View::TT' => '0';
 requires 'LATMOS::Accounts' => '0';
@@ -32 +33 @@
 
 sub postamble {
+    my @po = map { m:lib/LATMOS/Accounts/Web/I18N/([^\.]+)\.po$:; $1 }
+            glob('lib/LATMOS/Accounts/Web/I18N/*.po');
+
+    my $makepo = join("\n\n", map {
+        "
+lib/LATMOS/Accounts/Web/I18N/$_.po: lib/LATMOS/Accounts/Web/I18N/messages.pot
+\t[ -f lib/LATMOS/Accounts/Web/I18N/$_.po ] || msginit --no-translator --input=lib/LATMOS/Accounts/Web/I18N/messages.pot --output= --locale=$_
+\tmsgmerge -U lib/LATMOS/Accounts/Web/I18N/$_.po lib/LATMOS/Accounts/Web/I18N/messages.pot
+
+        "
+        } @po
+    );
+
+    $makepo .= "\n\npo: " . join(' ', map { "lib/LATMOS/Accounts/Web/I18N/$_.po" } @po) . "\n";
+
     <<EOF;
-# .PHONY .= svnmanifest
+.PHONY: lib/LATMOS/Accounts/Web/I18N/messages.pot
+
+pot: lib/LATMOS/Accounts/Web/I18N/messages.pot
+
+lib/LATMOS/Accounts/Web/I18N/messages.pot:
+\tcat MANIFEST | egrep '^(lib|root/html)' | xargs xgettext.pl -o lib/LATMOS/Accounts/Web/I18N/messages.pot
+
+$makepo
 
 svnmanifest:

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

@@ -24 +24 @@
     Prototype
     XMLRPC
+    I18N
     /;
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -31 +31 @@
 sub begin : Private {
     my ( $self, $c ) = @_;
+
+    my ($locale) = split(';', $c->req->header('Accept-Language') || '');
+    if (my $plocale = ($c->req->param('locale')|| $c->session->{'locale'})) {
+        $c->session->{'locale'} = $locale = $plocale;
+    }
+    $c->languages($locale ? [ $locale ] : '');
 
     if ($c->user_exists) {

trunk/LATMOS-Accounts-Web/root/html/includes/defs.tt

@@ +1 @@
+[% MACRO l(text, args) BLOCK;
+    c.localize(text, args);
+END; %]
 
 [% perm_denied = BLOCK %]

trunk/LATMOS-Accounts-Web/root/html/includes/wrapper.tt

@@ -45 +45 @@
 
 <h1 style="">
-    Gestion informatique
+    [% l('IT management') %]
     [% IF c.config.company %]
     - [% c.config.company | html %]

trunk/LATMOS-Accounts/MANIFEST

@@ -103 +103 @@
 lib/LATMOS/Accounts/Bases/Zimbra/User.pm
 lib/LATMOS/Accounts/Cli.pm
+lib/LATMOS/Accounts/I18N/fr.po
+lib/LATMOS/Accounts/I18N/messages.pot
 lib/LATMOS/Accounts/Log.pm
 lib/LATMOS/Accounts/Mail.pm

trunk/LATMOS-Accounts/Makefile.PL

@@ -73 +73 @@
             DESTINSTALLMAN5DIR  => '$(DESTDIR)$(INSTALLMAN5DIR)',
             DESTINSTALLMAN8DIR  => '$(DESTDIR)$(INSTALLMAN8DIR)',
+            LOCALEDIR           => '/usr/share/locale',
             INST_MAN5DIR        => 'blib/man5',
             INST_MAN8DIR        => 'blib/man8',
@@ -96 +97 @@
 
 sub postamble {
+
+    my @po = map { m:lib/LATMOS/Accounts/I18N/([^\.]+)\.po$:; $1 }
+            glob('lib/LATMOS/Accounts/I18N/*.po');
+
+    my $makepo = join("\n\n", map {
+        "
+lib/LATMOS/Accounts/I18N/$_.po: lib/LATMOS/Accounts/I18N/messages.pot
+\t[ -f lib/LATMOS/Accounts/I18N/$_.po ] || msginit --no-translator --input=lib/LATMOS/Accounts/I18N/messages.pot --output= --locale=$_
+\tmsgmerge -U lib/LATMOS/Accounts/I18N/$_.po lib/LATMOS/Accounts/I18N/messages.pot
+
+        "
+        } @po
+    );
+
+    $makepo .= "\n\npo: " . join(' ', map { "lib/LATMOS/Accounts/I18N/$_.po" } @po) . "\n";
+
     <<EOF;
 #.PHONY .= svnmanifest
+
+pot: lib/LATMOS/Accounts/I18N/messages.pot
+
+lib/LATMOS/Accounts/I18N/messages.pot:
+\tcat MANIFEST | egrep '^(lib|bin)' | xargs xgettext.pl -o lib/LATMOS/Accounts/I18N/messages.pot
+
+$makepo
 
 bin/la-sql-upgrade: bin/la-sql-upgrade.in
@@ -158 +182 @@
     my $section = $self->SUPER::install();
 
-    $section =~ s/(^install ::.*)/$1 install_config install_templates install_data/m;
+    $section =~ s/(^install ::.*)/$1 install_config install_templates install_data install_po/m;
     $section =~ s/\$\(INST_BIN\) \$\(DESTINSTALL(\w*)BIN\)/$& \$(INST_MAN5DIR) \$(DESTINSTALLMAN5DIR) \$(INST_MAN8DIR) \$(DESTINSTALLMAN8DIR)/g;
 
@@ -179 +203 @@
         $(ABSPERLRUN) -MExtUtils::Install -e 'install({ sqldata => @ARGV })' \\
             $(DESTDIR)$(DATADIR)
+
+install_po ::
+        install -d $(DESTDIR)$(LOCALEDIR)/LATMOS::Accounts
+        $(ABSPERLRUN) -MExtUtils::Install -e 'install({ "lib/LATMOS/Accounts/I18N" => @ARGV })' \\
+        $(DESTDIR)$(LOCALEDIR)/LATMOS::Accounts
 ];
   

trunk/LATMOS-Accounts/bin/la-query

@@ -6 +6 @@
 use Getopt::Long;
 use Pod::Usage;
+use LATMOS::Accounts::I18N;
 
 =head1 NAME
@@ -115 +116 @@
 my $LA = LATMOS::Accounts->new($config, noacl => 1);
 my $labase = $LA->base($base);
-$labase && $labase->load or die "Cannot load base";
+$labase && $labase->load or die N("Cannot load base %s\n", $base);
 
 $labase->unexported($nounexp ? 0 : 1);

trunk/LATMOS-Accounts/latmos-accounts.spec.in

@@ -35 +35 @@
 BuildRequires: perl(HTTP::Cookies)
 BuildRequires: perl(XML::XPath)
+BuildRequires: perl(Locale::gettext)
 
 Requires: perl(Mail::Sendmail)
@@ -98 +99 @@
 %perl_vendorlib/*
 %_datadir/latmos-accounts
+%_datadir/locale/*

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

@@ -10 +10 @@
 use LATMOS::Accounts::Log;
 use LATMOS::Accounts::Acls;
+use LATMOS::Accounts::I18N;
 
 our $VERSION = '5.0.11';

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, _("Cannot create %s object with empty id"),
             $otype);
         return;