From 22c2915e5c4ec55d9a9fc60bd50bdc11bd32bb3b Mon Sep 17 00:00:00 2001
From: Felipe Henrique de Almeida Bormann <fbormann@Felipes-MacBook-Air.local>
Date: Thu, 8 Dec 2016 05:44:46 -0300
Subject: [PATCH] added support for all date formats

---
 amadeus/settings.py                      | 2 ++
 courses/forms.py                         | 6 +++++-
 courses/templates/course/datepicker.html | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/amadeus/settings.py b/amadeus/settings.py
index 83bb055..be72e3a 100644
--- a/amadeus/settings.py
+++ b/amadeus/settings.py
@@ -231,6 +231,8 @@ OAUTH2_PROVIDER = {
 #For date purposes
 DATETIME_INPUT_FORMATS.append('%d/%m/%y')
 DATE_INPUT_FORMATS.append('%d/%m/%y')
+DATETIME_INPUT_FORMATS.append('%m/%d/%y')
+DATE_INPUT_FORMATS.append('%m/%d/%y')
 
 #s3direct
 
diff --git a/courses/forms.py b/courses/forms.py
index 85ee48f..7fc3111 100644
--- a/courses/forms.py
+++ b/courses/forms.py
@@ -62,6 +62,8 @@ class UpdateCourseForm(CourseForm):
 		}
 
 class SubjectForm(forms.ModelForm):
+	init_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
+	end_date = forms.DateField(input_formats=settings.DATE_INPUT_FORMATS)
 	def clean_end_date(self):
 		end_date = self.cleaned_data['end_date']
 		if('init_date' in self.cleaned_data):
@@ -71,8 +73,10 @@ class SubjectForm(forms.ModelForm):
 		return end_date
 
 	class Meta:
+		
 		model = Subject
 		fields = ('name', 'description','init_date', 'end_date', 'visible',)
+		localized_fields = ('init_date', 'end_date',)
 		labels = {
 			'name': _('Name'),
 			'description': _('Description'),
@@ -153,4 +157,4 @@ class LinkMaterialForm(forms.ModelForm):
 		model = LinkMaterial
 		fields = ['material', 'name', 'description','url']
 
->>>>>>> dev
+
diff --git a/courses/templates/course/datepicker.html b/courses/templates/course/datepicker.html
index 2bbaf99..ab5e651 100644
--- a/courses/templates/course/datepicker.html
+++ b/courses/templates/course/datepicker.html
@@ -1,4 +1,4 @@
-<div class="input-append date" id="dp2" data-date="12-02-2012" >
+<div class="input-append date" id="dp2" >
   <input class="span2" size="16" type="text">
   <span class="add-on"><i class="icon-th"></i></span>
 </div>
\ No newline at end of file
--
libgit2 0.21.2