diff --git a/VIPSWeb/static/js/frontpage.js b/VIPSWeb/static/js/frontpage.js index 260bda47a9a3dee0c1c93a93ce13bc1f39f3e1e8..75e7f947c46f252a2ac2680aedaf6091e64c51a5 100755 --- a/VIPSWeb/static/js/frontpage.js +++ b/VIPSWeb/static/js/frontpage.js @@ -66,7 +66,7 @@ var filteredObservations; function cacheObservations() { //$.getJSON(settings.vipslogicProtocol + "://" + settings.vipslogicServerName + "/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) { - $.getJSON("/vipslogicproxy/rest/observation/broadcast/list/" + settings.vipsOrganizationId, function( json ) { + $.getJSON("/vipslogicproxy/rest/observation/broadcast/list/" + settings.vipsOrganizationId + "?season=" + getCurrentYear(), function( json ) { allObservations = json; //console.log(allObservations); filterObservations(); diff --git a/VIPSWeb/static/js/util.js b/VIPSWeb/static/js/util.js index d1e28f9fa7467c27e8cdcfe2980ed8bf6ceb28eb..d156b7b726013cc80b5105578170cd45b06992fa 100755 --- a/VIPSWeb/static/js/util.js +++ b/VIPSWeb/static/js/util.js @@ -75,6 +75,12 @@ function setMomentToMidnight(momentObj) return momentObj.hour(0).minute(0).second(0).millisecond(0); } +function getCurrentYear() +{ + return getSystemTime().year(); + +} + /** * Returns the computed CSS display of the element. Handling both IE * and the normal browsers diff --git a/observations/locale/de/LC_MESSAGES/django.mo b/observations/locale/de/LC_MESSAGES/django.mo index 7f738fc76247996f3a81b8dd19b6a096fa425fd5..9f1651026de521647d7079914362dc39e43581ab 100755 Binary files a/observations/locale/de/LC_MESSAGES/django.mo and b/observations/locale/de/LC_MESSAGES/django.mo differ diff --git a/observations/locale/de/LC_MESSAGES/django.po b/observations/locale/de/LC_MESSAGES/django.po index 8c75c16637c2dcc305fbf31187e66432ad24181d..26a367570632e5d62c6a2648769a18298d2f7fff 100755 --- a/observations/locale/de/LC_MESSAGES/django.po +++ b/observations/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-13 15:02-0700\n" +"POT-Creation-Date: 2017-03-14 16:07-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -51,11 +51,7 @@ msgid "Observation was not quantified" msgstr "" #: templates/observations/detail.html:116 -msgid "Location is hidden" -msgstr "" - -#: templates/observations/detail.html:117 -msgid "The observer has requested that the location is hidden" +msgid "Map view not available" msgstr "" #: templates/observations/index.html:25 templates/observations/index.html:28 diff --git a/observations/locale/nb/LC_MESSAGES/django.mo b/observations/locale/nb/LC_MESSAGES/django.mo index caa54dcd2c5a520a101455b42fb5931e419b6887..8ba93cf30c28a0c3c566cf5005ce6cd98e7794de 100755 Binary files a/observations/locale/nb/LC_MESSAGES/django.mo and b/observations/locale/nb/LC_MESSAGES/django.mo differ diff --git a/observations/locale/nb/LC_MESSAGES/django.po b/observations/locale/nb/LC_MESSAGES/django.po index f81e9377d6908a99b6e5df7115229a1651b6db34..5a30ff61786eb36f9c541f2ae18fd7e9826cc748 100755 --- a/observations/locale/nb/LC_MESSAGES/django.po +++ b/observations/locale/nb/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-13 15:02-0700\n" +"POT-Creation-Date: 2017-03-14 16:07-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -55,12 +55,8 @@ msgid "Observation was not quantified" msgstr "Observasjonen ble ikke kvantifisert" #: templates/observations/detail.html:116 -msgid "Location is hidden" -msgstr "Plasseringen er skjult" - -#: templates/observations/detail.html:117 -msgid "The observer has requested that the location is hidden" -msgstr "Observatøren har bedt om at plasseringen skal være skjult" +msgid "Map view not available" +msgstr "Kartvisning ikke tilgjengelig" #: templates/observations/index.html:25 #: templates/observations/index.html:28 diff --git a/observations/locale/zh_CN/LC_MESSAGES/django.mo b/observations/locale/zh_CN/LC_MESSAGES/django.mo index a13deac788545c69ece15bc23629f82aba2adc81..2ccebfda8096607d428c0e2993b9d9f8a9bb3e1b 100755 Binary files a/observations/locale/zh_CN/LC_MESSAGES/django.mo and b/observations/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/observations/locale/zh_CN/LC_MESSAGES/django.po b/observations/locale/zh_CN/LC_MESSAGES/django.po index 6d5047725669972f63c20c19be8dc1d9c5a364f0..555c8ddc17f851ec567434249956fdf92d1b7eef 100755 --- a/observations/locale/zh_CN/LC_MESSAGES/django.po +++ b/observations/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-13 15:02-0700\n" +"POT-Creation-Date: 2017-03-14 16:07-0700\n" "PO-Revision-Date: 2016-10-27 11:26+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -50,11 +50,7 @@ msgid "Observation was not quantified" msgstr "观测没有定量化" #: templates/observations/detail.html:116 -msgid "Location is hidden" -msgstr "" - -#: templates/observations/detail.html:117 -msgid "The observer has requested that the location is hidden" +msgid "Map view not available" msgstr "" #: templates/observations/index.html:25 templates/observations/index.html:28 diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html index 6dd5c1ec5e02961de01b2090ea23d70c1f64cb89..06888ba6d96d19cdbc522bb663955c3594b55b17 100755 --- a/observations/templates/observations/detail.html +++ b/observations/templates/observations/detail.html @@ -113,9 +113,7 @@ function renderLocationIsHiddenMessage(){ document.getElementById("observationViewMap").parentNode.innerHTML = - "<h2>{% trans "Location is hidden" %}</h2>" + - "<p>{% trans "The observer has requested that the location is hidden" %}</p>" + - "<p><img class='img-responsive' src='{% static "observations/images/globe.png" %}'/></p>"; + "<h2>{% trans "Map view not available" %}</h2>"; } </script> {% endblock %}