Small fixes

VIPSWeb/urls.py

@@ -16,8 +16,8 @@
 # along with VIPSWeb.  If not, see <http://www.nibio.no/licenses/>.
 # 
 
-from django.conf.urls import include
-from django.urls import re_path
+
+from django.urls import re_path, path, include
 #from django.views.generic import TemplateView
 from django.views.static import serve
 from django.views.i18n import JavaScriptCatalog
@@ -62,7 +62,7 @@ else:
         re_path(r'^security/', include('security.urls', namespace = "security")),
         re_path(r'^fusarium/', include('fusarium.urls', namespace = "fusarium")),
         re_path(r'^applefruitmoth/', include('applefruitmoth.urls', namespace = "applefruitmoth")),
-        re_path(r'^mock/', include('mock.urls', namespace = "mock")),
+        #re_path(r'^mock/', include('mock.urls', namespace = "mock")),
         # Uncomment the next line to enable the admin:
         re_path(r'^admin/', admin.site.urls),
         re_path(r'^tinymce/', include('tinymce.urls')),
@@ -70,9 +70,10 @@ else:
         re_path(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),
         # Enabling translation in JavaScript files
         # See https://docs.djangoproject.com/en/1.6/topics/i18n/translation/#internationalization-in-javascript-code
-        re_path(r'^jsi18n/$', JavaScriptCatalog.as_view(packages=js_info_dict['packages']), name='javascript-catalog'),
+        path('jsi18n/', JavaScriptCatalog.as_view(packages=js_info_dict['packages']), name='javascript-catalog'),
+        #path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'),
         re_path(r'^i18n/', include('django.conf.urls.i18n')),
-        re_path(r'^settings.js', views.settings_js, name="views.settings_js"),
+        path('settings.js', views.settings_js, name="views.settings_js"),
         re_path(r'^vipslogicproxy/(?P<path>.*)$', views.vipslogicproxy),
         # Default view is index
         re_path(r'^$', views.index, name='index'),

cerealblotchmodels/locale/nb/LC_MESSAGES/django.po

