Sorre, must have forgotten to attach. Here it is.
On Sat, Oct 25, 2014 at 09:30:53AM -0700, Ben Pfaff wrote:
On Sat, Oct 25, 2014 at 01:52:43PM +0200, John Darrington wrote:
> I suggest this patch to graph.c so that user visible strings are
> consistent and translatable.
I like the idea of consistent and translatable user-visible strings, but
I don't see the patch.
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
diff --git a/src/language/stats/graph.c b/src/language/stats/graph.c
index 7bfbbc7..0b1c22c 100644
--- a/src/language/stats/graph.c
+++ b/src/language/stats/graph.c
@@ -128,14 +128,22 @@ show_scatterplot (const struct graph *cmd, const struct casereader *input)
struct scatterplot_chart *scatterplot;
bool byvar_overflow = false;
- ds_init_cstr (&title, var_to_string (cmd->dep_vars[0]));
- ds_put_cstr (&title, " vs ");
- ds_put_cstr (&title, var_to_string (cmd->dep_vars[1]));
+ ds_init_empty (&title);
+
if (cmd->byvar)
{
- ds_put_cstr (&title, " by ");
- ds_put_cstr (&title, var_to_string (cmd->byvar));
- }
+ ds_put_format (&title, _("%s vs. %s by %s"),
+ var_to_string (cmd->dep_vars[0]),
+ var_to_string (cmd->dep_vars[1]),
+ var_to_string (cmd->byvar));
+ }
+ else
+ {
+ ds_put_format (&title, _("%s vs. %s"),
+ var_to_string (cmd->dep_vars[0]),
+ var_to_string (cmd->dep_vars[1]));
+ }
+
scatterplot = scatterplot_create(input,
cmd->dep_vars[0],
@@ -342,7 +350,7 @@ cmd_graph (struct lexer *lexer, struct dataset *ds)
goto error;
if (graph.n_dep_vars > 1)
{
- lex_error(lexer, _("Only one variable allowed"));
+ lex_error(lexer, _("Only one variable is allowed"));
goto error;
}
}
signature.asc
Description: Digital signature
_______________________________________________ pspp-dev mailing list [email protected] https://lists.gnu.org/mailman/listinfo/pspp-dev
