summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-10-29 19:41:04 +0100
committerMichał Górny <mgorny@gentoo.org>2020-10-29 21:25:13 +0100
commitf400b9b53ce0dddb41adaad0c27c96a57c90bf49 (patch)
treeedac4d96de3fc687b3fa8d90e0a04d45c7794693 /dev-python/django/files
parentsys-kernel/gentoo-kernel: Bump to 5.9.2 (diff)
downloadgentoo-f400b9b53ce0dddb41adaad0c27c96a57c90bf49.tar.gz
gentoo-f400b9b53ce0dddb41adaad0c27c96a57c90bf49.tar.bz2
gentoo-f400b9b53ce0dddb41adaad0c27c96a57c90bf49.zip
dev-python/django: Backport gettext-0.21 compat fix
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/django/files')
-rw-r--r--dev-python/django/files/django-gettext-0.21.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/dev-python/django/files/django-gettext-0.21.patch b/dev-python/django/files/django-gettext-0.21.patch
new file mode 100644
index 000000000000..5d3edfea4a1e
--- /dev/null
+++ b/dev-python/django/files/django-gettext-0.21.patch
@@ -0,0 +1,39 @@
+From 07a30f561661efae1691ff45d10ec6014b395b58 Mon Sep 17 00:00:00 2001
+From: Max Smolens <msmolens@gmail.com>
+Date: Tue, 6 Oct 2020 17:58:52 -0400
+Subject: [PATCH] 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.
+---
+ AUTHORS | 1 +
+ tests/i18n/commands/code.sample | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index b10852f407a4..9253740857de 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -622,6 +622,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 a5f1520ecba5..2c305a3a1dcf 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('')