Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Format initial form dates according to locale

Roland Geiderbb790f987db3
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index a01af56af..a67bb62cf 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -6,13 +6,6 @@
{% block title %}{% trans "New weight log" %} – {{day.description}}{% endblock %}
{% block header %}
-<script type="text/javascript">
-$(document).ready(function () {
- $( "#id_date" ).datepicker();
- get_workout_session();
-});
-</script>
-
{% endblock %}
{% block content %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index 3f35203a2..7d3511741 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -33,7 +33,6 @@ function init_sortable()
})
}
-// Initialise the datepicker for the modal dialog
$(function() {
init_sortable();
});
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 7edeb268a..1c7505bb5 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -27,6 +27,7 @@ from django.http import HttpResponseForbidden
from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
+from django.utils import formats
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
from django.forms.models import modelformset_factory
@@ -219,7 +220,9 @@ def add(request, pk):
# (we only add new logs here and that seems to be the fastest way)
formset = WorkoutLogFormSet(queryset=WorkoutLog.objects.none())
- dateform = HelperDateForm(initial={'date': datetime.date.today()})
+ dateform = HelperDateForm(initial={'date': formats.date_format(datetime.date.today(),
+ "SHORT_DATE_FORMAT")})
+
# Depending on whether there is already a workout session for today, update
# the current one or create a new one (this will be the most usual case)
if WorkoutSession.objects.filter(user=request.user, date=datetime.date.today()).exists():
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 45e4f7df9..3bbc7149c 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -32,6 +32,7 @@ from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
from django.contrib.auth.decorators import login_required
from django.contrib.formtools.preview import FormPreview
+from django.utils import formats
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
from django.db.models import Min
@@ -78,7 +79,7 @@ class WeightAddView(WgerFormMixin, CreateView):
to pass the user here.
'''
return {'user': self.request.user,
- 'creation_date': datetime.date.today()}
+ 'creation_date': formats.date_format(datetime.date.today(), "SHORT_DATE_FORMAT")}
def form_valid(self, form):
'''
@@ -94,9 +95,6 @@ class WeightUpdateView(WgerFormMixin, UpdateView):
'''
model = WeightEntry
form_class = WeightForm
- custom_js = '''$(document).ready(function () {
- init_weight_datepicker();
- });'''
success_url = reverse_lazy('weight-overview')
def get_context_data(self, **kwargs):