mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-04-04 23:25:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

columns: Be more precise and helpful

Browse Source 
Complain about ambiguous suffixes, and and spell out
the allowed values when complaining about suffixes.

Closes: #2624
Approved by: matthiasclasen
This commit is contained in:
Matthias Clasen
2019-01-21 14:39:08 -05:00
committed by Atomic Bot
parent 7ec898f00b
commit 370c667887
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/flatpak-builtins-utils.c
View File

@@ -824,7 +824,14 @@ parse_ellipsize_suffix (const char *p,
FlatpakEllipsizeMode *mode,
GError **error)
{
if (g_str_has_prefix (":full", p))
if (g_str_equal (":", p))
{
g_autofree char *msg1 = g_strdup_printf (_("Ambiguous suffix: '%s'."), p);
/* Translators: don't translate the values */
const char *msg2 = _("Possible values are :s[tart], :m[iddle], :e[nd] or :f[ull]");
return flatpak_fail (error, "%s %s", msg1, msg2);
}
else if (g_str_has_prefix (":full", p))
*mode = FLATPAK_ELLIPSIZE_MODE_NONE;
else if (g_str_has_prefix (":start", p))
*mode = FLATPAK_ELLIPSIZE_MODE_START;
@@ -833,7 +840,12 @@ parse_ellipsize_suffix (const char *p,
else if (g_str_has_prefix (":end", p))
*mode = FLATPAK_ELLIPSIZE_MODE_END;
else
return flatpak_fail (error, "'%s' does not specify an ellipsization", p);
{
g_autofree char *msg1 = g_strdup_printf (_("Invalid suffix: '%s'."), p);
/* Translators: don't translate the values */
const char *msg2 = _("Possible values are :s[tart], :m[iddle], :e[nd] or :f[ull]");
return flatpak_fail (error, "%s %s", msg1, msg2);
}
return TRUE;
}