From 547a6107ce362fb9cd5b4bb60646d4242b6b9585 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 11 Jan 2024 19:32:40 +0100 Subject: [PATCH] fix: improve translatable string description --- frappe/gettext/extractors/doctype.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/frappe/gettext/extractors/doctype.py b/frappe/gettext/extractors/doctype.py index 2a03e9b1ec..5c0378667f 100644 --- a/frappe/gettext/extractors/doctype.py +++ b/frappe/gettext/extractors/doctype.py @@ -22,12 +22,18 @@ def extract(fileobj, *args, **kwargs): for field in fields: fieldtype = field.get("fieldtype") + label = field.get("label") - if label := field.get("label"): + if label: messages.append((label, f"Label of a {fieldtype} field in DocType '{doctype}'")) + _label = label + else: + _label = field.get("fieldname") if description := field.get("description"): - messages.append((description, f"Description of a {fieldtype} field in DocType '{doctype}'")) + messages.append( + (description, f"Description of the '{_label}' ({fieldtype}) field in DocType '{doctype}'") + ) if message := field.get("options"): if fieldtype == "Select": @@ -37,10 +43,16 @@ def extract(fileobj, *args, **kwargs): continue messages.extend( - (option, f"Option for a Select field in DocType '{doctype}'") for option in select_options + ( + option, + f"Option for the '{_label}' ({fieldtype}) field in DocType '{doctype}'", + ) + for option in select_options ) elif fieldtype == "HTML": - messages.append((message, f"Content of an HTML field in DocType '{doctype}'")) + messages.append( + (message, f"Content of the '{_label}' ({fieldtype}) field in DocType '{doctype}'") + ) for link in links: if group := link.get("group"):