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
/
stats
/
crosstabs.q
diff --git
a/src/language/stats/crosstabs.q
b/src/language/stats/crosstabs.q
index 6adae77b030a674e81035da71ea6dd245652f828..a017b3c6696e38821b0d2715e11a5b02fc025bb1 100644
(file)
--- a/
src/language/stats/crosstabs.q
+++ b/
src/language/stats/crosstabs.q
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011, 2012, 2013
, 2014
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-29,6
+29,7
@@
#include <config.h>
#include <ctype.h>
#include <config.h>
#include <ctype.h>
+#include <float.h>
#include <gsl/gsl_cdf.h>
#include <stdlib.h>
#include <stdio.h>
#include <gsl/gsl_cdf.h>
#include <stdlib.h>
#include <stdio.h>
@@
-294,8
+295,8
@@
cmd_crosstabs (struct lexer *lexer, struct dataset *ds)
: MV_NEVER);
if (proc.mode == GENERAL && proc.exclude == MV_NEVER)
{
: MV_NEVER);
if (proc.mode == GENERAL && proc.exclude == MV_NEVER)
{
- msg (SE, _("Missing mode
REPORT
not allowed in general mode. "
- "Assuming
MISSING=TABLE.")
);
+ msg (SE, _("Missing mode
%s
not allowed in general mode. "
+ "Assuming
%s."), "REPORT", "MISSING=TABLE"
);
proc.exclude = MV_ANY;
}
proc.exclude = MV_ANY;
}
@@
-478,7
+479,7
@@
crs_custom_variables (struct lexer *lexer, struct dataset *ds,
struct crosstabs_proc *proc = proc_;
if (proc->n_pivots)
{
struct crosstabs_proc *proc = proc_;
if (proc->n_pivots)
{
- msg (SE, _("
VARIABLES must be specified before TABLES.")
);
+ msg (SE, _("
%s must be specified before %s."), "VARIABLES", "TABLES"
);
return 0;
}
return 0;
}
@@
-1944,8
+1945,8
@@
display_risk (struct pivot_table *pt, struct tab_table *risk)
case 1:
case 2:
if (var_is_numeric (rv))
case 1:
case 2:
if (var_is_numeric (rv))
- sprintf (buf, _("For cohort %s = %g"),
- var_to_string (rv), pt->rows[i - 1].f);
+ sprintf (buf, _("For cohort %s = %
.*
g"),
+ var_to_string (rv),
DBL_DIG + 1,
pt->rows[i - 1].f);
else
sprintf (buf, _("For cohort %s = %.*s"),
var_to_string (rv),
else
sprintf (buf, _("For cohort %s = %.*s"),
var_to_string (rv),