[network-manager-openvpn] properties: make args_params_check_nargs_minmax() better translatable
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn] properties: make args_params_check_nargs_minmax() better translatable
- Date: Thu, 25 Feb 2016 14:18:23 +0000 (UTC)
commit 6cd31f31bcb45b0b13579236f0504d84b0bd2600
Author: Thomas Haller <thaller redhat com>
Date: Thu Feb 25 15:12:19 2016 +0100
properties: make args_params_check_nargs_minmax() better translatable
Reported-by: Rafael Fontenelle <rffontenelle gmail com>
https://bugzilla.gnome.org/show_bug.cgi?id=762678
properties/import-export.c | 23 ++++++++---------------
1 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index d71262a..8fe0364 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -138,21 +138,14 @@ args_params_check_nargs_minmax (const char **params, guint nargs_min, guint narg
nargs = g_strv_length ((char **) params) - 1;
if (nargs < nargs_min || nargs > nargs_max) {
- if (nargs_min == nargs_max) {
- *out_error = g_strdup_printf (_("option %s expects %s argument%s"),
- params[0],
- nargs_min == 0
- ? "no"
- : (nargs_min == 1
- ? "exactly one"
- : nm_sprintf_bufa (100, "%u", nargs_min)),
- nargs_min == 1 ? "" : "s");
- } else {
- *out_error = g_strdup_printf (_("option %s expects between %u and %u arguments"),
- params[0],
- nargs_min,
- nargs_max);
- }
+ if (nargs_min != nargs_max)
+ *out_error = g_strdup_printf (_("option %s expects between %u and %u arguments"),
params[0], nargs_min, nargs_max);
+ else if (nargs_min == 0)
+ *out_error = g_strdup_printf (_("option %s expects no arguments"), params[0]);
+ else if (nargs_min == 1)
+ *out_error = g_strdup_printf (_("option %s expects exactly one argument"), params[0]);
+ else
+ *out_error = g_strdup_printf (_("option %s expects exactly %u arguments"), params[0],
nargs_min);
return FALSE;
}
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]