projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace syntactical keywords in error/warning messages by printf directives.
[pspp]
/
src
/
language
/
command.c
diff --git
a/src/language/command.c
b/src/language/command.c
index 78fd5f00b00fe6cba1bd77806ac976c7fd2fedcd..76377035886b26e97dae5ad0222e660e91c411ef 100644
(file)
--- a/
src/language/command.c
+++ b/
src/language/command.c
@@
-385,11
+385,11
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
"been defined."), command->name);
break;
case S_INPUT_PROGRAM:
"been defined."), command->name);
break;
case S_INPUT_PROGRAM:
- msg (SE, _("%s is allowed only inside
INPUT PROGRAM
."),
- command->name);
+ msg (SE, _("%s is allowed only inside
%s
."),
+ command->name
, "INPUT PROGRAM"
);
break;
case S_FILE_TYPE:
break;
case S_FILE_TYPE:
- msg (SE, _("%s is allowed only inside
FILE TYPE."), command->name
);
+ msg (SE, _("%s is allowed only inside
%s."), command->name, "FILE TYPE"
);
break;
/* Two allowed states. */
break;
/* Two allowed states. */
@@
-412,7
+412,8
@@
report_state_mismatch (const struct command *command, enum cmd_state state)
command->name, "FILE TYPE");
break;
case S_INPUT_PROGRAM | S_FILE_TYPE:
command->name, "FILE TYPE");
break;
case S_INPUT_PROGRAM | S_FILE_TYPE:
- msg (SE, _("%s is allowed only inside INPUT PROGRAM or inside FILE TYPE."), command->name);
+ msg (SE, _("%s is allowed only inside %s or inside %s."), command->name,
+ "INPUT PROGRAM", "FILE TYPE");
break;
/* Three allowed states. */
break;
/* Three allowed states. */
@@
-525,7
+526,7
@@
cmd_erase (struct lexer *lexer, struct dataset *ds UNUSED)
if (settings_get_safer_mode ())
{
if (settings_get_safer_mode ())
{
- msg (SE, _("This command not allowed when the
SAFER option is set.")
);
+ msg (SE, _("This command not allowed when the
%s option is set."), "SAFER"
);
return CMD_FAILURE;
}
return CMD_FAILURE;
}