From 33f697e1ebf2ca4a68479c7769ecc93dd0ee28e3 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Sep 2018 11:00:22 +0100
Subject: i18n: Rename ___ to f_

I have decided that's a better name.  Not _f because, unlike
printf (where f is done first, and then print), here the _ is done
first and then f.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Debian/Dgit.pm      | 2 +-
 Debian/Dgit/I18n.pm | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'Debian')

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;
-- 
cgit v1.2.3