Re: [pacman-dev] [PATCH v2 2/2] pacman/pacman-conf, testpkg: Added translatable strings

[Allan McRae]

On 10/9/19 7:33 pm, Matthew Sexton wrote:
> From: Matthew Sexton 
> 
> Added gettext macro to warnings, helps, and errors for translation.
> 
> Signed-off-by: Matthew Sexton 
> ---
> Changes in v2:
> - Moved "Include" outside of gettext macro so it doesn't get localised
> 

Great - both patches have been applied.

Allan

[pacman-dev] [PATCH v2 2/2] pacman/pacman-conf, testpkg: Added translatable strings

[Matthew Sexton]

From: Matthew Sexton 

Added gettext macro to warnings, helps, and errors for translation.

Signed-off-by: Matthew Sexton 
---
Changes in v2:
- Moved "Include" outside of gettext macro so it doesn't get localised

 src/pacman/pacman-conf.c | 44 +++-
 src/util/testpkg.c   | 29 +++---
 2 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/src/pacman/pacman-conf.c b/src/pacman/pacman-conf.c
index d9e596b8..efc62cdd 100644
--- a/src/pacman/pacman-conf.c
+++ b/src/pacman/pacman-conf.c
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include "conf.h"
+#include "util.h"
 
 const char *myname = "pacman-conf", *myver = "1.0.0";
 
@@ -37,17 +38,17 @@ static void cleanup(void)
 static void usage(int ret)
 {
FILE *stream = (ret ? stderr : stdout);
-   fputs("pacman-conf - query pacman's configuration file\n", stream);
-   fputs("usage:  pacman-conf [options] [...]\n", stream);
-   fputs("pacman-conf (--repo-list|--help|--version)\n", stream);
-   fputs("options:\n", stream);
-   fputs("  -c, --config=  set an alternate configuration file\n", 
stream);
-   fputs("  -R, --rootdir= set an alternate installation root\n", 
stream);
-   fputs("  -r, --repo=  query options for a specific repo\n", 
stream);
-   fputs("  -v, --verbosealways show directive names\n", stream);
-   fputs("  -l, --repo-list  list configured repositories\n", stream);
-   fputs("  -h, --help   display this help information\n", stream);
-   fputs("  -V, --versiondisplay version information\n", stream);
+   fputs(_("pacman-conf - query pacman's configuration file\n"), stream);
+   fputs(_("usage:  pacman-conf [options] [...]\n"), stream);
+   fputs(_("pacman-conf (--repo-list|--help|--version)\n"), 
stream);
+   fputs(_("options:\n"), stream);
+   fputs(_("  -c, --config=  set an alternate configuration 
file\n"), stream);
+   fputs(_("  -R, --rootdir= set an alternate installation root\n"), 
stream);
+   fputs(_("  -r, --repo=  query options for a specific repo\n"), 
stream);
+   fputs(_("  -v, --verbosealways show directive names\n"), 
stream);
+   fputs(_("  -l, --repo-list  list configured repositories\n"), 
stream);
+   fputs(_("  -h, --help   display this help information\n"), 
stream);
+   fputs(_("  -V, --versiondisplay version information\n"), 
stream);
cleanup();
exit(ret);
 }
@@ -76,7 +77,7 @@ static void parse_opts(int argc, char **argv)
break;
case 'R':
if ((config->rootdir = strdup(optarg)) == NULL) 
{
-   fprintf(stderr, "error setting rootdir 
'%s': out of memory\n", optarg);
+   fprintf(stderr, _("error setting 
rootdir '%s': out of memory\n"), optarg);
cleanup();
exit(1);
}
@@ -106,7 +107,7 @@ static void parse_opts(int argc, char **argv)
}
 
if(parseconfigfile(config_file) != 0 || setdefaults(config) != 0) {
-   fprintf(stderr, "error parsing '%s'\n", config_file);
+   fprintf(stderr, _("error parsing '%s'\n"), config_file);
cleanup();
exit(1);
}
@@ -286,7 +287,7 @@ static int list_repo_directives(void)
}
 
if(!repo) {
-   fprintf(stderr, "error: repo '%s' not configured\n", repo_name);
+   fprintf(stderr, _("error: repo '%s' not configured\n"), 
repo_name);
return 1;
}
 
@@ -303,10 +304,10 @@ static int list_repo_directives(void)
} else if(strcasecmp(i->data, "Usage") == 0) {
show_usage("Usage", repo->usage);
} else if(strcasecmp(i->data, "Include") == 0) {
-   fputs("warning: 'Include' directives cannot be 
queried\n", stderr);
+   fprintf(stderr,_("warning: '%s' directives cannot be 
queried\n"), "Include");
ret = 1;
} else {
-   fprintf(stderr, "warning: unknown directive '%s'\n", 
(char*) i->data);
+   fprintf(stderr, _("warning: unknown directive '%s'\n"), 
(char*) i->data);
ret = 1;
}
}
@@ -379,10 +380,10 @@ static int list_directives(void)
show_siglevel("RemoteFileSigLevel", 
config->remotefilesiglevel, 1);
 
} else if(strcasecmp(i->data, "Include") == 0) {
-   fputs("warning: 'Include' directives cannot be 
queried\n", stderr);
+   fprintf(stderr, _("warning: '%s' directives cannot be 
queried\n"), "Include");
ret = 1;
} else {
-