diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index cb7def46..24bd6969 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index a9eb736c..ad9ea38a 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -215,7 +215,8 @@ LANGUAGE_COOKIE_NAME = 'wm_lang' # https://docs.djangoproject.com/en/1.9/howto/static-files/ STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, 'static') +STATIC_ROOT = BASE_DIR +#STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), os.path.join(BASE_DIR, 'static/plots'),] diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index 693f91ab..b73c61f8 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -34,6 +34,8 @@ handler403 = 'rowers.views.error403_view' handler404 = 'rowers.views.error404_view' handler500 = 'rowers.views.error500_view' +import django.views.i18n + urlpatterns = [ re_path('^', include('django.contrib.auth.urls')), @@ -86,6 +88,16 @@ urlpatterns += [ # re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'), ] +js_info_dict = { + 'packages': ('recurrence', ), +} + +# jsi18n can be anything you like here +urlpatterns += [ + path('jsi18n/', django.views.i18n.JavaScriptCatalog.as_view(), name="javascript-catalog"), +] +# monkey patch workaround for bug in recurrence library +django.views.i18n.javascript_catalog = None if settings.DEBUG: import debug_toolbar