Changeset 2240

Timestamp:

04/30/19 08:28:53 (5 years ago)

Author:

nanardon

Message:

Revert back po files

Location:

trunk/LATMOS-Accounts

Files:

• MANIFEST (modified) (1 diff)
• Makefile.PL (modified) (3 diffs)
• lib/LATMOS/Accounts/I18N.pm (modified) (1 diff)
• lib/LATMOS/Accounts/I18N/po/fr.po (deleted)
• lib/LATMOS/Accounts/I18N/po/messages.pot (deleted)

trunk/LATMOS-Accounts/MANIFEST

@@ -208 +208 @@
 testdata/synchro/source/passwd
 testdata/synchro/source/shadow
-lib/LATMOS/Accounts/I18N/po/messages.pot
-lib/LATMOS/Accounts/I18N/po/fr.po
+po/messages.pot
+po/fr.po

trunk/LATMOS-Accounts/Makefile.PL

@@ -5 +5 @@
 
 my @po;
-foreach (glob('lib/LATMOS/Accounts/I18N/po/*.po')) {
+foreach (glob('po/*.po')) {
     my ($po) = $_ =~  m:([^/\.]+)\.po$:;
     push (@po, $po);
@@ -126 +126 @@
         $makepo .=
 "
-lib/LATMOS/Accounts/I18N/po/$po.po: lib/LATMOS/Accounts/I18N/po/messages.pot
-\t[ -f lib/LATMOS/Accounts/I18N/po/$po.po ] || msginit --no-translator --input=lib/LATMOS/Accounts/I18N/po/messages.pot --output= --locale=$_
-\tmsgmerge -U lib/LATMOS/Accounts/I18N/po/$po.po lib/LATMOS/Accounts/I18N/po/messages.pot
-
-lib/LATMOS/Accounts/I18N/po/$po/LC_MESSAGES/linkaccounts.mo: lib/LATMOS/Accounts/I18N/po/$po.po
-\tinstall -d lib/LATMOS/Accounts/I18N/po/$po/LC_MESSAGES
+po/$po.po: po/messages.pot
+\t[ -f po/$po.po ] || msginit --no-translator --input=po/messages.pot --output= --locale=$_
+\tmsgmerge -U po/$po.po po/messages.pot
+
+po/$po/LC_MESSAGES/linkaccounts.mo: po/$po.po
+\tinstall -d po/$po/LC_MESSAGES
 \tmsgfmt -o \$@ \$<
 \n"
     }
 
-    $makepo .= "\n\npo: " . join(' ', map { "lib/LATMOS/Accounts/I18N/po/$_.po" } @po) . "\n";
-    $makepo .= "\n\nmo: " . join(' ', map { "lib/LATMOS/Accounts/I18N/po/$_/LC_MESSAGES/linkaccounts.mo" } @po) . "\n";
+    $makepo .= "\n\npo: " . join(' ', map { "po/$_.po" } @po) . "\n";
+    $makepo .= "\n\nmo: " . join(' ', map { "po/$_/LC_MESSAGES/linkaccounts.mo" } @po) . "\n";
 
     <<EOF;
-.PHONY: lib/LATMOS/Accounts/I18N/po/messages.pot
-
-pot: lib/LATMOS/Accounts/I18N/po/messages.pot
-
-lib/LATMOS/Accounts/I18N/po/messages.pot:
-\tcat MANIFEST | egrep '^(lib|bin)' | xargs xgettext.pl -o lib/LATMOS/Accounts/I18N/po/messages.pot
+.PHONY: po/messages.pot
+
+pot: po/messages.pot
+
+po/messages.pot:
+\tcat MANIFEST | egrep '^(lib|bin)' | xargs xgettext.pl -o po/messages.pot
 
 $makepo
@@ -235 +235 @@
     foreach (@po) {
         $section .= "\tinstall -d \$(DESTDIR)\$(LOCALEDIR)/$_/LC_MESSAGES\n";
-        $section .= "\tinstall lib/LATMOS/Accounts/I18N/po/$_/LC_MESSAGES/linkaccounts.mo \$(DESTDIR)\$(LOCALEDIR)/$_/LC_MESSAGES/linkaccounts.mo\n";
+        $section .= "\tinstall po/$_/LC_MESSAGES/linkaccounts.mo \$(DESTDIR)\$(LOCALEDIR)/$_/LC_MESSAGES/linkaccounts.mo\n";
     }
     $section .= "\n";

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

@@ -26 +26 @@
 if (!$init) {
 
-    my $Path = __FILE__;
-    $Path =~ s/\.pm$//;
-    $Path .= '/po';
-    if (-d $Path) {
-        Locale::gettext::bindtextdomain('linkaccounts', $Path)
+    if (-d 'po') {
+        Locale::gettext::bindtextdomain('linkaccounts', 'po')
     }
     Locale::gettext::bind_textdomain_codeset('linkaccounts', 'UTF-8');