View | Details | Raw Unified | Return to bug 9161
Collapse All | Expand All

(-)a/misc/translator/LangInstaller.pm (-3 / +3 lines)
Lines 320-326 sub install_tmpl { Link Here
320
            "-o $trans->{dir}/$self->{lang} ".
320
            "-o $trans->{dir}/$self->{lang} ".
321
            "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r " .
321
            "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r " .
322
            (
322
            (
323
                $files
323
                @$files
324
                    ? '-f ' . join ' -f ', @$files
324
                    ? '-f ' . join ' -f ', @$files
325
                    : ''
325
                    : ''
326
            )
326
            )
Lines 345-351 sub update_tmpl { Link Here
345
            "-i $trans->{dir}/en/ " .
345
            "-i $trans->{dir}/en/ " .
346
            "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r " .
346
            "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r " .
347
            (
347
            (
348
                $files
348
                @$files
349
                    ? '-f ' . join ' -f ', @$files
349
                    ? '-f ' . join ' -f ', @$files
350
                    : ''
350
                    : ''
351
            )
351
            )
Lines 380-386 sub create_tmpl { Link Here
380
            "-i $trans->{dir}/en/ " .
380
            "-i $trans->{dir}/en/ " .
381
            "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r " .
381
            "-s $self->{path_po}/$self->{lang}$trans->{suffix} -r " .
382
            (
382
            (
383
                $files
383
                @$files
384
                    ? '-f ' . join ' -f ', @$files
384
                    ? '-f ' . join ' -f ', @$files
385
                    : ''
385
                    : ''
386
            )
386
            )
(-)a/misc/translator/tmpl_process3.pl (-7 / +13 lines)
Lines 373-385 if ($action eq 'create') { Link Here
373
        (defined $charset_in? ('-I', $charset_in): ()),
373
        (defined $charset_in? ('-I', $charset_in): ()),
374
        (defined $charset_out? ('-O', $charset_out): ()));
374
        (defined $charset_out? ('-O', $charset_out): ()));
375
    if ($st == 0) {
375
    if ($st == 0) {
376
    # Merge the temporary "pot file" with the specified po file ($str_file)
376
        # Merge the temporary "pot file" with the specified po file ($str_file)
377
    # FIXME: msgmerge(1) is a Unix dependency
377
        # FIXME: msgmerge(1) is a Unix dependency
378
    # FIXME: need to check the return value
378
        # FIXME: need to check the return value
379
    $st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile2");
379
        if ( @filenames ) {
380
            my ($tmph3, $tmpfile3) = tmpnam();
381
            $st = system("msgcat $str_file $tmpfile2 > $tmpfile3");
382
            $st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile3")
383
                unless $st;
384
        } else {
385
            $st = system("msgmerge -U ".($quiet?'-q':'')." -s $str_file $tmpfile2");
386
        }
380
    } else {
387
    } else {
381
    error_normal "Text extraction failed: $xgettext: $!\n", undef;
388
        error_normal "Text extraction failed: $xgettext: $!\n", undef;
382
    error_additional "Will not run msgmerge\n", undef;
389
        error_additional "Will not run msgmerge\n", undef;
383
    }
390
    }
384
#   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
391
#   unlink $tmpfile1 || warn_normal "$tmpfile1: unlink failed: $!\n", undef;
385
#   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
392
#   unlink $tmpfile2 || warn_normal "$tmpfile2: unlink failed: $!\n", undef;
386
- 

Return to bug 9161