From: Art Cancro <ajc@citadel.org>
Date: Mon, 29 Sep 2008 16:44:10 +0000 (+0000)
Subject: Date picker is now localized to the currently selected
X-Git-Tag: v7.86~1898
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=997c125457276c638b62ea31ab2668629f4760f0

Date picker is now localized to the currently selected
language.  I'd appreciate it if some of you in the community of
international Citadel developers could test this a bit.
---

diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c
index 23dd53524..1a9f9c99a 100644
--- a/webcit/calendar_tools.c
+++ b/webcit/calendar_tools.c
@@ -71,7 +71,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix) {
 	wprintf("<script type=\"text/javascript\">");
 	wprintf("attachDatePicker('");
 	wprintf(prefix);
-	wprintf("');\n");
+	wprintf("', '%s');\n", get_selected_language());
 	wprintf("</script>");
 	wprintf(_("Hour: "));
 	wprintf("<SELECT NAME=\"%s_hour\" SIZE=\"1\">\n", prefix);
diff --git a/webcit/fmt_date.c b/webcit/fmt_date.c
index 7ae90fbb3..c541b7b17 100644
--- a/webcit/fmt_date.c
+++ b/webcit/fmt_date.c
@@ -39,6 +39,7 @@ size_t wc_strftime(char *s, size_t max, const char *format, const struct tm *tm)
 }
 
 
+
 /*
  * Format a date/time stamp for output 
  */
diff --git a/webcit/gettext.c b/webcit/gettext.c
index de380d6c8..352b6f7cb 100644
--- a/webcit/gettext.c
+++ b/webcit/gettext.c
@@ -370,3 +370,22 @@ void TmplGettext(StrBuf *Target, int nTokens, WCTemplateToken *Token)
 	StrBufAppendBufPlain(Target, _(Token->Params[0]->Start), -1, 0);
 
 }
+
+
+/*
+ * Returns the language currently in use.
+ * This function returns a static string, so don't do anything stupid please.
+ */
+const char *get_selected_language(void) {
+#ifdef ENABLE_NLS
+#ifdef HAVE_USELOCALE
+	return AvailLang[WC->selected_language];
+#else
+	return "en"
+#endif
+#else
+	return "en"
+#endif
+}
+
+
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index d930c64ea..2ba65152d 100644
--- a/webcit/static/wclib.js
+++ b/webcit/static/wclib.js
@@ -960,12 +960,14 @@ function TaskViewGatherCategoriesFromTable() {
 	var table = $('taskview');
 	
 }
-function attachDatePicker(relative) {
+function attachDatePicker(relative, wclang) {
 	var dpck = new DatePicker({
 	relative: relative,
-	language: 'en', // fix please
+	language: wclang.substr(0,2),
 	disableFutureDate: false,
 	dateFormat: [ ["yyyy", "mm", "dd"], "-"],
+	showDuration: 0.2,
+	closeEffectDuration: 0.2,
 	});
 	document.getElementById(relative).dpck = dpck; // attach a ref to it
 }
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 9c1a0583b..06a2e66b2 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -824,6 +824,7 @@ void end_tab(int tabnum, int num_tabs);
 void str_wiki_index(char *s);
 int get_time_format_cached (void);
 int xtoi(const char *in, size_t len);
+const char *get_selected_language(void);
 void webcit_fmt_date(char *buf, time_t thetime, int brief);
 int fetch_http(char *url, char *target_buf, int maxbytes);