summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-15 18:46:26 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-01-15 18:46:26 +0100
commit7e777fc703836f43ebc7997c7b34060b29d4b8bf (patch)
treeda24a64f1c9a6805319fd09a502d58d8cdd0ba68
parentf0eb032758e4ea558c8bcc0d2dbe672e4913bef3 (diff)
downloadIshtar-7e777fc703836f43ebc7997c7b34060b29d4b8bf.tar.bz2
Ishtar-7e777fc703836f43ebc7997c7b34060b29d4b8bf.zip
UI: date widget - force language - improve french translation
-rw-r--r--bootstrap_datepicker/static/js/locales/bootstrap-datepicker.fr.min.js2
-rw-r--r--ishtar_common/forms.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/bootstrap_datepicker/static/js/locales/bootstrap-datepicker.fr.min.js b/bootstrap_datepicker/static/js/locales/bootstrap-datepicker.fr.min.js
index 244cfba80..110e4ce5a 100644
--- a/bootstrap_datepicker/static/js/locales/bootstrap-datepicker.fr.min.js
+++ b/bootstrap_datepicker/static/js/locales/bootstrap-datepicker.fr.min.js
@@ -1 +1 @@
-!function(a){a.fn.datepicker.dates.fr={days:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],daysShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],daysMin:["d","l","ma","me","j","v","s"],months:["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],monthsShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],today:"Aujourd'hui",monthsTitle:"Mois",clear:"Effacer",weekStart:1,format:"dd/mm/yyyy"}}(jQuery); \ No newline at end of file
+!function(a){a.fn.datepicker.dates.fr={days:["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],daysShort:["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],daysMin:["Di","Lu","Ma","Me","Je","Ve","Sa"],months:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],monthsShort:["janv.","févr.","mars","avril","mai","juin","juil.","août","sept.","oct.","nov.","déc."],today:"Aujourd'hui",monthsTitle:"Mois",clear:"Effacer",weekStart:1,format:"dd/mm/yyyy"}}(jQuery);
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py
index a92aef548..74965761d 100644
--- a/ishtar_common/forms.py
+++ b/ishtar_common/forms.py
@@ -260,6 +260,7 @@ class IshtarForm(forms.Form):
if not isinstance(widget, DatePicker):
continue
lang = translation.get_language()
+ widget.options['language'] = lang
if lang in DATE_FORMAT:
widget.options['format'] = DATE_FORMAT[lang]
if 'autoclose' not in widget.options: