mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-03-25 19:03:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

tweaks: make two error messages more succinct and easier to translate

Browse Source 
"Cannot map name %s to <thing>..." was unnecessarily verbose and vague.
I have kept these strings unchanged all these years because I didn't
want to invalidate the existing translations.  But now it's time to
harmonize things and simply say "Unknown <thing>: %s" for an invalid
function name, menu name, option name, and syntax name.

("No such <thing>: %s" is nice and snappy, but its translations often
are clumsy and longer and unclear.)
This commit is contained in:
Benno Schulenberg 2022-08-31 16:49:48 +02:00
parent 97fa42c82b
commit 3925c137a4
2 changed files with 4 additions and 4 deletions

2
src/nano.c

@ -1285,7 +1285,7 @@ void unbound_key(int code)
else if (code == MISSING_BRACE) else if (code == MISSING_BRACE)
statusline(AHEM, _("Missing }")); statusline(AHEM, _("Missing }"));
else if (code == NO_SUCH_FUNCTION) else if (code == NO_SUCH_FUNCTION)
statusline(AHEM, _("No such function: %s"), commandname); statusline(AHEM, _("Unknown function: %s"), commandname);
#endif #endif
#ifndef NANO_TINY #ifndef NANO_TINY
else if (code > KEY_F0 && code < KEY_F0 + 25) else if (code > KEY_F0 && code < KEY_F0 + 25)

6
src/rcfile.c

@ -789,7 +789,7 @@ void parse_binding(char *ptr, bool dobind)
menu = name_to_menu(menuptr); menu = name_to_menu(menuptr);
if (menu < 1) { if (menu < 1) {
jot_error(N_("Cannot map name \"%s\" to a menu"), menuptr); jot_error(N_("Unknown menu: %s"), menuptr);
goto free_things; goto free_things;
} }
@ -807,7 +807,7 @@ void parse_binding(char *ptr, bool dobind)
newsc = strtosc(funcptr); newsc = strtosc(funcptr);
if (newsc == NULL) { if (newsc == NULL) {
jot_error(N_("Cannot map name \"%s\" to a function"), funcptr); jot_error(N_("Unknown function: %s"), funcptr);
goto free_things; goto free_things;
} }
} }
@ -1532,7 +1532,7 @@ void parse_rcfile(FILE *rcstream, bool just_syntax, bool intros_only)
} }
if (rcopts[i].name == NULL) { if (rcopts[i].name == NULL) {
jot_error(N_("Unknown option \"%s\""), option); jot_error(N_("Unknown option: %s"), option);
continue; continue;
} }