From baea9881f79690552b0aa3ca6844bbf64fa6e55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A1draig=20Brady?= Date: Sun, 24 Mar 2024 20:12:53 +0000 Subject: [PATCH] doc: fix translation issue in chown/chgrp amalgamation * src/chown-core.h (emit_from_option_description): The conditional string composition here caused issues for translators. Instead move to a more general description ... (src/chown.c (usage): ... here. Fixes https://bugs.gnu.org/69985 --- src/chown-core.h | 12 ------------ src/chown.c | 8 +++++++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/chown-core.h b/src/chown-core.h index e1396e3ea..4bd68fed4 100644 --- a/src/chown-core.h +++ b/src/chown-core.h @@ -89,16 +89,4 @@ chown_files (char **files, int bit_flags, struct Chown_option const *chopt) _GL_ATTRIBUTE_NONNULL (); -static inline void -emit_from_option_description (bool user) -{ - printf (_("\ - --from=CURRENT_OWNER:CURRENT_GROUP\n\ - change the %sgroup of each file only if\n\ - its current owner and/or group match those specified\n\ - here. Either may be omitted, in which case a match\n\ - is not required for the omitted attribute\n\ -"), user ? "owner and/or " : ""); -} - #endif /* CHOWN_CORE_H */ diff --git a/src/chown.c b/src/chown.c index 90ce84d67..3194dc75f 100644 --- a/src/chown.c +++ b/src/chown.c @@ -109,7 +109,13 @@ With --reference, change the group of each FILE to that of RFILE.\n\ (useful only on systems that can change the\n\ ownership of a symlink)\n\ "), stdout); - emit_from_option_description (chown_mode == CHOWN_CHOWN); + fputs (_("\ + --from=CURRENT_OWNER:CURRENT_GROUP\n\ + change the ownership of each file only if its\n\ + current owner and/or group match those specified here.\n\ + Either may be omitted, in which case a match\n\ + is not required for the omitted attribute\n\ +"), stdout); fputs (_("\ --no-preserve-root do not treat '/' specially (the default)\n\ --preserve-root fail to operate recursively on '/'\n\ -- 2.44.0