summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2020-08-27 14:23:31 +0300
committerPanu Matilainen <pmatilai@redhat.com>2020-12-10 13:28:07 +0200
commit838ffa18c7f59950869cd1f230e5c37c4e4747a1 (patch)
treedbc4da9fefc8a9933cfe59ea20a3768b281131c4
parentcd7f9303ef1070f027493cad7d00bc66935af2a0 (diff)
downloadrpm-838ffa18c7f59950869cd1f230e5c37c4e4747a1.tar.gz
Stop untranslatable format strings from being translated
There's nothing to translate in "%s: %s" and the like, don't bother people with this stuff. (cherry picked from commit a2e072d45243bcfaa7797514bb40c85e9b8fa74c)
-rw-r--r--build/parsePrep.c2
-rw-r--r--lib/formats.c4
-rw-r--r--lib/poptI.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/build/parsePrep.c b/build/parsePrep.c
index ff036995f..d92e5cdf0 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -451,7 +451,7 @@ static rpmRC doPatchMacro(rpmSpec spec, const char *line)
}
if (c < -1) {
- rpmlog(RPMLOG_ERR, _("%s: %s: %s\n"), poptStrerror(c),
+ rpmlog(RPMLOG_ERR, "%s: %s: %s\n", poptStrerror(c),
poptBadOption(optCon, POPT_BADOPTION_NOALIAS), line);
goto exit;
}
diff --git a/lib/formats.c b/lib/formats.c
index 1a7e9019d..848f442e2 100644
--- a/lib/formats.c
+++ b/lib/formats.c
@@ -113,13 +113,13 @@ static char * realDateFormat(rpmtd td, const char * strftimeFormat, char **emsg)
/* date formatting */
static char * dateFormat(rpmtd td, char **emsg)
{
- return realDateFormat(td, _("%c"), emsg);
+ return realDateFormat(td, "%c", emsg);
}
/* day formatting */
static char * dayFormat(rpmtd td, char **emsg)
{
- return realDateFormat(td, _("%a %b %d %Y"), emsg);
+ return realDateFormat(td, "%a %b %d %Y", emsg);
}
/* shell escape formatting */
diff --git a/lib/poptI.c b/lib/poptI.c
index e475924bf..26081777d 100644
--- a/lib/poptI.c
+++ b/lib/poptI.c
@@ -26,7 +26,7 @@ struct rpmInstallArguments_s rpmIArgs = {
RPM_GNUC_NORETURN
static void argerror(const char * desc)
{
- fprintf(stderr, _("%s: %s\n"), xgetprogname(), desc);
+ fprintf(stderr, "%s: %s\n", xgetprogname(), desc);
exit(EXIT_FAILURE);
}