From 21ceebff26fe6e78c01f01987b78d1e4110d284b Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 12 Jun 2018 15:11:16 +0200
Subject: [PATCH] Text changes and IE detector
---
VIPSWeb/templates/index.html | 9 +-
VIPSWeb/templates/settings.js | 2 +
VIPSWeb/views.py | 14 +-
.../locale/de/LC_MESSAGES/django.mo | Bin 421 -> 421 bytes
.../locale/de/LC_MESSAGES/django.po | 139 ++++++++++------
.../locale/nb/LC_MESSAGES/django.mo | Bin 4583 -> 5909 bytes
.../locale/nb/LC_MESSAGES/django.po | 141 ++++++++++------
.../locale/zh_CN/LC_MESSAGES/django.mo | Bin 2212 -> 2212 bytes
.../locale/zh_CN/LC_MESSAGES/django.po | 151 ++++++++++++------
.../wheatleafblotchform.html | 8 +-
10 files changed, 308 insertions(+), 156 deletions(-)
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index 83e19eeb..4720f4bb 100755
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -41,9 +41,12 @@
{% if user_is_stock_android %}
if(confirm("{% trans "WARNING: We recommend using Chrome on Android handsets. Click OK to install Chrome, or Cancel to proceed without installing Chrome." %}")) {window.location.href="https://play.google.com/store/apps/details?id=com.android.chrome";}
{% endif %}
- {% if user_is_ie %}
- alert("{% trans "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." %}");
- {% endif %}
+
+ if(settings.userIsIE)
+ {
+ alert("{% trans "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." %}");
+ }
+
var longitude = {{settings.MAP_CENTER_LONGITUDE|unlocalize}};
var latitude = {{settings.MAP_CENTER_LATITUDE|unlocalize}};
diff --git a/VIPSWeb/templates/settings.js b/VIPSWeb/templates/settings.js
index 61eb0755..5e0d7231 100755
--- a/VIPSWeb/templates/settings.js
+++ b/VIPSWeb/templates/settings.js
@@ -37,6 +37,8 @@ var settings = {
datePickerConfig : datePickerConfig,
+ userIsIE: {{user_is_ie|yesno:"true,false"}},
+
highchartsGlobalOptions: {
lang: {
shortMonths: [gettext("Jan"),gettext("Feb"),gettext("Mar"),gettext("Apr"),gettext("May"),gettext("Jun"),gettext("Jul"),gettext("Aug"),gettext("Sep"),gettext("Oct"),gettext("Nov"),gettext("Dec")],
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
index 50431799..e4cb71dd 100755
--- a/VIPSWeb/views.py
+++ b/VIPSWeb/views.py
@@ -31,9 +31,7 @@ def index(request):
try:
# Check if user is on stock Android browser, which performs poorly with OpenLayers
user_is_stock_android = False
- user_is_ie = False
user_agent = request.META['HTTP_USER_AGENT']
- print user_agent
if user_agent.find("Android") >= 0 and user_agent.find("Windows") < 0:
chrome_index = user_agent.find("Chrome")
if chrome_index < 0:
@@ -42,8 +40,6 @@ def index(request):
chrome_version = user_agent[chrome_index+7:chrome_index+9]
if int(chrome_version) < 40:
user_is_stock_android = True
- if user_agent.find("MSIE") >= 0 or user_agent.find("Trident") >= 0:
- user_is_ie = True
user_uuid = request.GET.get("returnUUID",None)
if user_uuid == None:
@@ -60,7 +56,6 @@ def index(request):
'advertisements': advertisements,
'crop_categories': CropCategory.get_crop_categories(translation.get_language()),
'user_is_stock_android': user_is_stock_android,
- 'user_is_ie': user_is_ie,
}
return render(request, 'index.html', context)
except ValueError:
@@ -68,7 +63,14 @@ def index(request):
# Serving settings for JavaScript
def settings_js(request):
- context = {'crop_categories': CropCategory.get_crop_categories_from_vipslogic_as_text()}
+ user_agent = request.META['HTTP_USER_AGENT']
+ user_is_ie = False
+ if user_agent.find("MSIE") >= 0 or user_agent.find("Trident") >= 0:
+ user_is_ie = True
+ context = {
+ 'crop_categories': CropCategory.get_crop_categories_from_vipslogic_as_text(),
+ 'user_is_ie': user_is_ie,
+ }
return render(request,'settings.js', context, content_type="application/javascript;charset=UTF-8")
## TODO: Is this being used???
diff --git a/cerealblotchmodels/locale/de/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/de/LC_MESSAGES/django.mo
index 8d0348cd4f57fc0808a17665a2327698bb2fb9dc..ca7fd52f68c927163581605f4f6e75bce46754dd 100755
GIT binary patch
delta 21
ccmZ3=yp(xDFPE9Fp^<{2sg;4*#_4>F07L%;y8r+H
delta 21
ccmZ3=yp(xDFPEvVfsultp_P&0#_4>F07JM1vH$=8
diff --git a/cerealblotchmodels/locale/de/LC_MESSAGES/django.po b/cerealblotchmodels/locale/de/LC_MESSAGES/django.po
index 8c1b819a..e700d1e4 100755
--- a/cerealblotchmodels/locale/de/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2018-05-02 11:21+0200\n"
+"POT-Creation-Date: 2018-06-12 15:06+0200\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"
@@ -29,156 +29,150 @@ msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:49
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:49
+#: templates/cerealblotchmodels/wheatleafblotchform.html:55
msgid "Weather station"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
+#: templates/cerealblotchmodels/wheatleafblotchform.html:61
msgid "Sowing date"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:60
-#: templates/cerealblotchmodels/wheatleafblotchform.html:60
msgid "Crop"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:67
-#: templates/cerealblotchmodels/wheatleafblotchform.html:67
msgid "Same crop as last season"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:72
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
msgid "Plowed"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:82
msgid "Observation date"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:84
+#: templates/cerealblotchmodels/wheatleafblotchform.html:87
msgid "% Infected leaves"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:90
+#: templates/cerealblotchmodels/wheatleafblotchform.html:98
msgid "Spraying date"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:93
-#: templates/cerealblotchmodels/wheatleafblotchform.html:95
msgid "Preparation"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:101
+#: templates/cerealblotchmodels/wheatleafblotchform.html:109
+#: templates/cerealblotchmodels/wheatleafblotchform.html:120
+#: templates/cerealblotchmodels/wheatleafblotchform.html:131
msgid "Preparation dose"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:108
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:110
+#: templates/cerealblotchmodels/wheatleafblotchform.html:140
msgid "Run model"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:117
+#: templates/cerealblotchmodels/wheatleafblotchform.html:147
msgid "Model is running, please wait"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:128
+#: templates/cerealblotchmodels/wheatleafblotchform.html:158
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:154
+#: templates/cerealblotchmodels/wheatleafblotchform.html:184
msgid "Missing observation information"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:163
+#: templates/cerealblotchmodels/wheatleafblotchform.html:193
msgid "Missing spraying information"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:196
+#: templates/cerealblotchmodels/wheatleafblotchform.html:260
msgid "Temperature, daily mean"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:195
-#: templates/cerealblotchmodels/wheatleafblotchform.html:197
msgid "Rain last 28 days"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:196
-#: templates/cerealblotchmodels/wheatleafblotchform.html:198
msgid "Rain, daily"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:197
-#: templates/cerealblotchmodels/wheatleafblotchform.html:199
msgid "Day degrees since sowing"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:198
#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:200
-#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:261
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
msgid "Threshold"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:199
#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
-#: templates/cerealblotchmodels/wheatleafblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:333
msgid "Disease"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:382
-#: templates/cerealblotchmodels/wheatleafblotchform.html:208
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: templates/cerealblotchmodels/wheatleafblotchform.html:269
msgid "Time"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:389
-#: templates/cerealblotchmodels/wheatleafblotchform.html:216
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
+#: templates/cerealblotchmodels/wheatleafblotchform.html:279
msgid "Warning status"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:316
msgid "No data returned"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
msgid "Disease value"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:267
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
msgid "Barley net blotch development"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:279
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:281
+#: templates/cerealblotchmodels/wheatleafblotchform.html:348
msgid "Select weather station"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:377
msgid "Select crop"
msgstr ""
#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:417
msgid "Select preparation"
msgstr ""
@@ -189,6 +183,7 @@ msgstr ""
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
msgid "Septoria humidity model"
msgstr ""
@@ -278,48 +273,48 @@ msgstr ""
msgid "Leaf life time (days)"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:350
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
msgid "The model is running, please wait"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:369
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
msgid "Leaf wetness, hourly"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
msgid "Rain, hourly"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
msgid "Relative humidity, hourly mean"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
msgid "Humid hour (yes/no)"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
msgid "Humid period hour"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
msgid "Humid hour sum"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:433
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
msgid "Humid period hour outside protection period"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:429
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
msgid "Hours"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
msgid "Threshold humid period"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
msgid "Spraying protection period"
msgstr ""
@@ -328,6 +323,54 @@ msgstr ""
msgid "Wheat leaf blotch"
msgstr ""
-#: templates/cerealblotchmodels/wheatleafblotchform.html:42
+#: templates/cerealblotchmodels/wheatleafblotchform.html:43
msgid "Background data for the wheat leaf blotch model"
msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:50
+msgid "Growth stage"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+msgid "Wheat variety"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+msgid "Previous crop was wheat"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+msgid "Spraying"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+msgid "Preparation 1"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+msgid "Preparation 2"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+msgid "Preparation 3"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+msgid "Missing spraying information on second preparation"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+msgid "Too early to calculate risk"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+msgid "Wheat leaf blotch development"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:449
+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 ""
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.mo
index 67fcaa9b70056f1e1b90b5f6284d8373f7a71f5a..29a0d759c4cdcfdbcc858b58548189df1610c111 100755
GIT binary patch
delta 2826
zcmaE^JXNp$o)F7a1_lNOe+C8y83qQ1DNGCu*$fN}Jggv528JDM3=E<S3=BKj7#PGD
z7#Pk&>1S*V49W})41d`e82A|&7!=tV81xw!7!09wB0B?vAOi!#M0N%SSq27%#q10W
zA`A=+2iX}I*cliYuCX&PurM&xGu&fmV31&7V0a9b_`}Y?z{|kEz{0`6z{9}6AjAQ&
zK%Rqv0puoq4h9Bc1_lOG4h9B31_lOC4v0k&91INF3=9le91sUj<6vMAXJBAh!vV4Q
z2nPd$JOcy6O%8}he{wJ|7%|i{Fo<zNT<FQkz#zcDz>v-f@mU3wKZg_I^R=7|44e!M
z3`aO24m`)nz`(}9z;Fl3f6U3iz|FwG@Da-Y3#GZaAnGN#Am*!cK^$hm#lRp~&%nSC
zzy;Bm#0Bwj9!P?LfuWj<fkBRefuWZRV(}U-NJwqtVqmZYMFmtJCpQCw5Ca2)C^y8R
z8r%>I?70~jq!}0(!nqk3q!<_&in$^7^l>vVa4;}1%;IKXsOJL34L8Jv>$o8n?15^y
z$_=sj1JuA@+zbqgpeW&ih@0?0EVSc+h==lk<CLMC2V!vz4<ssP@GvlZWME)e#{-G7
z1-y_bUC+x<4^AZec_C47kr(2S_q+@Y*^CSfe|aHsm&p(DK^;HDXEXU37}OXT7&h`l
z)ZgG|U{GgZV0gw4NdtTW5OFI3h&~S}oh$%xV4VOY>Y4@WAwKSc3M>|YM8PU3y<Gs}
z;v)i(#CKT$;-H%XkVN-R0HPn{3nK;w21!8(-$xJ<*QtUK^<{#P#Mdnd37OSU`gpw{
z1A_u6^+Of12r)3If(#OZ7+^01F(5z)VqvNf#6jgk5FfM&L9$aXRQ*&TNLpA1rFTN<
zGeQub-xq>}$P*z*E~@`81o5%3FeFYCgduTeAk4s^!N9=aCJd3!7ls6VjW7d)J*b=z
zh9ssdQ1uUlArAZ|3^ABP1d@1VL?BUXEdp_9qzJ^kL=mt@>KXE&0<|Ix44MoK3|%6S
z{J8}xei3TGJrPJq{eg<hib5>Vg3_L%3=GT+3=A2f5dAr#5RY_<GBEHnGBC^+g;=~^
z3_|Y_14TtW1H(x%NRU4jgQRM1aRvrP1_lOqNC5~gG(Zm1VqjoUVt`np2bF_Spc2pu
z$^j)zQ1${9QlQ)gD$GD7AygVnnKD4i7)Mb4w*U)4g4c`zlD9$m6(sD+z`$SvDpo;7
zG6MsH4g&*&2LmLvgXBR)E{F!D83P6e23-b74geKQ4h)c>2bG%Epftt6z~IZkz~BeU
z!VHkm1KH2u1u_9z{)3pt3=9l53=9l*APxfqgDnFj?pQ$OJOd<Mfa(H}v?l{3p@LFB
zh!4U{AOZ=4ifK0}--iK`en52rCj)~Mg9-yE9v~GER1LU3fU!Zj!<+$<*g#@V3=9k|
z3=9n3pc0RPfx&t6TGmX)$(-yzCqHGE7F5X3Qz%YN&d*CxC@4xTNGzKCoBf!ZAwvL|
zlUS0OpQm7i!ZSwUrQ{c<f&|Jk^Gk~rl8f>S6v`8e70NSG6H6u^<!H1>F3QizQ7A|(
zE>TF%NGvK*NUBsQF3&8;%u81&$w*a5$uB8MO;O0n%u5Bi1te6InVwNH*@bh~<g1*w
zq(k!a6;cz6aw-){@)eR3bCOGQ5=&AQiZY9{C$Hm@sCNwV^YnAKQV35~C@w87NKGzL
zsLU@_NGwWKC@lur;+a>HT9lVsqTpIlkdt4OS_CqvEHkxSp(G=-SfMzxBvnr#%rhWZ
zA+uN^FTX?~CABy+Jufu{q^>-_C|jXCvm`?S!x$Z~J@vVXl?tg91*t`usd>q%3aLd!
z`9;MFiFqjsxtYaa2c)GYmXsEy7V9Yl<fJARgWQ#>kf@N7nU<DXl$uwfkW`dkUYuH_
zqmYxCovPrQnOu}#oS#;r;F^-2s*qo#;GUnKo|CHJoKcjYo2thUo>-Iz@>p?6VoB-b
zOI#}2;h^AF$Vp91Q%K6mFG<c&NJ%YA&B-swP0cG|fXJ357G<WER8IcN70P9%YiOik
zXli9(wmF15jftr=ck_B)7RJfb`R<1Y<Rs>mq?V-?<>h9kq@?C37&2f88DR<;Gq`|~
zf?HO8(cz^<sU^h<WvSW4B?@JUMG6^ZsU?#u`KQ|lmFDCqq~#YSWh$g(CZ-o9<|>q>
zrYIa<s!&{(npu#lkdm6GP*9Yaot>JJ3Q7}Msd)+|nK=p>hj&yKrB3D-n97=&m!4WQ
zd5*yUdbj){g_6vaoXm8P2}!9%sp)y(gprw@&v1A~Sy8G&Qchxuf<{@fg0Z=-v85)1
zqf3}$P_V0ym4ZuZi9&H|kwR&SLUDesLQ1JZQc-DkY7u5UD-;}F3UXLpszP~cQgLQV
zY92Vf)CVi17Ab(-3QI91Aisg!l2!_GWU4}LY6_-#Its-g14|Wh4=)92C`-*NNmWQo
z&CF5APglrI%uCNn%}YsDNGr|DF3!r&OU%hENiES+2usb&%gIbH2BnwMY=u;pJcZo+
z6j0Ju$V)9L$w>uy2jmyj1f-+jmRXdVmS3Tenv;`?o|q<Y5HvRkEh)>)&H*K<#4>P@
hrRAh%XBTIcW~b!mDrAD=FO|WgEVU%HIKQZb0RZ4L6LbIo
delta 1595
zcmbQL_guODo)F7a1_lNOX9fla83qOh6D9_RNCpN59~O`(1H%SZ1_n_E28NBS3=Con
z3=GGi^gUJv24w~YhOev)4EziX43caN4EhWV44P0nl8u2ukb!}rlZ}BvmVtp`HX8$j
z2m=GdPBsPxb_NE9b8HL@EDQ|w4A<Bg7$g`N7;Zx)zOXSc@G>wk{9%I_%*D>Yz{<eD
zAjQtWAk4tPpuo<+zz1?DJH!HKb_ND*1_p*uc8Eh8*%=tb85kI*vqLOg&(6Rg&%nTN
zgdO6+C+rXhF>)|42r$$$FvxR2d}06=U|<O0fcP|(gMopQfq|ih1LB}I4h9A`1_p*H
zQ2uNV1_o{h28NYTeOoyo4mt)Ezrn%4z{9}6@B}LUk%NIjj)8%JnG<5J5+?(LL_Gro
zgAOOeAXiQX1|bFphCoh;15!94KB?wpV31~DV3^Fwz#zrIz_1>w{uCzz0~Z4W!!=Hb
z10RA6WME);4^_v(1+hq(3u2Bg7XyPL0|SFAR6L!FfuSB0r-e|74lZz<Fs$N&1m$`z
zNKhZ;f<(m?E{G4Ga4|4sGcquI<AMZn5)Z^-<vb9JCh;&Zs4*}wtm1(<>>>{XgE|8P
z!+jn|RI&3y#Ep3w>cKv8<b@az!wYdhIWHurYj`1PqZ!Jd!wU)0#k>%QZQzBZjs3h3
zhaBaFIPex!-y2>A1|tRr239_ZITn1NIA>r8<b$YB;seD$0|P@jA0&vU^D!_eFfcG|
zhAOzi$H1V<z`*bls*#@`qEUe#Vv#97#3And5C@0xLsEAvKg6O`eu#(4_#uh6njhkU
zett-Z&Z*~z1oawz1_liV28KgW1+V!bLHUCpk~RbcAnIfUAQl@5Kn!#dfF!C20Z6JY
z7l1fmssO}ca|Iw4t`T5h&;(^a0Z1-*3>B{jWl~W7<Q0VYTw4&L!AB5ca3qwj5M*Fr
z24yQjh(l&W)op~*`vf5&cv_Hwfsp~?8BhrV%Gx#z3=9S!4itkDIVd4Bfbu`65CMtn
zF)%QgGB7aMF)%PFF+dU!NF0>%LD>dW2stq@FsLv<QoSw%1A_wtB!yctFfeE_Ffdp#
zK;l~xT9|<fCXg8*?8pE~{h+eKmH`r7JfQq<%m9f~YX$}eLk38&f;51zJp%)SIRgU&
z2Z+M}$(Cjekkktb4X7}K00ShrK|u^E^+4h}43H=Rm5Lxf2!qlRsBi)mNFY9g1(<{s
zzf7P~4ax_VzMw1v;(`(+s04(m1r?v%o42xMGEUa!cr)3Hb3aQ;esSt#f3C*KT--Az
zujale8d^}0TBMMZnwX}bkzTA|Y_4l;sX2K*uhHbcydhksx&}rHhK5!~hMS}L(wHWn
w6Zkp#vEX55m;B<%e}$$`z9Kwja;eC7(Ze&!ic%GlauQP%G|J$ntP?W_0OQJ*YybcN
diff --git a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po b/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
index 8ba9b8a3..22a84333 100755
--- a/cerealblotchmodels/locale/nb/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2018-05-02 11:21+0200\n"
+"POT-Creation-Date: 2018-06-12 15:06+0200\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"
@@ -29,156 +29,150 @@ msgstr "Bakgrunnsdata for byggbrunflekkmodellen"
#: templates/cerealblotchmodels/barleynetblotchform.html:49
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:49
+#: templates/cerealblotchmodels/wheatleafblotchform.html:55
msgid "Weather station"
msgstr "Målestasjon"
#: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
+#: templates/cerealblotchmodels/wheatleafblotchform.html:61
msgid "Sowing date"
msgstr "Sådato"
#: templates/cerealblotchmodels/barleynetblotchform.html:60
-#: templates/cerealblotchmodels/wheatleafblotchform.html:60
msgid "Crop"
msgstr "Kultur"
#: templates/cerealblotchmodels/barleynetblotchform.html:67
-#: templates/cerealblotchmodels/wheatleafblotchform.html:67
msgid "Same crop as last season"
msgstr "Samme kultur som i fjor"
#: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:72
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
msgid "Plowed"
msgstr "Pløyd"
#: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:82
msgid "Observation date"
msgstr "Observasjonsdato"
#: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:84
+#: templates/cerealblotchmodels/wheatleafblotchform.html:87
msgid "% Infected leaves"
msgstr "% infiserte blad"
#: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:90
+#: templates/cerealblotchmodels/wheatleafblotchform.html:98
msgid "Spraying date"
msgstr "Sprøytedato"
#: templates/cerealblotchmodels/barleynetblotchform.html:93
-#: templates/cerealblotchmodels/wheatleafblotchform.html:95
msgid "Preparation"
msgstr "Plantevernmiddel"
#: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:101
+#: templates/cerealblotchmodels/wheatleafblotchform.html:109
+#: templates/cerealblotchmodels/wheatleafblotchform.html:120
+#: templates/cerealblotchmodels/wheatleafblotchform.html:131
msgid "Preparation dose"
msgstr "Dose"
#: templates/cerealblotchmodels/barleynetblotchform.html:108
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:110
+#: templates/cerealblotchmodels/wheatleafblotchform.html:140
msgid "Run model"
msgstr "Kjør modell"
#: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:117
+#: templates/cerealblotchmodels/wheatleafblotchform.html:147
msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
#: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:128
+#: templates/cerealblotchmodels/wheatleafblotchform.html:158
msgid "Scroll past chart by swiping the dotted line on the right"
-msgstr ""
+msgstr "Rull forbi diagram ved å sveipe den prikkede linjen til høyre"
#: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:154
+#: templates/cerealblotchmodels/wheatleafblotchform.html:184
msgid "Missing observation information"
msgstr "Observasjonsinformasjon mangler"
#: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:163
+#: templates/cerealblotchmodels/wheatleafblotchform.html:193
msgid "Missing spraying information"
msgstr "Sprøyteinformasjon mangler"
#: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:196
+#: templates/cerealblotchmodels/wheatleafblotchform.html:260
msgid "Temperature, daily mean"
msgstr "Temperatur, døgngjennomsnitt"
#: templates/cerealblotchmodels/barleynetblotchform.html:195
-#: templates/cerealblotchmodels/wheatleafblotchform.html:197
msgid "Rain last 28 days"
msgstr "Regn siste 28 døgn"
#: templates/cerealblotchmodels/barleynetblotchform.html:196
-#: templates/cerealblotchmodels/wheatleafblotchform.html:198
msgid "Rain, daily"
msgstr "Regn, daglig"
#: templates/cerealblotchmodels/barleynetblotchform.html:197
-#: templates/cerealblotchmodels/wheatleafblotchform.html:199
msgid "Day degrees since sowing"
msgstr "Døgngrader siden såing"
#: templates/cerealblotchmodels/barleynetblotchform.html:198
#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:200
-#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:261
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
msgid "Threshold"
msgstr "Terskelverdi"
#: templates/cerealblotchmodels/barleynetblotchform.html:199
#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
-#: templates/cerealblotchmodels/wheatleafblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:333
msgid "Disease"
msgstr "Sykdom"
#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:382
-#: templates/cerealblotchmodels/wheatleafblotchform.html:208
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: templates/cerealblotchmodels/wheatleafblotchform.html:269
msgid "Time"
msgstr "Tid"
#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:389
-#: templates/cerealblotchmodels/wheatleafblotchform.html:216
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
+#: templates/cerealblotchmodels/wheatleafblotchform.html:279
msgid "Warning status"
msgstr "Varselstatus"
#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:316
msgid "No data returned"
msgstr "Ingen data returnert"
#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
msgid "Disease value"
msgstr "Sykdomsverdi"
#: templates/cerealblotchmodels/barleynetblotchform.html:267
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
msgid "Barley net blotch development"
msgstr "Utvikling av byggbrunflekk"
#: templates/cerealblotchmodels/barleynetblotchform.html:279
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:281
+#: templates/cerealblotchmodels/wheatleafblotchform.html:348
msgid "Select weather station"
msgstr "Velg målestasjon"
#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:377
msgid "Select crop"
msgstr "Velg kultur"
#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:417
msgid "Select preparation"
msgstr "Velg plantevernmiddel"
@@ -189,6 +183,7 @@ msgstr "Bladflekksjukdommer i korn"
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
msgid "Septoria humidity model"
msgstr "Septoria fuktmodell"
@@ -278,48 +273,48 @@ msgstr "Antall dager beskyttelse etter sprøyting"
msgid "Leaf life time (days)"
msgstr "Levetid for blad (dager)"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:350
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
msgid "The model is running, please wait"
msgstr "Modellen kjører, vennligst vent"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:369
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
msgid "Leaf wetness, hourly"
msgstr "Bladfukt, timesverdi"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
msgid "Rain, hourly"
msgstr "Regn, timeverdi"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
msgid "Relative humidity, hourly mean"
msgstr "Relativ luftfuktighet, timesgjennomsnitt"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
msgid "Humid hour (yes/no)"
msgstr "Fuktig time (ja/nei)"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
msgid "Humid period hour"
msgstr "Time nr i fuktig periode"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
msgid "Humid hour sum"
msgstr "Sum fuktige timer"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:433
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
msgid "Humid period hour outside protection period"
msgstr "Time nr x i fuktig periode utenfor sprøyteperiode"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:429
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
msgid "Hours"
msgstr "Timer"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
msgid "Threshold humid period"
msgstr "Terskelverdier for fuktig time"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
msgid "Spraying protection period"
msgstr "Beskyttelse etter sprøyting"
@@ -328,7 +323,55 @@ msgstr "Beskyttelse etter sprøyting"
msgid "Wheat leaf blotch"
msgstr "Bladflekksjukdommer i hvete"
-#: templates/cerealblotchmodels/wheatleafblotchform.html:42
+#: templates/cerealblotchmodels/wheatleafblotchform.html:43
msgid "Background data for the wheat leaf blotch model"
msgstr "Bakgrunnsdata for bladflekksjukdomsmodellen"
+#: templates/cerealblotchmodels/wheatleafblotchform.html:50
+msgid "Growth stage"
+msgstr "Vekststadium"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+msgid "Wheat variety"
+msgstr "Hvetesort"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+msgid "Previous crop was wheat"
+msgstr "Fjorårets vekst var hvete"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+msgid "Spraying"
+msgstr "Sprøytinger"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+msgid "Preparation 1"
+msgstr "Plantevernmiddel 1"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+msgid "Preparation 2"
+msgstr "Plantevernmiddel 2"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+msgid "Preparation 3"
+msgstr "Plantevernmiddel 3"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+msgid "Missing spraying information on second preparation"
+msgstr "Sprøyteinformasjon mangler"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+msgid "Too early to calculate risk"
+msgstr "For tidlig å beregne risiko"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+msgid "Wheat leaf blotch development"
+msgstr "Utvikling av bladflekksjukdom i hvete"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:449
+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."
+
diff --git a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo b/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.mo
index 298a32a2cda4024a7a483c6ad7510817220325a8..287519e7c51630a2ad10c9d182c4e6c0ee9f2eb2 100755
GIT binary patch
delta 23
fcmZ1?xI}Qnd{!<qT|*-ULsKgQv&}16e=`99RBi_o
delta 23
fcmZ1?xI}Qnd{!<~T>~QpLqjVg!_6yMe=`99R2~Nk
diff --git a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.po b/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.po
index eff7c52b..6d439e40 100755
--- a/cerealblotchmodels/locale/zh_CN/LC_MESSAGES/django.po
+++ b/cerealblotchmodels/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: 2018-05-02 11:21+0200\n"
+"POT-Creation-Date: 2018-06-12 15:06+0200\n"
"PO-Revision-Date: 2016-10-07 11:05+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -29,156 +29,150 @@ msgstr "大麦网斑病模型的背景数据"
#: templates/cerealblotchmodels/barleynetblotchform.html:49
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:45
-#: templates/cerealblotchmodels/wheatleafblotchform.html:49
+#: templates/cerealblotchmodels/wheatleafblotchform.html:55
msgid "Weather station"
msgstr "气象站"
#: templates/cerealblotchmodels/barleynetblotchform.html:55
-#: templates/cerealblotchmodels/wheatleafblotchform.html:55
+#: templates/cerealblotchmodels/wheatleafblotchform.html:61
msgid "Sowing date"
msgstr "播种日期"
#: templates/cerealblotchmodels/barleynetblotchform.html:60
-#: templates/cerealblotchmodels/wheatleafblotchform.html:60
msgid "Crop"
msgstr "作物"
#: templates/cerealblotchmodels/barleynetblotchform.html:67
-#: templates/cerealblotchmodels/wheatleafblotchform.html:67
msgid "Same crop as last season"
msgstr "与上季同样的作物"
#: templates/cerealblotchmodels/barleynetblotchform.html:72
-#: templates/cerealblotchmodels/wheatleafblotchform.html:72
+#: templates/cerealblotchmodels/wheatleafblotchform.html:78
msgid "Plowed"
msgstr "犁过的"
#: templates/cerealblotchmodels/barleynetblotchform.html:78
-#: templates/cerealblotchmodels/wheatleafblotchform.html:78
+#: templates/cerealblotchmodels/wheatleafblotchform.html:82
msgid "Observation date"
msgstr "观测日期"
#: templates/cerealblotchmodels/barleynetblotchform.html:83
-#: templates/cerealblotchmodels/wheatleafblotchform.html:84
+#: templates/cerealblotchmodels/wheatleafblotchform.html:87
msgid "% Infected leaves"
msgstr "% 感染水平"
#: templates/cerealblotchmodels/barleynetblotchform.html:88
-#: templates/cerealblotchmodels/wheatleafblotchform.html:90
+#: templates/cerealblotchmodels/wheatleafblotchform.html:98
msgid "Spraying date"
msgstr "喷药日期"
#: templates/cerealblotchmodels/barleynetblotchform.html:93
-#: templates/cerealblotchmodels/wheatleafblotchform.html:95
msgid "Preparation"
msgstr "准备"
#: templates/cerealblotchmodels/barleynetblotchform.html:99
-#: templates/cerealblotchmodels/wheatleafblotchform.html:101
+#: templates/cerealblotchmodels/wheatleafblotchform.html:109
+#: templates/cerealblotchmodels/wheatleafblotchform.html:120
+#: templates/cerealblotchmodels/wheatleafblotchform.html:131
msgid "Preparation dose"
msgstr "准备剂量"
#: templates/cerealblotchmodels/barleynetblotchform.html:108
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:110
+#: templates/cerealblotchmodels/wheatleafblotchform.html:140
msgid "Run model"
msgstr "运行模型"
#: templates/cerealblotchmodels/barleynetblotchform.html:115
-#: templates/cerealblotchmodels/wheatleafblotchform.html:117
+#: templates/cerealblotchmodels/wheatleafblotchform.html:147
msgid "Model is running, please wait"
msgstr "模型在运行，请等候"
#: templates/cerealblotchmodels/barleynetblotchform.html:126
-#: templates/cerealblotchmodels/wheatleafblotchform.html:128
+#: templates/cerealblotchmodels/wheatleafblotchform.html:158
msgid "Scroll past chart by swiping the dotted line on the right"
msgstr "点击右边点状线看上一幅图"
#: templates/cerealblotchmodels/barleynetblotchform.html:152
-#: templates/cerealblotchmodels/wheatleafblotchform.html:154
+#: templates/cerealblotchmodels/wheatleafblotchform.html:184
msgid "Missing observation information"
msgstr "遗失的观测信息"
#: templates/cerealblotchmodels/barleynetblotchform.html:161
-#: templates/cerealblotchmodels/wheatleafblotchform.html:163
+#: templates/cerealblotchmodels/wheatleafblotchform.html:193
msgid "Missing spraying information"
msgstr "遗失的喷药信息"
#: templates/cerealblotchmodels/barleynetblotchform.html:194
-#: templates/cerealblotchmodels/wheatleafblotchform.html:196
+#: templates/cerealblotchmodels/wheatleafblotchform.html:260
msgid "Temperature, daily mean"
msgstr "日均温"
#: templates/cerealblotchmodels/barleynetblotchform.html:195
-#: templates/cerealblotchmodels/wheatleafblotchform.html:197
msgid "Rain last 28 days"
msgstr "过去28天降雨"
#: templates/cerealblotchmodels/barleynetblotchform.html:196
-#: templates/cerealblotchmodels/wheatleafblotchform.html:198
msgid "Rain, daily"
msgstr "日降雨"
#: templates/cerealblotchmodels/barleynetblotchform.html:197
-#: templates/cerealblotchmodels/wheatleafblotchform.html:199
msgid "Day degrees since sowing"
msgstr "从撒种开始日温度"
#: templates/cerealblotchmodels/barleynetblotchform.html:198
#: templates/cerealblotchmodels/barleynetblotchform.html:263
-#: templates/cerealblotchmodels/wheatleafblotchform.html:200
-#: templates/cerealblotchmodels/wheatleafblotchform.html:265
+#: templates/cerealblotchmodels/wheatleafblotchform.html:261
+#: templates/cerealblotchmodels/wheatleafblotchform.html:332
msgid "Threshold"
msgstr "阈值"
#: templates/cerealblotchmodels/barleynetblotchform.html:199
#: templates/cerealblotchmodels/barleynetblotchform.html:264
-#: templates/cerealblotchmodels/wheatleafblotchform.html:201
-#: templates/cerealblotchmodels/wheatleafblotchform.html:266
+#: templates/cerealblotchmodels/wheatleafblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:333
msgid "Disease"
msgstr "疾病"
#: templates/cerealblotchmodels/barleynetblotchform.html:206
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:382
-#: templates/cerealblotchmodels/wheatleafblotchform.html:208
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:383
+#: templates/cerealblotchmodels/wheatleafblotchform.html:269
msgid "Time"
msgstr "时间"
#: templates/cerealblotchmodels/barleynetblotchform.html:214
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:389
-#: templates/cerealblotchmodels/wheatleafblotchform.html:216
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:390
+#: templates/cerealblotchmodels/wheatleafblotchform.html:279
msgid "Warning status"
msgstr "预警信息"
#: templates/cerealblotchmodels/barleynetblotchform.html:247
-#: templates/cerealblotchmodels/wheatleafblotchform.html:249
+#: templates/cerealblotchmodels/wheatleafblotchform.html:316
msgid "No data returned"
msgstr "无数据返回"
#: templates/cerealblotchmodels/barleynetblotchform.html:260
-#: templates/cerealblotchmodels/wheatleafblotchform.html:262
+#: templates/cerealblotchmodels/wheatleafblotchform.html:329
msgid "Disease value"
msgstr "疾病值"
#: templates/cerealblotchmodels/barleynetblotchform.html:267
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:438
-#: templates/cerealblotchmodels/wheatleafblotchform.html:269
msgid "Barley net blotch development"
msgstr "大麦网斑病发展"
#: templates/cerealblotchmodels/barleynetblotchform.html:279
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:308
-#: templates/cerealblotchmodels/wheatleafblotchform.html:281
+#: templates/cerealblotchmodels/wheatleafblotchform.html:348
msgid "Select weather station"
msgstr "选择气象站"
#: templates/cerealblotchmodels/barleynetblotchform.html:305
-#: templates/cerealblotchmodels/wheatleafblotchform.html:307
+#: templates/cerealblotchmodels/wheatleafblotchform.html:377
msgid "Select crop"
msgstr "选择作物"
#: templates/cerealblotchmodels/barleynetblotchform.html:333
-#: templates/cerealblotchmodels/wheatleafblotchform.html:335
+#: templates/cerealblotchmodels/wheatleafblotchform.html:417
msgid "Select preparation"
msgstr "选择准备"
@@ -189,6 +183,7 @@ msgstr "谷物斑点病模型"
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:25
#: templates/cerealblotchmodels/septoriahumiditymodelform.html:28
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:439
msgid "Septoria humidity model"
msgstr ""
@@ -284,52 +279,52 @@ msgstr ""
msgid "Leaf life time (days)"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:350
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:351
#, fuzzy
#| msgid "Model is running, please wait"
msgid "The model is running, please wait"
msgstr "模型在运行，请等候"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:369
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
msgid "Leaf wetness, hourly"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:370
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
#, fuzzy
#| msgid "Rain, daily"
msgid "Rain, hourly"
msgstr "日降雨"
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:371
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
msgid "Relative humidity, hourly mean"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:372
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
msgid "Humid hour (yes/no)"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:373
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
msgid "Humid period hour"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:374
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
msgid "Humid hour sum"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:375
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:433
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:376
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
msgid "Humid period hour outside protection period"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:429
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:430
msgid "Hours"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:434
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
msgid "Threshold humid period"
msgstr ""
-#: templates/cerealblotchmodels/septoriahumiditymodelform.html:435
+#: templates/cerealblotchmodels/septoriahumiditymodelform.html:436
msgid "Spraying protection period"
msgstr ""
@@ -338,12 +333,72 @@ msgstr ""
msgid "Wheat leaf blotch"
msgstr ""
-#: templates/cerealblotchmodels/wheatleafblotchform.html:42
+#: templates/cerealblotchmodels/wheatleafblotchform.html:43
#, fuzzy
#| msgid "Background data for the barley net blotch model"
msgid "Background data for the wheat leaf blotch model"
msgstr "大麦网斑病模型的背景数据"
+#: templates/cerealblotchmodels/wheatleafblotchform.html:50
+msgid "Growth stage"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:66
+msgid "Wheat variety"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:73
+msgid "Previous crop was wheat"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:96
+#, fuzzy
+#| msgid "Spraying date"
+msgid "Spraying"
+msgstr "喷药日期"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:103
+#, fuzzy
+#| msgid "Preparation"
+msgid "Preparation 1"
+msgstr "准备"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:114
+#, fuzzy
+#| msgid "Preparation"
+msgid "Preparation 2"
+msgstr "准备"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:125
+#, fuzzy
+#| msgid "Preparation"
+msgid "Preparation 3"
+msgstr "准备"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:201
+#, fuzzy
+#| msgid "Missing spraying information"
+msgid "Missing spraying information on second preparation"
+msgstr "遗失的喷药信息"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:212
+msgid "Too early to calculate risk"
+msgstr ""
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:336
+#, fuzzy
+#| msgid "Barley net blotch development"
+msgid "Wheat leaf blotch development"
+msgstr "大麦网斑病发展"
+
+#: templates/cerealblotchmodels/wheatleafblotchform.html:449
+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 ""
+
#, fuzzy
#~| msgid "Weather station"
#~ msgid "WeatherStation"
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html
index b0a031df..5840f6fa 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html
@@ -63,14 +63,14 @@
<span class="help-block" id="{{ form_id }}_sowingDate_validation"></span>
</div>
<div class="form-group">
- <label for="cropOrganismId">{% trans "Crop" %}</label>
+ <label for="cropOrganismId">{% trans "Wheat variety" %}</label>
<select name="cropOrganismId" id="cropOrganismId" class="form-control" onblur="validateField(this);">
</select>
<span class="help-block" id="{{ form_id }}_cropOrganismId_validation"></span>
</div>
<div class="form-group">
<input type="checkbox" name="sameCropAsLastSeason"/>
- <label for="sameCropAsLastSeason">{% trans "Same crop as last season" %}</label><br/>
+ <label for="sameCropAsLastSeason">{% trans "Previous crop was wheat" %}</label><br/>
<span class="help-block" id="{{ form_id }}_sameCropAsLastSeason_validation"></span>
</div>
<div class="form-group">
@@ -444,6 +444,10 @@
};
$(document).ready(function() {
+ if(settings.userIsIE)
+ {
+ alert("{% trans "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." %}");
+ }
initWeatherStations();
initCrops();
initPreparations();
--
GitLab