-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2020-06-22 10:02+0200\n"
-"PO-Revision-Date: 2020-06-22 10:02+0200\n"
-=======
-"POT-Creation-Date: 2020-09-30 10:35+0200\n"
-"PO-Revision-Date: 2020-03-25 09:18+0100\n"
->>>>>>> epleviklerNewFeatures
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: nb\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:25
-#: templates/cerealblotchmodels/PPOmodelform.html:336
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:449
-msgid "Septoria humidity model"
-msgstr "Fuktmodell bladflekksjukdommer i hvete"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:28
-msgid "Plant Protection Online Model"
-msgstr "Planteværn Online-modell"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:32
-msgid "Input data"
-msgstr "Input-data"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:35
-msgid "Results"
-msgstr "Resultater"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:41
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:39
-msgid "Country"
-msgstr "Land"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:43
-#: templates/cerealblotchmodels/PPOmodelform.html:50
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:41
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:48
-msgid "Please select"
-msgstr "Vennligst velg"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:48
-#: templates/cerealblotchmodels/barleynetblotchform.html:49
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:46
-#: templates/cerealblotchmodels/wheatleafblotchform.html:51
-msgid "Weather station"
-msgstr "Målestasjon"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:56
-#: templates/cerealblotchmodels/wheatleafblotchform.html:46
-msgid "Growth stage"
-msgstr "Vekststadium"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:61
-msgid "Susceptibility"
-msgstr "Mottakelighet"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:68
-msgid "Severity"
-msgstr "Alvorlighetsgrad"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:80
-#: templates/cerealblotchmodels/barleynetblotchform.html:108
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:153
-#: templates/cerealblotchmodels/wheatleafblotchform.html:136
-msgid "Run model"
-msgstr "Kjør modell"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:122
-msgid ""
-"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
-"is not designed to work with Internet Explorer, you may experience errors "
-"and missing features. Please use a different browser, like Mozilla Firefox, "
-"Microsoft Edge or Google Chrome."
-msgstr ""
-"ADVARSEL: Det ser ut som du bruker Internet Explorer på denne websiden. VIPS "
-"er ikke designet for å fungere med Internet Explorer, så du må forvente feil "
-"og manglende funksjonalitet. Vennligst bruk en moderne nettleser som "
-"Microsoft Edge, Firefox eller Google Chrome."
-
-#: templates/cerealblotchmodels/PPOmodelform.html:224
-#: templates/cerealblotchmodels/barleynetblotchform.html:281
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:316
-#: templates/cerealblotchmodels/wheatleafblotchform.html:344
-msgid "Select weather station"
-msgstr "Velg målestasjon"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:248
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:360
-msgid "The model is running, please wait"
-msgstr "Modellen kjører, vennligst vent"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:267
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:379
-msgid "Leaf wetness, hourly"
-msgstr "Bladfukt, timesverdi"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:268
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:380
-msgid "Rain, hourly"
-msgstr "Regn, timeverdi"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:269
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:381
-msgid "Relative humidity, hourly mean"
-msgstr "Relativ luftfuktighet, timesgjennomsnitt"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:270
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:382
-msgid "Humid hour (yes/no)"
-msgstr "Fuktig time (ja/nei)"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:271
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
-msgid "Humid period hour"
-msgstr "Time nr i fuktig periode"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:272
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:384
-msgid "Humid hour sum"
-msgstr "Sum fuktige timer"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:273
-#: templates/cerealblotchmodels/PPOmodelform.html:331
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:385
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:444
-msgid "Humid period hour outside protection period"
-msgstr "Time nr x i fuktig periode utenfor sprøyteperiode"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:280
-#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:392
-#: templates/cerealblotchmodels/wheatleafblotchform.html:265
-msgid "Time"
-msgstr "Tid"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:287
-#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:399
-#: templates/cerealblotchmodels/wheatleafblotchform.html:275
-msgid "Warning status"
-msgstr "Varselstatus"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:327
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:440
-msgid "Hours"
-msgstr "Timer"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:332
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:445
-msgid "Threshold humid period"
-msgstr "Terskelverdier for fuktighet"
-
-#: templates/cerealblotchmodels/PPOmodelform.html:333
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:446
-msgid "Spraying protection period"
-msgstr "Beskyttelse etter sprøyting"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:25
-#: templates/cerealblotchmodels/barleynetblotchform.html:34
-msgid "Barley net blotch"
-msgstr "Byggbrunflekk"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:42
-msgid "Background data for the barley net blotch model"
-msgstr "Bakgrunnsdata for byggbrunflekkmodellen"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:57
-msgid "Sowing date"
-msgstr "Sådato"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:60
-msgid "Crop"
-msgstr "Kultur"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:67
-msgid "Same crop as last season"
-msgstr "Samme kultur som i fjor"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:74
-msgid "Plowed"
-msgstr "Pløyd"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
-msgid "Observation date"
-msgstr "Observasjonsdato"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:83
-msgid "&#37; Infected leaves"
-msgstr "&#37; infiserte blad"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:94
-msgid "Spraying date"
-msgstr "Sprøytedato"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:93
-msgid "Preparation"
-msgstr "Plantevernmiddel"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:105
-#: templates/cerealblotchmodels/wheatleafblotchform.html:116
-#: templates/cerealblotchmodels/wheatleafblotchform.html:127
-msgid "Preparation dose"
-msgstr "Dose"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:143
-msgid "Model is running, please wait"
-msgstr "Modellen kjører, vennligst vent"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:154
-msgid "Scroll past chart by swiping the dotted line on the right"
-msgstr "Rull forbi diagram ved å sveipe den prikkede linjen til høyre"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:180
-msgid "Missing observation information"
-msgstr "Observasjonsinformasjon mangler"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:189
-msgid "Missing spraying information"
-msgstr "Sprøyteinformasjon mangler"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:256
-msgid "Temperature, daily mean"
-msgstr "Temperatur, døgngjennomsnitt"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:195
-msgid "Rain last 28 days"
-msgstr "Regn siste 28 døgn"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:196
-msgid "Rain, daily"
-msgstr "Regn, daglig"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:197
-msgid "Day degrees since sowing"
-msgstr "Døgngrader siden såing"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:198
-#: templates/cerealblotchmodels/barleynetblotchform.html:265
-#: templates/cerealblotchmodels/wheatleafblotchform.html:257
-#: templates/cerealblotchmodels/wheatleafblotchform.html:328
-msgid "Threshold"
-msgstr "Terskelverdi"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:199
-#: templates/cerealblotchmodels/barleynetblotchform.html:266
-#: templates/cerealblotchmodels/wheatleafblotchform.html:258
-#: templates/cerealblotchmodels/wheatleafblotchform.html:329
-msgid "Disease"
-msgstr "Sykdom"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:249
-#: templates/cerealblotchmodels/wheatleafblotchform.html:312
-msgid "No data returned"
-msgstr "Ingen data returnert"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:262
-#: templates/cerealblotchmodels/wheatleafblotchform.html:325
-msgid "Disease value"
-msgstr "Sykdomsverdi"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:269
-msgid "Barley net blotch development"
-msgstr "Utvikling av byggbrunflekk"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:307
-#: templates/cerealblotchmodels/wheatleafblotchform.html:373
-msgid "Select crop"
-msgstr "Velg kultur"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:335
-#: templates/cerealblotchmodels/wheatleafblotchform.html:413
-msgid "Select preparation"
-msgstr "Velg plantevernmiddel"
-
-#: templates/cerealblotchmodels/barleynetblotchform.html:364
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:210
-#: templates/cerealblotchmodels/wheatleafblotchform.html:445
-msgid ""
-"WARNING: We suspect you are using Internet Explorer to view this site. VIPS "
-"is not designed to work with Internet Explorer, you may experience errors "
-"and missing features. Please use a different browser, like Microsoft Edge or "
-"Google Chrome."
-msgstr ""
-"ADVARSEL: Det ser ut som du bruker Internet Explorer på denne websiden. VIPS "
-"er ikke designet for å fungere med Internet Explorer, så du må forvente feil "
-"og manglende funksjonalitet. Vennligst bruk en moderne nettleser som "
-"Microsoft Edge, Firefox eller Google Chrome."
-
-#: templates/cerealblotchmodels/index.html:25
-#: templates/cerealblotchmodels/index.html:27
-msgid "Cereal blotch models"
-msgstr "Bladflekksjukdommer i korn"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:29
-msgid ""
-"Fuktmodellen er et beslutningsstøtteverktøy, utviklet av <a href='https://"
-"www.seges.dk/'>SEGES</a>, Danmark, for å kunne vurdere risiko for angrep av "
-"hvetebladprikk i høsthvete under danske forhold. <a href='/forecasts/models/"
-"SEPTORIAHU/' target='new'>Les mer</a>"
-msgstr ""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:33
-msgid "Background data"
-msgstr "Bakgrunnsdata"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:53
-msgid "Sprayings"
-msgstr "Utførte sprøytinger"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:55
-msgid "Spraying 1"
-msgstr "Sprøytedato 1"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:60
-msgid "Spraying 2"
-msgstr "Sprøytedato 2"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:70
-msgid "Phenology"
-msgstr "Dato for utviklingsstadium"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:72
-msgid "Growth stage 31"
-msgstr "BBCH 31. Beg. strekning"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:77
-msgid "3rd upper leaf (gs 32)"
-msgstr "BBCH 32. 2. leddknute synlig"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:82
-msgid "2nd upper leaf (gs 33)"
-msgstr "BBCH 33. 3. leddknute synlig"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:87
-msgid "Upper leaf (gs 37-39)"
-msgstr "BBCH 37-39. Flaggblad under utvikling"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:92
-msgid "All kernels fully developed (gs 75)"
-msgstr "BBCH 75. Melkemodning"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:97
-msgid "Show advanced settings"
-msgstr "Vis avanserte innstillinger"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:102
-msgid "Threshold values for humid hour"
-msgstr "Terskelverdier for fuktighet"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:104
-msgid "Relative humidity"
-msgstr "Relativ luftfuktighet"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:109
-msgid "Leaf wetness (min/hour)"
-msgstr "Bladfukt (min/t)"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:114
-msgid "Precipitation"
-msgstr "Nedbør"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:119
-msgid "Sliding hours past (hours)"
-msgstr "Referanseperiode, bakover (timer)"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:124
-msgid "Sliding hours ahead (hours)"
-msgstr "Prognoseperiode, fremover (timer)"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:132
-msgid "Other threshold values"
-msgstr "Andre terskelverdier"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:134
-msgid "Number of consecutive 'humid hours'"
-msgstr "Antall sammenhengende \"fuktige timer\""
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:139
-msgid "Spraying protection days"
-msgstr "Forv. ant. dager beskyttelse etter sprøyting"
-
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:144
-msgid "Leaf life time (days)"
-msgstr "Levetid for blad (dager)"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:25
-#: templates/cerealblotchmodels/wheatleafblotchform.html:34
-msgid "Wheat leaf blotch"
-msgstr "Bladflekksjukdommer i hvete"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:39
-msgid "Background data for the wheat leaf blotch model"
-msgstr "Bakgrunnsdata for bladflekksjukdomsmodellen"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:62
-msgid "Wheat variety"
-msgstr "Hvetesort"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:69
-msgid "Previous crop was wheat"
-msgstr "Fjorårets vekst var hvete"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:92
-msgid "Spraying"
-msgstr "Sprøytinger"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:99
-msgid "Preparation 1"
-msgstr "Plantevernmiddel 1"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:110
-msgid "Preparation 2"
-msgstr "Plantevernmiddel 2"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:121
-msgid "Preparation 3"
-msgstr "Plantevernmiddel 3"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:197
-msgid "Missing spraying information on second preparation"
-msgstr "Sprøyteinformasjon mangler"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:208
-msgid "Too early to calculate risk"
-msgstr "For tidlig å beregne risiko"
-
-#: templates/cerealblotchmodels/wheatleafblotchform.html:332
-msgid "Wheat leaf blotch development"
-msgstr "Utvikling av bladflekksjukdom i hvete"