admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refs: mark invalid refname message for translation

Browse Source 
The error message produced by `transaction_refname_valid()` changes based
on whether the update is a ref update or a reflog update, with the use
of a ternary operator. This breaks translation since the sub-msg is not
marked for translation. Fix this by setting the entire message using a
`if {} else {}` block and marking each message for translation.

Signed-off-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Karthik Nayak
2024-12-20 13:58:37 +01:00
committed by Junio C Hamano
parent 246cebe320
commit 8ddcdc1bb3
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
refs.c
View File

@@ -1208,14 +1208,22 @@ static int transaction_refname_valid(const char *refname,
return 1;
if (is_pseudo_ref(refname)) {
const char *what = flags & REF_LOG_ONLY ? "reflog for pseudoref" : "pseudoref";
strbuf_addf(err, _("refusing to update %s '%s'"), what, refname);
const char *refusal_msg;
if (flags & REF_LOG_ONLY)
refusal_msg = _("refusing to update reflog for pseudoref '%s'");
else
refusal_msg = _("refusing to update pseudoref '%s'");
strbuf_addf(err, refusal_msg, refname);
return 0;
} else if ((new_oid && !is_null_oid(new_oid)) ?
check_refname_format(refname, REFNAME_ALLOW_ONELEVEL) :
!refname_is_safe(refname)) {
const char *what = flags & REF_LOG_ONLY ? "reflog with bad name" : "ref with bad name";
strbuf_addf(err, _("refusing to update %s '%s'"), what, refname);
const char *refusal_msg;
if (flags & REF_LOG_ONLY)
refusal_msg = _("refusing to update reflog with bad name '%s'");
else
refusal_msg = _("refusing to update ref with bad name '%s'");
strbuf_addf(err, refusal_msg, refname);
return 0;
}