security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

g10: In the TOFU module, make strings easier to translate.

Browse Source 
* g10/tofu.c: Remove dead code.
(time_ago_str): Simplify implementation since we only want the most
significant unit.
(format_conflict_msg_part1): Use ngettext.
(ask_about_binding): Likewise and only emit full sentences.
(show_statistics): Likewise.

Signed-off-by: Neal H. Walfield <neal@g10code.com>
This commit is contained in:
Neal H. Walfield 2016-12-01 21:25:08 +01:00
parent d0bfe3de1f
commit bd1a1d8582
1 changed files with 144 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

313
g10/tofu.c
View File

@ -1296,21 +1296,6 @@ signature_stats_collect_cb (void *cookie, int argc, char **argv,
return 0; return 0;
} }
/* Convert from seconds to time units.
Note: T should already be a multiple of TIME_AGO_UNIT_SMALL or
TIME_AGO_UNIT_MEDIUM or TIME_AGO_UNIT_LARGE. */
signed long
time_ago_scale (signed long t)
{
if (t < TIME_AGO_UNIT_MEDIUM)
return t / TIME_AGO_UNIT_SMALL;
if (t < TIME_AGO_UNIT_LARGE)
return t / TIME_AGO_UNIT_MEDIUM;
return t / TIME_AGO_UNIT_LARGE;
}
/* Format the first part of a conflict message and return that as a /* Format the first part of a conflict message and return that as a
* malloced string. */ * malloced string. */
static char * static char *
@ -1340,7 +1325,10 @@ format_conflict_msg_part1 (int policy, strlist_t conflict_set,
else if (policy == TOFU_POLICY_ASK && conflict_set->next) else if (policy == TOFU_POLICY_ASK && conflict_set->next)
{ {
int conflicts = strlist_length (conflict_set); int conflicts = strlist_length (conflict_set);
es_fprintf (fp, _("The email address \"%s\" is associated with %d keys!"), es_fprintf
(fp, ngettext("The email address \"%s\" is associated with %d key!",
"The email address \"%s\" is associated with %d keys!",
conflicts),
email, conflicts); email, conflicts);
if (opt.verbose) if (opt.verbose)
es_fprintf (fp, es_fprintf (fp,
@ -1743,6 +1731,7 @@ ask_about_binding (ctrl_t ctrl,
char *key = NULL; char *key = NULL;
strlist_t binding; strlist_t binding;
int seen_in_past = 0; int seen_in_past = 0;
int encrypted = 1;
es_fprintf (fp, _("Statistics for keys" es_fprintf (fp, _("Statistics for keys"
" with the email address \"%s\":\n"), " with the email address \"%s\":\n"),
@ -1756,6 +1745,14 @@ ask_about_binding (ctrl_t ctrl,
stats_iter->count); stats_iter->count);
#endif #endif
if (stats_iter->time_ago > 0 && encrypted)
{
/* We've change from the encrypted stats to the verified
* stats. Reset SEEN_IN_PAST. */
encrypted = 0;
seen_in_past = 0;
}
if (! key || strcmp (key, stats_iter->fingerprint)) if (! key || strcmp (key, stats_iter->fingerprint))
{ {
int this_key; int this_key;
@ -1805,50 +1802,92 @@ ask_about_binding (ctrl_t ctrl,
seen_in_past += stats_iter->count; seen_in_past += stats_iter->count;
es_fputs (" ", fp); es_fputs (" ", fp);
/* TANSLATORS: This string is concatenated with one of
* the day/week/month strings to form one sentence. */
if (stats_iter->time_ago > 0)
es_fprintf (fp, ngettext("Verified %d message",
"Verified %d messages",
seen_in_past), seen_in_past);
else
es_fprintf (fp, ngettext("Encrypted %d message",
"Encrypted %d messages",
seen_in_past), seen_in_past);
if (!stats_iter->count) if (!stats_iter->count)
es_fputs (".", fp); {
if (stats_iter->time_ago > 0)
es_fprintf (fp, ngettext("Verified %d message.",
"Verified %d messages.",
seen_in_past), seen_in_past);
else
es_fprintf (fp, ngettext("Encrypted %d message.",
"Encrypted %d messages.",
seen_in_past), seen_in_past);
}
else if (labs(stats_iter->time_ago) == 2) else if (labs(stats_iter->time_ago) == 2)
{ {
es_fprintf (fp, "in the future."); if (stats_iter->time_ago > 0)
es_fprintf (fp, ngettext("Verified %d message in the future.",
"Verified %d messages in the future.",
seen_in_past), seen_in_past);
else
es_fprintf (fp, ngettext("Encrypted %d message in the future.",
"Encrypted %d messages in the future.",
seen_in_past), seen_in_past);
/* Reset it. */ /* Reset it. */
seen_in_past = 0; seen_in_past = 0;
} }
else else
{ {
if (labs(stats_iter->time_ago) == 3) if (labs(stats_iter->time_ago) == 3)
es_fprintf (fp, ngettext(" over the past day.", {
" over the past %d days.", int days = 1 + stats_iter->time_ago / TIME_AGO_UNIT_SMALL;
TIME_AGO_SMALL_THRESHOLD if (stats_iter->time_ago > 0)
/ TIME_AGO_UNIT_SMALL), es_fprintf
TIME_AGO_SMALL_THRESHOLD (fp,
/ TIME_AGO_UNIT_SMALL); ngettext("Messages verified over the past %d day: %d.",
"Messages verified over the past %d days: %d.",
days), days, seen_in_past);
else
es_fprintf
(fp,
ngettext("Messages encrypted over the past %d day: %d.",
"Messages encrypted over the past %d days: %d.",
days), days, seen_in_past);
}
else if (labs(stats_iter->time_ago) == 4) else if (labs(stats_iter->time_ago) == 4)
es_fprintf (fp, ngettext(" over the past month.", {
" over the past %d months.", int months = 1 + stats_iter->time_ago / TIME_AGO_UNIT_MEDIUM;
TIME_AGO_MEDIUM_THRESHOLD if (stats_iter->time_ago > 0)
/ TIME_AGO_UNIT_MEDIUM), es_fprintf
TIME_AGO_MEDIUM_THRESHOLD (fp,
/ TIME_AGO_UNIT_MEDIUM); ngettext("Messages verified over the past %d month: %d.",
"Messages verified over the past %d months: %d.",
months), months, seen_in_past);
else
es_fprintf
(fp,
ngettext("Messages encrypted over the past %d month: %d.",
"Messages encrypted over the past %d months: %d.",
months), months, seen_in_past);
}
else if (labs(stats_iter->time_ago) == 5) else if (labs(stats_iter->time_ago) == 5)
es_fprintf (fp, ngettext(" over the past year.", {
" over the past %d years.", int years = 1 + stats_iter->time_ago / TIME_AGO_UNIT_LARGE;
TIME_AGO_LARGE_THRESHOLD if (stats_iter->time_ago > 0)
/ TIME_AGO_UNIT_LARGE), es_fprintf
TIME_AGO_LARGE_THRESHOLD (fp,
/ TIME_AGO_UNIT_LARGE); ngettext("Messages verified over the past %d year: %d.",
"Messages verified over the past %d years: %d.",
years), years, seen_in_past);
else
es_fprintf
(fp,
ngettext("Messages encrypted over the past %d year: %d.",
"Messages encrypted over the past %d years: %d.",
years), years, seen_in_past);
}
else if (labs(stats_iter->time_ago) == 6) else if (labs(stats_iter->time_ago) == 6)
es_fprintf (fp, _(" in the past.")); {
if (stats_iter->time_ago > 0)
es_fprintf
(fp, _("Messages verified in the past: %d."),
seen_in_past);
else
es_fprintf
(fp, _("Messages encrypted in the past: %d."),
seen_in_past);
}
else else
log_assert (! "Broken SQL.\n"); log_assert (! "Broken SQL.\n");
} }
@ -2751,7 +2790,7 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
/* Return a malloced string of the form /* Return a malloced string of the form
* "7 months, 1 day, 5 minutes, 0 seconds" * "7~months"
* The caller should replace all '~' in the returned string by a space * The caller should replace all '~' in the returned string by a space
* and also free the returned string. * and also free the returned string.
* *
@ -2761,127 +2800,46 @@ get_trust (ctrl_t ctrl, PKT_public_key *pk,
static char * static char *
time_ago_str (long long int t) time_ago_str (long long int t)
{ {
estream_t fp;
int years = 0;
int months = 0;
int days = 0;
int hours = 0;
int minutes = 0;
int seconds = 0;
/* The number of units that we've printed so far. */
int count = 0;
/* The first unit that we printed (year = 0, month = 1,
etc.). */
int first = -1;
/* The current unit. */
int i = 0;
char *str;
/* It would be nice to use a macro to do this, but gettext /* It would be nice to use a macro to do this, but gettext
works on the unpreprocessed code. */ works on the unpreprocessed code. */
#define MIN_SECS (60) #define MIN_SECS (60)
#define HOUR_SECS (60 * MIN_SECS) #define HOUR_SECS (60 * MIN_SECS)
#define DAY_SECS (24 * HOUR_SECS) #define DAY_SECS (24 * HOUR_SECS)
#define WEEK_SECS (7 * DAY_SECS)
#define MONTH_SECS (30 * DAY_SECS) #define MONTH_SECS (30 * DAY_SECS)
#define YEAR_SECS (365 * DAY_SECS) #define YEAR_SECS (365 * DAY_SECS)
if (t > YEAR_SECS) if (t > 2 * YEAR_SECS)
{ {
years = t / YEAR_SECS; long long int c = t / YEAR_SECS;
t -= years * YEAR_SECS; return xtryasprintf (ngettext("%lld~year", "%lld~years", c), c);
} }
if (t > MONTH_SECS) if (t > 2 * MONTH_SECS)
{ {
months = t / MONTH_SECS; long long int c = t / MONTH_SECS;
t -= months * MONTH_SECS; return xtryasprintf (ngettext("%lld~month", "%lld~months", c), c);
} }
if (t > DAY_SECS) if (t > 2 * WEEK_SECS)
{ {
days = t / DAY_SECS; long long int c = t / WEEK_SECS;
t -= days * DAY_SECS; return xtryasprintf (ngettext("%lld~week", "%lld~weeks", c), c);
} }
if (t > HOUR_SECS) if (t > 2 * DAY_SECS)
{ {
hours = t / HOUR_SECS; long long int c = t / DAY_SECS;
t -= hours * HOUR_SECS; return xtryasprintf (ngettext("%lld~day", "%lld~days", c), c);
} }
if (t > MIN_SECS) if (t > 2 * HOUR_SECS)
{ {
minutes = t / MIN_SECS; long long int c = t / HOUR_SECS;
t -= minutes * MIN_SECS; return xtryasprintf (ngettext("%lld~hour", "%lld~hours", c), c);
} }
seconds = t; if (t > 2 * MIN_SECS)
#undef MIN_SECS
#undef HOUR_SECS
#undef DAY_SECS
#undef MONTH_SECS
#undef YEAR_SECS
fp = es_fopenmem (0, "rw,samethread");
if (! fp)
log_fatal ("error creating memory stream: %s\n",
gpg_strerror (gpg_error_from_syserror()));
if (years)
{ {
/* TRANSLATORS: The tilde ('~') is used here to indicate a long long int c = t / MIN_SECS;
* non-breakable space */ return xtryasprintf (ngettext("%lld~minute", "%lld~minutes", c), c);
es_fprintf (fp, ngettext("%d~year", "%d~years", years), years);
count ++;
first = i;
} }
i ++; return xtryasprintf (ngettext("%lld~second", "%lld~seconds", t), t);
if ((first == -1 || i - first <= 3) && count <= 0 && months)
{
if (count)
es_fprintf (fp, ", ");
es_fprintf (fp, ngettext("%d~month", "%d~months", months), months);
count ++;
first = i;
}
i ++;
if ((first == -1 || i - first <= 3) && count <= 0 && days)
{
if (count)
es_fprintf (fp, ", ");
es_fprintf (fp, ngettext("%d~day", "%d~days", days), days);
count ++;
first = i;
}
i ++;
if ((first == -1 || i - first <= 3) && count <= 0 && hours)
{
if (count)
es_fprintf (fp, ", ");
es_fprintf (fp, ngettext("%d~hour", "%d~hours", hours), hours);
count ++;
first = i;
}
i ++;
if ((first == -1 || i - first <= 3) && count <= 0 && minutes)
{
if (count)
es_fprintf (fp, ", ");
es_fprintf (fp, ngettext("%d~minute", "%d~minutes", minutes), minutes);
count ++;
first = i;
}
i ++;
if ((first == -1 || i - first <= 3) && count <= 0)
{
if (count)
es_fprintf (fp, ", ");
es_fprintf (fp, ngettext("%d~second", "%d~seconds", seconds), seconds);
}
es_fputc (0, fp);
if (es_fclose_snatch (fp, (void **) &str, NULL))
log_fatal ("error snatching memory stream\n");
return str;
} }
@ -3066,56 +3024,55 @@ show_statistics (tofu_dbs_t dbs, PKT_public_key *pk, const char *fingerprint,
log_fatal ("error creating memory stream: %s\n", log_fatal ("error creating memory stream: %s\n",
gpg_strerror (gpg_error_from_syserror())); gpg_strerror (gpg_error_from_syserror()));
es_fprintf (fp, _("%s: "), email); if (signature_count == 0 && encryption_count == 0)
if (signature_count == 0)
{ {
es_fprintf (fp, _("Verified %ld signatures"), 0L); es_fprintf (fp,
es_fputc ('\n', fp); _("%s: Verified 0~signatures and encrypted 0~messages."),
email);
} }
else else
{ {
char *first_seen_ago_str = time_ago_str (now - signature_first_seen); if (signature_count == 0)
es_fprintf (fp, _("%s: Verified 0 signatures."), email);
else
{
/* TRANSLATORS: The final %s is replaced by a string like /* TRANSLATORS: The final %s is replaced by a string like
"7 months, 1 day, 5 minutes, 0 seconds". */ "7~months". */
es_fprintf (fp, char *ago_str = time_ago_str (now - signature_first_seen);
ngettext("Verified %ld signature in the past %s", es_fprintf
"Verified %ld signatures in the past %s", (fp,
ngettext("%s: Verified %ld~signature in the past %s.",
"%s: Verified %ld~signatures in the past %s.",
signature_count), signature_count),
signature_count, first_seen_ago_str); email, signature_count, ago_str);
xfree (ago_str);
xfree (first_seen_ago_str);
} }
es_fputs (" ", fp);
if (encryption_count == 0) if (encryption_count == 0)
{ es_fprintf (fp, _("Encrypted 0 messages."));
es_fprintf (fp, _(", and encrypted %ld messages"), 0L);
}
else else
{ {
char *first_done_ago_str = time_ago_str (now - encryption_first_done); char *ago_str = time_ago_str (now - encryption_first_done);
/* TRANSLATORS: The final %s is replaced by a string like /* TRANSLATORS: The final %s is replaced by a string like
"7 months, 1 day, 5 minutes, 0 seconds". */ "7~months". */
es_fprintf (fp, es_fprintf (fp,
ngettext(", and encrypted %ld message in the past %s", ngettext("Encrypted %ld~message in the past %s.",
", and encrypted %ld messages in the past %s", "Encrypted %ld~messages in the past %s.",
encryption_count), encryption_count),
encryption_count, first_done_ago_str); encryption_count, ago_str);
xfree (ago_str);
xfree (first_done_ago_str); }
} }
if (opt.verbose) if (opt.verbose)
{ {
es_fputs (" ", fp); es_fputs (" ", fp);
es_fputc ('(', fp); es_fprintf (fp, _("(policy: %s)"), tofu_policy_str (policy));
es_fprintf (fp, _("policy: %s"), tofu_policy_str (policy));
es_fputs (").\n", fp);
} }
else es_fputs ("\n", fp);
es_fputs (".\n", fp);
{ {