/* PSPP - a program for statistical analysis.
- Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+ Copyright (C) 2008, 2010, 2011 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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
-#include "helpers.h"
+
+#include "language/expressions/helpers.h"
+
#include <gsl/gsl_roots.h>
#include <gsl/gsl_sf.h>
-#include <libpspp/assertion.h>
-#include <libpspp/pool.h>
-#include "private.h"
+
+#include "language/expressions/private.h"
+#include "libpspp/assertion.h"
+#include "libpspp/pool.h"
const struct substring empty_string = {NULL, 0};
return true;
}
- /* TRANSLATORS: Don't translate the the actual unit names `weeks', `days' etc
- They must remain in their original English. */
msg (SE, _("Unrecognized date unit `%.*s'. "
- "Valid date units are `years', `quarters', `months', "
- "`weeks', `days', `hours', `minutes', and `seconds'."),
- (int) ss_length (name), ss_data (name));
+ "Valid date units are `%s', `%s', `%s', "
+ "`%s', `%s', `%s', `%s', and `%s'."),
+ (int) ss_length (name), ss_data (name),
+ "years", "quarters", "months",
+ "weeks", "days", "hours", "minutes", "seconds");
+
return false;
}
else
{
msg (SE, _("Invalid DATESUM method. "
- "Valid choices are `closest' and `rollover'."));
+ "Valid choices are `%s' and `%s'."), "closest", "rollover");
return false;
}
}