i18n: Flag a handful of messages for translation

This is just useful for testing the forthcoming machinery, so far.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 6642917a093d20a952d39e0efd092a5c473da436..b1aa620366daefb40079b287ea400c458dab42e2 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -672,7 +672,7 @@ sub getfield ($$) {
     my ($dctrl,$field) = @_;
     my $v = $dctrl->{$field};
     return $v if defined $v;
     my ($dctrl,$field) = @_;
     my $v = $dctrl->{$field};
     return $v if defined $v;

-    fail "missing field $field in ".$dctrl->get_option('name');
+    fail ___ "missing field %s in %s", $field, $dctrl->get_option('name');

 }
 
 sub parsechangelog_loop ($$$) {
 }
 
 sub parsechangelog_loop ($$$) {

diff --git a/dgit b/dgit
index 6a3c4da6cf7c0a22f0c71f29c3ea6d5b8c1d62eb..238d32485848599362e37b2603d3471242d6e074 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1474,10 +1474,11 @@ sub madison_get_parse {
 sub canonicalise_suite_madison {
     # madison canonicalises for us
     my @r = madison_get_parse(@_);
 sub canonicalise_suite_madison {
     # madison canonicalises for us
     my @r = madison_get_parse(@_);

-    @r or fail
-       "unable to canonicalise suite using package $package".
-       " which does not appear to exist in suite $isuite;".
-       " --existing-package may help";
+    @r or fail ___
+       "unable to canonicalise suite using package %s".
+       " which does not appear to exist in suite %s;".
+       " --existing-package may help",
+       $package, $isuite;

     return $r[0][2];
 }
 
     return $r[0][2];
 }
 


@@ -7192,7 +7193,7 @@ sub parseopts_late_defaults () {
        $$vr = $v;
     }
 
        $$vr = $v;
     }
 

-    fail "dgit: --include-dirty is not supported in split view quilt mode"
+    fail __ "dgit: --include-dirty is not supported in split view quilt mode"

        if $split_brain && $includedirty;
 
     if (!defined $cleanmode) {
        if $split_brain && $includedirty;
 
     if (!defined $cleanmode) {

diff --git a/git-debrebase b/git-debrebase
index 0ef1077ff67210c7eb5c3080bc068c3598f949be..4a3ed25ac149233e71783f39f98ac209c8821fff 100755 (executable)
--- a/git-debrebase
+++ b/git-debrebase
@@ -2066,7 +2066,7 @@ sub cmd_new_upstream () {
     my $old_upstream;
     if (!$old_anchor_cl->{OrigParents}) {
        snag 'anchor-treated',
     my $old_upstream;
     if (!$old_anchor_cl->{OrigParents}) {
        snag 'anchor-treated',

-           'old anchor is recognised due to --anchor, cannot check upstream';
+ __ 'old anchor is recognised due to --anchor, cannot check upstream';

     } else {
        $old_upstream = parsecommit
            $old_anchor_cl->{OrigParents}[0]{CommitId};
     } else {
        $old_upstream = parsecommit
            $old_anchor_cl->{OrigParents}[0]{CommitId};


@@ -2977,7 +2977,7 @@ getoptions_main
           'experimental-merge-resolution!', \$opt_merges,
           '-i:s' => sub {
               my ($opt,$val) = @_;
           'experimental-merge-resolution!', \$opt_merges,
           '-i:s' => sub {
               my ($opt,$val) = @_;

-              badusage "git-debrebase: no cuddling to -i for git-rebase"
+              badusage __ "git-debrebase: no cuddling to -i for git-rebase"

                   if length $val;
               die if $opt_defaultcmd_interactive; # should not happen
               $opt_defaultcmd_interactive = [ qw(-i) ];
                   if length $val;
               die if $opt_defaultcmd_interactive; # should not happen
               $opt_defaultcmd_interactive = [ qw(-i) ];


@@ -3008,7 +3008,7 @@ if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) {
     $cmdfn =~ y/-/_/;
     $cmdfn = ${*::}{"cmd_$cmdfn"};
 
     $cmdfn =~ y/-/_/;
     $cmdfn = ${*::}{"cmd_$cmdfn"};
 

-    $cmdfn or badusage "unknown git-debrebase sub-operation $cmd";
+    $cmdfn or badusage ___ "unknown git-debrebase sub-operation %s", $cmd;

     $cmdfn->();
 }
 
     $cmdfn->();
 }