From 9adacec623d4cca07844e1667c7d0a8d3179a261 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Mon, 28 May 2012 04:50:40 +0200 Subject: Provide an array of available date input formats This will allow to fix the current hardcoding of strings describing date input formats in multiple places. Signed-off-by: Baptiste Jonglez Signed-off-by: Lukas Fleischer --- src/calcurse.h | 1 + src/vars.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/src/calcurse.h b/src/calcurse.h index 5fdfe4c..98e6a76 100644 --- a/src/calcurse.h +++ b/src/calcurse.h @@ -940,6 +940,7 @@ extern unsigned colorize; extern int foreground, background; extern enum ui_mode ui_mode; extern int read_only; +extern const char *datefmt_str[DATE_FORMATS]; extern int days[12]; extern const char *monthnames[12]; extern const char *daynames[8]; diff --git a/src/vars.c b/src/vars.c index dd4cfbc..b6bddcb 100644 --- a/src/vars.c +++ b/src/vars.c @@ -61,6 +61,9 @@ enum ui_mode ui_mode = UI_CMDLINE; /* Don't save anything if this is set. */ int read_only = 0; +/* Strings describing each input date format. */ +const char *datefmt_str[DATE_FORMATS]; + /* * variables to store calendar names */ @@ -136,6 +139,11 @@ void vars_init(void) strncpy(conf.output_datefmt, "%D", 3); conf.input_datefmt = 1; + datefmt_str[0] = _("mm/dd/yyyy"); + datefmt_str[1] = _("dd/mm/yyyy"); + datefmt_str[2] = _("yyyy/mm/dd"); + datefmt_str[3] = _("yyyy-mm-dd"); + /* Default external editor and pager */ ed = getenv("VISUAL"); if (ed == NULL || ed[0] == '\0') -- cgit v1.2.3-54-g00ecf