diff options
| -rw-r--r-- | Debian/Dgit.pm | 2 | ||||
| -rw-r--r-- | Debian/Dgit/I18n.pm | 6 | ||||
| -rwxr-xr-x | dgit | 2 | ||||
| -rwxr-xr-x | git-debrebase | 2 | ||||
| -rw-r--r-- | po/Makefile | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm index b1aa620..4b340d9 100644 --- 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; - fail ___ "missing field %s in %s", $field, $dctrl->get_option('name'); + fail f_ "missing field %s in %s", $field, $dctrl->get_option('name'); } sub parsechangelog_loop ($$$) { diff --git a/Debian/Dgit/I18n.pm b/Debian/Dgit/I18n.pm index c6f9e16..b86fec8 100644 --- a/Debian/Dgit/I18n.pm +++ b/Debian/Dgit/I18n.pm @@ -4,7 +4,7 @@ package Debian::Dgit::I18n; # This module provides # __ a function which is an alias for gettext -# ___ sprintf wrapper that gettexts the format +# f_ sprintf wrapper that gettexts the format # # In perl the sub `_' is a `superglobal', which means there # is only one of it in the whole program and every reference @@ -16,11 +16,11 @@ use Locale::gettext; BEGIN { use Exporter; @ISA = qw(Exporter); - @EXPORT = qw(__ ___); + @EXPORT = qw(__ f_); } sub __ { gettext @_; } -sub ___ { my $f = shift @_; sprintf +(gettext $f), @_; } +sub f_ { my $f = shift @_; sprintf +(gettext $f), @_; } 1; @@ -1474,7 +1474,7 @@ sub madison_get_parse { sub canonicalise_suite_madison { # madison canonicalises for us my @r = madison_get_parse(@_); - @r or fail ___ + @r or fail f_ "unable to canonicalise suite using package %s". " which does not appear to exist in suite %s;". " --existing-package may help", diff --git a/git-debrebase b/git-debrebase index 4a3ed25..645b072 100755 --- a/git-debrebase +++ b/git-debrebase @@ -3008,7 +3008,7 @@ if (!@ARGV || $opt_defaultcmd_interactive || $ARGV[0] =~ m{^-}) { $cmdfn =~ y/-/_/; $cmdfn = ${*::}{"cmd_$cmdfn"}; - $cmdfn or badusage ___ "unknown git-debrebase sub-operation %s", $cmd; + $cmdfn or badusage f_ "unknown git-debrebase sub-operation %s", $cmd; $cmdfn->(); } diff --git a/po/Makefile b/po/Makefile index 4e043eb..2ba5e60 100644 --- a/po/Makefile +++ b/po/Makefile @@ -84,7 +84,7 @@ messages.pot: $(if $(SUPPRESS_PO_UPDATE),,$(POTS)) %.mo: %.po $S msgfmt -o $@ $< -XGETTEXT_OPTS += -Lperl -k__ -k___ +XGETTEXT_OPTS += -Lperl -k__ -kf_ XGETTEXT_OPTS += --from-code=UTF-8 XGETTEXT_OPTS += --package-name=dgit --package-version=ongoing # The --package-* avoids this error from make check's `msgfmt -c' |