Changeset 30137 in osm

Timestamp:

2013-12-19T17:04:32+01:00 (11 years ago)

Author:

holgermappt

Message:

Update of translation chain. Added translated languages.

Location:

applications/editors/josm/plugins/photoadjust

Files:

• build.xml (modified) (1 diff)
• data/ca.lang (added)
• data/de.lang (modified) ( previous)
• data/en.lang (modified) ( previous)
• data/it.lang (added)
• data/ja.lang (added)
• data/ru.lang (added)
• data/uk.lang (added)
• poimport.pl (moved) (moved from applications/editors/josm/plugins/photoadjust/importpo.pl ) (3 diffs)
• pomerge.pl (added)

applications/editors/josm/plugins/photoadjust/build.xml

@@ -59 +59 @@
     <target name="gettext-init" description="Loads the Ant gettext and contrib tasks.">
         <taskdef name="gettext-extract" classname="org.xnap.commons.ant.gettext.GettextExtractKeysTask" classpath="${gettexttasks.jar}"/>
-        <taskdef name="gettext-merge" classname="org.xnap.commons.ant.gettext.GettextMergeKeysTask" classpath="${gettexttasks.jar}"/>
     </target>
     <target name="pot" description="Extract translatable strings from source." depends="gettext-init">
         <mkdir dir="po"/>
-        <gettext-extract keysFile="photoadjust.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
+        <gettext-extract keysFile="${ant.project.name}.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
             <fileset dir="src" includes="**/*.java"/>
         </gettext-extract>
+        <echo file="po/${ant.project.name}.pot" append="true">
+#. Plugin ${ant.project.name}
+#: build.xml:1
+msgid "${plugin.description}"
+msgstr ""
+</echo>
     </target>
-    <target name="pomerge" description="Merge extracted strings into language files." depends="gettext-init">
-        <gettext-merge keysFile="photoadjust.pot" poDirectory="po"/>
+    <target name="pomerge" description="Merge extracted strings into language files.">
+        <exec executable="perl">
+            <arg line="pomerge.pl"/>
+        </exec>
     </target>
     <target name="poimport" description="Import the PO files from the tarball launchpad-export.tar.gz exported from Launchpad.">
         <exec executable="perl">
-            <arg line="importpo.pl"/>
+            <arg line="poimport.pl"/>
         </exec>
     </target>

applications/editors/josm/plugins/photoadjust/poimport.pl

@@ -1 +1 @@
 #! /usr/bin/perl -w
 ###
-### importpo.pl - Import the translation from the tarball downloaded
-### from Launchpad.
+### poimport.pl - Import the translation from the tarball downloaded
+###     from Launchpad.
 
 use strict;
@@ -8 +8 @@
 use Cwd;
 use File::Spec::Functions;
+use File::Basename;
 
-### Name of the tarball downloaded from Launchpad.
+### Name of the tarball downloaded from Launchpad.  Or download URL.
+### Or JOSM translation branch revision number.
 my $tarball = "launchpad-export.tar.gz";
-### Temporary directory.
+#$tarball = "http://launchpadlibrarian.net/159932691/launchpad-export.tar.gz";
+#$tarball = "http://bazaar.launchpad.net/~openstreetmap/josm/josm_trans/tarball/747";
+#$tarball = "747";
+### Temporary directory.  A unique directory name that is not used for
+### anything else.
 my $workdir = "importpo";
 ### Remove the temp. directory after the work is done (0/1)?
@@ -19 +25 @@
 my $podir = "po";
 
+### Check for arguments.  The only supported argument is the tarball.
+if ($#ARGV == 0) {
+  $tarball = $ARGV[0];
+}
+elsif ($#ARGV > 0) {
+  die "This script accepts only one argument.\n";
+}
+
+### Check for JOSM translation branch revision number.
+if ($tarball =~ m/^\d+$/) {
+  $tarball = "http://bazaar.launchpad.net/~openstreetmap/josm/josm_trans/"
+    . "tarball/" . $tarball;
+}
+
+### Check if tarball is a URL and download it.  The downloaded file
+### will not be removed and is available for a second import.
+my $downurl;
+if ($tarball =~ m,^http://.+/([^/]+)$,) {
+  ### URL: Download file.
+  $downurl = $tarball;
+  my $downfile = $1;
+  if ($downfile =~ m/^\d+$/) {
+    ### Download of revision number.
+    if ($tarball =~ m:/([^/]+)/tarball/(\d+)$:) {
+      $downfile = $1 . "_" . $2 . ".tar.gz";
+    }
+    else {
+      $downfile .= ".tar.gz";
+    }
+  }
+  print "Will download file $downfile from $downurl.\n";
+  system("wget -O $downfile $downurl") == 0 or die "wget failed: $?";
+  $tarball = $downfile;
+}
+
 die "Tarball $tarball not found.\n" if (! -r $tarball);
 if (! -d $workdir) {
-  mkdir $workdir or die "Failed to create directory $workdir: $!";
+  mkdir $workdir or die "Failed to create work directory $workdir: $!";
 }
 copy($tarball, $workdir);
 my $startdir = getcwd();
 chdir $workdir;
-system "tar -xf $tarball";
-foreach my $lpponame (split("\n", `find po -name "*.po"`)) {
-  if ($lpponame =~ /([a-zA-Z_]+\.po)/) {
-    my $poname = $1;
+my $tarballfile = basename($tarball);
+system "tar -xf $tarballfile";
+print "Copy language files:";
+foreach my $lpponame (split("\n", `find . -name "*.po"`)) {
+  if ($lpponame =~ /([a-zA-Z_@]+)\.po/) {
+    my $lang = $1;
+    my $poname = $1 . ".po";
+    print " $lang";
     copy($lpponame, catfile($startdir, $podir, $poname));
   }
 }
+print "\n";
 
 if ($rmworkdir) {