Skip to contentSkip to conversation

archive-zip: refactor 'path too long' error message to use Q_()

PATCH Superseded [email protected] 2 participants 2 messages Oct 19 – Oct 20 1 message not in the archive

v2 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): 1a15474a4114ba8b

#1 lore raw

PATCH v2 1/1 archive-zip: refactor 'path too long' error message to use Q_()

From: Keryle Fondji <[email protected]>

Replace _() with Q_() in the 'path too long' error message. Although pathlen is always greater than 0xffff when this error is hit, Q_() is required to support correct translation for languages that require different plural forms depending on the count.

---
 archive-zip.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
archive-zip.c +1 -1
index 6f73ca6d58..e4f8ef5a36 100644
@@ -328,7 +328,7 @@ static int write_zip_entry(struct archiver_args *args,
 	}
 
 	if (pathlen > 0xffff) {
-		return error(_("path too long (%d chars, SHA1: %s): %s"),
+		return error(Q_("path too long (%d char, SHA1: %s): %s", "path too long (%d chars, SHA1: %s): %s", pathlen),
 				(int)pathlen, oid_to_hex(oid), path);
 	}
 
Signature · 1 line
2.53.0
#2 lore raw

Hi Keryle

Quoted 6 lines · On 19/10/2026 16:27, [email protected] wrote:

From: Keryle Fondji <[email protected]>

Replace _() with Q_() in the 'path too long' error message. Although pathlen is always greater than 0xffff when this error is hit, Q_() is required to support correct translation for languages that require different plural forms depending on the count.

This is good. As Junio has pointed out the code needs wrapping now that it is using Q_().

Thanks

Phillip

Quoted 18 lines
---
  archive-zip.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
archive-zip.c +1 -1
index 6f73ca6d58..e4f8ef5a36 100644
@@ -328,7 +328,7 @@ static int write_zip_entry(struct archiver_args *args,
  	}
 
  	if (pathlen > 0xffff) {
-		return error(_("path too long (%d chars, SHA1: %s): %s"),
+		return error(Q_("path too long (%d char, SHA1: %s): %s", "path too long (%d chars, SHA1: %s): %s", pathlen),
  				(int)pathlen, oid_to_hex(oid), path);
  	}