From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NHn9c-0003Zr-6d for mharc-grub-devel@gnu.org; Mon, 07 Dec 2009 18:38:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NHn9X-0003TW-62 for grub-devel@gnu.org; Mon, 07 Dec 2009 18:38:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NHn9P-0003L4-AO for grub-devel@gnu.org; Mon, 07 Dec 2009 18:37:59 -0500 Received: from [199.232.76.173] (port=36456 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NHn9P-0003Ki-61 for grub-devel@gnu.org; Mon, 07 Dec 2009 18:37:55 -0500 Received: from 197.red-80-32-81.staticip.rima-tde.net ([80.32.81.197]:57650 helo=mail.pina.cat) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NHn9O-0004iT-VN for grub-devel@gnu.org; Mon, 07 Dec 2009 18:37:55 -0500 Received: from pinux (82-45-164-87.cable.ubr06.hari.blueyonder.co.uk [82.45.164.87]) by mail.pina.cat (Postfix) with ESMTP id AE6DB28415527 for ; Tue, 8 Dec 2009 00:37:53 +0100 (CET) Received: by pinux (Postfix, from userid 1000) id 4BEBD26EF; Mon, 7 Dec 2009 23:38:04 +0000 (GMT) Date: Mon, 7 Dec 2009 23:38:04 +0000 From: Carles Pina i Estany To: The development of GNU GRUB Message-ID: <20091207233804.GA14236@pina.cat> References: <20091207140923.GA6439@riva.ucam.org> <20091207201408.GA27276@pina.cat> <20091207205420.GI6439@riva.ucam.org> <20091207224630.GA31855@pina.cat> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="BOKacYhQ+x31HxR3" Content-Disposition: inline In-Reply-To: <20091207224630.GA31855@pina.cat> User-Agent: Mutt/1.5.20 (2009-06-14) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: Build failures on Ubuntu due to gettext X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2009 23:38:04 -0000 --BOKacYhQ+x31HxR3 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, On Dec/07/2009, Carles Pina i Estany wrote: > So I would apply your patch, after understanding that it's only for one more thing Colin. What do you think to not apply your patch and apply the attached patch? It force that the argument 1 of _ and N_ is a c-format (in this way appears in grub.pot). This is, IMO, correct approach. And then msgfmt -c checks the number of arguments. If other projects are not using this approach they could have some reason, like _("File") is a menu label and not a C format string. In this cases, if this happens in Grub it's not making things worse. Using it we should have all checks about the number of arguments and we are not programming warning oriented. If it's a linguism and wide accepted to do in the other way I personally don't have any strong objection. -- Carles Pina i Estany http://pinux.info --BOKacYhQ+x31HxR3 Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="always_c_format.patch" === modified file 'Makefile.in' --- Makefile.in 2009-11-30 01:25:57 +0000 +++ Makefile.in 2009-12-07 23:28:49 +0000 @@ -477,7 +477,7 @@ genkernsyms.sh: genkernsyms.sh.in config $(SHELL) ./config.status $(srcdir)/po/$(PACKAGE).pot: po/POTFILES po/POTFILES-shell - cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_ --keyword=N_ + cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f $< --keyword=_ --keyword=N_ --flag=N_:1:c-format --flag=_:1:c-format cd $(srcdir) && $(XGETTEXT) --from-code=utf-8 -o $@ -f po/POTFILES-shell -j --language=Shell $(foreach lang, $(LINGUAS), $(srcdir)/po/$(lang).po): po/$(PACKAGE).pot --BOKacYhQ+x31HxR3--