diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-01-05 15:17:34 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-01-05 15:17:34 +0200 |
commit | f937fa90807400e87aa64cd03f2c8470093129d7 (patch) | |
tree | c94d0061b273b487a27d93de59a06314f78e2aad | |
parent | 32a337f3b35c51ceb1d9320c7ff67fa1d5726c2a (diff) | |
download | pies-f937fa90807400e87aa64cd03f2c8470093129d7.tar.gz pies-f937fa90807400e87aa64cd03f2c8470093129d7.tar.bz2 |
Insert missing _() markers
-rw-r--r-- | src/ctl.c | 20 | ||||
-rw-r--r-- | src/piesctl.c | 28 |
2 files changed, 24 insertions, 24 deletions
@@ -740,7 +740,7 @@ do_auth (struct ctlio *io, char const *name, char const *pass) pies_identity_provider_t provider = ep->data; char const *pname = pies_identity_provider_name (provider); - debug(1, ("trying %s...", pname)); + debug(1, (_("trying identity provider %s..."), pname)); if (pies_authenticate (provider, id, pass) == 0) { if (control.adm_acl @@ -749,7 +749,7 @@ do_auth (struct ctlio *io, char const *name, char const *pass) id) == 0) { new_state = CTL_ADMIN_STATE; - logmsg (LOG_AUTH, "%s granted admin access via %s", + logmsg (LOG_AUTH, _("%s granted admin access via %s"), name, pname); } else if (control.usr_acl @@ -758,7 +758,7 @@ do_auth (struct ctlio *io, char const *name, char const *pass) id) == 0) { new_state = CTL_USER_STATE; - logmsg (LOG_AUTH, "%s authenticated via %s", + logmsg (LOG_AUTH, _("%s authenticated via %s"), name, pname); } else @@ -768,12 +768,12 @@ do_auth (struct ctlio *io, char const *name, char const *pass) if (ad.comp) { new_state = CTL_USER_STATE; - logmsg (LOG_AUTH, "%s authenticated via %s, component %s", + logmsg (LOG_AUTH, _("%s authenticated via %s, component %s"), name, pname, ad.comp->tag); } else { - logmsg (LOG_AUTH, "%s authenticated via %s, but failed ACL check", + logmsg (LOG_AUTH, _("%s authenticated via %s, but failed ACL check"), name, pname); } } @@ -1109,7 +1109,7 @@ ctlrd (int fd, void *data) else { if (n == -1) - logmsg (LOG_ERR, "error reading from control socket: %s", + logmsg (LOG_ERR, _("error reading from control socket: %s"), strerror (errno)); return ctlio_end (fd, io); } @@ -1129,9 +1129,9 @@ ctlwr (int fd, void *data) if (rc != 1) { if (rc == 0) - logmsg (LOG_ERR, "error writing to control socket"); + logmsg (LOG_ERR, _("error writing to control socket")); else - logmsg (LOG_ERR, "error writing to control socket: %s", + logmsg (LOG_ERR, _("error writing to control socket: %s"), strerror (errno)); return ctlio_end (fd, io); } @@ -1170,7 +1170,7 @@ ctl_accept (int socket, void *data) if (debug_level >= 1) { char *s = sockaddr_to_astr ((struct sockaddr *)&addr, addrlen); - logmsg (LOG_DEBUG, _("%s wants %s"), s, "control socket"); + logmsg (LOG_DEBUG, _("%s wants %s"), s, _("control socket")); free (s); } @@ -1222,7 +1222,7 @@ ctl_open () if (listen (fd, 8)) { - logmsg (LOG_CRIT, "can't listen on control socket %s: %s", + logmsg (LOG_CRIT, _("can't listen on control socket %s: %s"), control.url->string, strerror (errno)); exit (EX_UNAVAILABLE); } diff --git a/src/piesctl.c b/src/piesctl.c index 4b448ad..a9555a1 100644 --- a/src/piesctl.c +++ b/src/piesctl.c @@ -129,7 +129,7 @@ parse_config () exit (grecs_preproc_run (file_name, grecs_preprocessor) ? EX_CONFIG : 0); if (verbose) - printf ("%s: reading configuration from %s\n", + printf (_("%s: reading configuration from %s\n"), program_name, file_name); tree = grecs_parse (file_name); if (!tree) @@ -137,7 +137,7 @@ parse_config () if (grecs_tree_process (tree, piesctl_keywords)) exit (EX_CONFIG); if (!url && verbose) - printf ("%s: URL not found in %s\n", + printf (_("%s: URL not found in %s\n"), program_name, file_name); } @@ -150,7 +150,7 @@ parse_config () struct grecs_node *node; if (verbose) - printf ("%s: reading configuration from %s\n", + printf (_("%s: reading configuration from %s\n"), program_name, file_name); if (preprocess_only) exit (grecs_preproc_run (file_name, grecs_preprocessor) @@ -169,7 +169,7 @@ parse_config () } } else if (verbose) - printf ("%s: URL not found in %s\n", + printf (_("%s: URL not found in %s\n"), program_name, file_name); } free (file_name); @@ -178,7 +178,7 @@ parse_config () if (!url) { if (verbose) - printf ("%s: falling back to default URL\n", program_name); + printf (_("%s: falling back to default URL\n"), program_name); if (default_url) url = default_url; else @@ -200,7 +200,7 @@ parse_config () } if (verbose) - printf ("%s: using URL %s\n", program_name, url->string); + printf (_("%s: using URL %s\n"), program_name, url->string); } static void @@ -215,8 +215,8 @@ config_help (void) } static void -piesctl_diag(grecs_locus_t const *locus, int err, int errcode, - const char *msg) +piesctl_diag (grecs_locus_t const *locus, int err, int errcode, + const char *msg) { fflush (stdout); fprintf (stderr, "%s: ", program_name); @@ -227,7 +227,7 @@ piesctl_diag(grecs_locus_t const *locus, int err, int errcode, fputc(' ', stderr); } if (!err) - fprintf (stderr, "warning: "); + fprintf (stderr, _("warning: ")); fprintf (stderr, "%s", msg); if (errcode) fprintf (stderr, ": %s", strerror (errno)); @@ -808,7 +808,7 @@ print_json (FILE *fp, struct json_value *v) static void shttp_format_result (struct shttp_connection *conn, FILE *fp) { - fprintf (stderr, "%s: raw JSON reply follows:\n", program_name); + fprintf (stderr, _("%s: raw JSON reply follows:\n"), program_name); print_json (fp, conn->result); } @@ -953,8 +953,8 @@ shttp_get_credentials (struct shttp_connection *conn) if (!realm) realm = grecs_strdup ("Server"); - conn->url->user = getans (1, "%s user", realm); - conn->url->passwd = getans (0, "%s password", realm); + conn->url->user = getans (1, _("%s user"), realm); + conn->url->passwd = getans (0, _("%s password"), realm); grecs_free (realm); } @@ -1512,10 +1512,10 @@ shttp_print_response_status (struct shttp_connection *conn) json_string, &v) == 0) fputs (v->v.s, stdout); else - printf ("unknown error"); + printf (_("unknown error")); } else - printf ("unknown status"); + printf (_("unknown status")); fputc ('\n', stdout); } } |