summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2022-11-21 15:00:11 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2022-12-12 12:23:19 +0100
commite12714441302678973fc6088ddf765820ab4fa0a (patch)
treed37d06b5e199338dd204b7d5396945e016a95cc2
parent59c408b9f656f501f00242b1177af170f7768e9a (diff)
downloadIshtar-e12714441302678973fc6088ddf765820ab4fa0a.tar.bz2
Ishtar-e12714441302678973fc6088ddf765820ab4fa0a.zip
Fix choice display - non relevant translation is deactivated
-rw-r--r--CHANGES.md2
-rw-r--r--ishtar_common/models_common.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index a31cdae20..71f1e6ed1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,8 @@ date: 2022-11-21
### Bug fixes ###
- Fix redirect URL after logout
+- Fix choice display - non relevant translation is deactivated
+
v4.0.28 - 2022-11-18
--------------------
diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py
index dc35cade2..54217ae4f 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -458,7 +458,7 @@ class GeneralType(Cached, models.Model):
if default:
try:
default = cls.objects.get(txt_idx=default)
- yield (default.pk, _(str(default)))
+ yield (default.pk, str(default))
except cls.DoesNotExist:
pass
items = cls.objects.filter(**dct)
@@ -566,7 +566,7 @@ class GeneralType(Cached, models.Model):
p += cls.PREFIX_EMPTY
else:
p += cls.PREFIX
- lst.append((child[0], SafeText(p + str(_(child[1])))))
+ lst.append((child[0], SafeText(p + child[1])))
clast_of = last_of[:]
clast_of.append(idx + 1 == total)
if instances: