summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Smolens <msmolens@gmail.com>2020-10-06 17:58:52 -0400
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2020-11-02 10:29:51 +0100
commitc506639b425ca876b2d9a633fc6410e917d45605 (patch)
tree4388dbb4eb75751c78857caac00037c728484824
parent008d49caa2cc0f1fdd3f13d047c4f13a5e811b39 (diff)
downloaddjango-c506639b425ca876b2d9a633fc6410e917d45605.tar.gz
[3.0.x] Fixed #31850 -- Fixed BasicExtractorTests.test_extraction_warning with xgettext 0.21+.
"format string with unnamed arguments cannot be properly localized" warning is not raised in xgettext 0.21+. This patch uses a message that causes an xgettext warning regardless of the version. Backport of 07a30f561661efae1691ff45d10ec6014b395b58 from master
-rw-r--r--AUTHORS1
-rw-r--r--tests/i18n/commands/code.sample4
2 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index 2431fe61e1..fd965302bb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -600,6 +600,7 @@ answer newbie questions, and generally made Django that much better:
mattycakes@gmail.com
Max Burstein <http://maxburstein.com>
Max Derkachev <mderk@yandex.ru>
+ Max Smolens <msmolens@gmail.com>
Maxime Lorant <maxime.lorant@gmail.com>
Maxime Turcotte <maxocub@riseup.net>
Maximilian Merz <django@mxmerz.de>
diff --git a/tests/i18n/commands/code.sample b/tests/i18n/commands/code.sample
index a5f1520ecb..2c305a3a1d 100644
--- a/tests/i18n/commands/code.sample
+++ b/tests/i18n/commands/code.sample
@@ -1,4 +1,4 @@
from django.utils.translation import gettext
-# This will generate an xgettext warning
-my_string = gettext("This string contain two placeholders: %s and %s" % ('a', 'b'))
+# This will generate an xgettext "Empty msgid" warning.
+my_string = gettext('')