From 60359dbda8585d16848b63b1aa444b33ea455aa9 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 7 Jun 2018 15:59:10 +0200
Subject: [PATCH] Added warning for IE users
---
VIPSWeb/locale/bg/LC_MESSAGES/django.mo | Bin 738 -> 738 bytes
VIPSWeb/locale/bg/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/locale/bs/LC_MESSAGES/django.mo | Bin 1051 -> 1051 bytes
VIPSWeb/locale/bs/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/locale/de/LC_MESSAGES/django.mo | Bin 421 -> 421 bytes
VIPSWeb/locale/de/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/locale/fi/LC_MESSAGES/django.mo | Bin 529 -> 529 bytes
VIPSWeb/locale/fi/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/locale/nb/LC_MESSAGES/django.mo | Bin 2812 -> 3342 bytes
VIPSWeb/locale/nb/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/locale/vi/LC_MESSAGES/django.mo | Bin 1659 -> 1659 bytes
VIPSWeb/locale/vi/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo | Bin 2318 -> 2318 bytes
VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po | 44 ++++++++++++---------
VIPSWeb/static/js/util.js | 2 +-
VIPSWeb/templates/index.html | 3 ++
VIPSWeb/views.py | 6 ++-
17 files changed, 191 insertions(+), 128 deletions(-)
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.mo b/VIPSWeb/locale/bg/LC_MESSAGES/django.mo
index f6ee1889235d40b2cde3f28c796b6219a29d95ee..ee05aa1e2e96d67f0a34370c06c636908519c3d4 100755
GIT binary patch
delta 29
kcmaFF`iOOd5Tk&Fu7R1Zfw_XAsg<djwt>-RCB_4c0Cp}1Pyhe`
delta 29
kcmaFF`iOOd5Tk&(u7QcJp^<{2v6Zp0u7UYxCB_4c0Ck}UNdN!<
diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
index 4bdc5fa1..31391364 100755
--- a/VIPSWeb/locale/bg/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bg/LC_MESSAGES/django.po
@@ -19,7 +19,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+0200\n"
"PO-Revision-Date: 2014-05-14 09:31+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -100,77 +100,85 @@ msgid ""
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:45
+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 ""
+
+#: templates/index.html:75
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr ""
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Съобщения"
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Съобщения"
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr ""
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr ""
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr ""
-#: templates/index.html:134
+#: templates/index.html:137
#, fuzzy
#| msgid "Forecasts"
msgid "My forecasts"
msgstr "Прогноза"
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr "Прогноза"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr ""
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.mo b/VIPSWeb/locale/bs/LC_MESSAGES/django.mo
index ead6836d51f8d970be95233a4a00c7b455aa10e8..2b8f6e762e76f543d6bf1aa8ffa665b052caab13 100755
GIT binary patch
delta 29
kcmbQuF`Hup2a|w>u7R1Zfw_XAsg<djwt>-R2_|MH0A$ex`Tzg`
delta 29
kcmbQuF`Hup2a|xgu7QcJp^<{2v6Zp0u7UYx2_|MH0Axf3^8f$<
diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
index 59b2aed3..309cb233 100755
--- a/VIPSWeb/locale/bs/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/bs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+0200\n"
"PO-Revision-Date: 2015-02-13 11:26+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -89,77 +89,85 @@ msgid ""
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:45
+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 ""
+
+#: templates/index.html:75
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr ""
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Poruke"
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Poruke"
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr "Usjevi "
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr "Visok rizik infekcije"
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr "Srednji rizik infekcije"
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr "Bez rizika infekcije"
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr "Podaci nedostaju"
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr "Prognoza nije dostupna"
-#: templates/index.html:134
+#: templates/index.html:137
#, fuzzy
#| msgid "Forecasts"
msgid "My forecasts"
msgstr "Prognoze "
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr "Prognoze "
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr ""
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.mo b/VIPSWeb/locale/de/LC_MESSAGES/django.mo
index a7d752aa4c04392a28ce16dc8673f67057e27f37..4fc6ed1c07dd981e10691b83450541bb99b25eae 100755
GIT binary patch
delta 27
icmZ3=yp(xDmw<(?ftjv>xq_jom8qGwfzifU+>8Kclm_Vl
delta 27
icmZ3=yp(xDmw>shfr+l6k%FPIm9ep|f%(Q++>8Kc4hG@?
diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.po b/VIPSWeb/locale/de/LC_MESSAGES/django.po
index 8d2c94fa..4b39a93a 100755
--- a/VIPSWeb/locale/de/LC_MESSAGES/django.po
+++ b/VIPSWeb/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-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+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"
@@ -88,71 +88,79 @@ msgid ""
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:45
+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 ""
+
+#: templates/index.html:75
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr ""
-#: templates/index.html:78
+#: templates/index.html:81
msgid "Latest messages"
msgstr ""
-#: templates/index.html:78
+#: templates/index.html:81
msgid "All messages"
msgstr ""
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr ""
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr ""
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr ""
-#: templates/index.html:134
+#: templates/index.html:137
msgid "My forecasts"
msgstr ""
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr ""
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.mo b/VIPSWeb/locale/fi/LC_MESSAGES/django.mo
index 713a885347a8769a2d25462fee61bc0c34f38e54..4a912692c33074e1187f10c6b018dcf797693ea0 100755
GIT binary patch
delta 27
icmbQpGLdD%EddK%12bI%a|J_FD^oLV1EY<v)ENP5z6XB*
delta 27
icmbQpGLdD%Edg^~0~1|CBLzcaD`R6_1M`iq)ENP5I0twD
diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po
index 6dc94f9f..18edd8ca 100755
--- a/VIPSWeb/locale/fi/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/fi/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-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+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"
@@ -88,77 +88,85 @@ msgid ""
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:45
+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 ""
+
+#: templates/index.html:75
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr ""
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Viestit"
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Viestit"
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr "Sato"
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr ""
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr ""
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr ""
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr ""
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr ""
-#: templates/index.html:134
+#: templates/index.html:137
#, fuzzy
#| msgid "Forecasts"
msgid "My forecasts"
msgstr "Hälytykset"
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr "Hälytykset"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr ""
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr ""
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr ""
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.mo b/VIPSWeb/locale/nb/LC_MESSAGES/django.mo
index 95a4fe63b521b746a19f20f622640790d8f82c61..d1bbb0edefb31d7f9d5636bfe02e52170904903c 100755
GIT binary patch
delta 1224
zcmew(+9y?iPl#nI0|NttDgy(93<Cp$3nK%ADFXvT4iiX}fx&^9fq{>Kfx(fPfq{pC
zfgymIfkA+QfgzTefkA|Ufgz8Xfq|8QfuR|yu9KO8fs=uOVFoh;gAfA)!y;w|26hGp
zhONvD3}Orn411Xw7`Pc27_KlgFmNz1)H6I_W?<lFU|@L3%)lVQz`*bmYLO5N#9(<A
zh=Hms5C`b9FffQRFfiD#KpYUn!oVQOz`&5s!oa}7z`)Q5m2YEVU@%}{V3@-Kally?
zu!Rg)q5OL+3=GN)^$ZNpSQr?T7#JA1SQ!}H85kIJSs54v85kH!Ss56b85kJaSs55U
zGB7Z3voSCjF)%RvWrH}_fE{A613Lpl5hDYG2RkIBc5^`JQyh>GxXHo5Ak4tP@P-58
z08sFNJj}_-z`$P5z`!8M$-uzNz`&r$$-uzHz`&r-39-P66B1NjoD2+X3=9lmQ1Mt!
zNC@O|LPDe&Dn9`#KOHK*oD&j4TcGMsaxySTGcYjRhsyuvWMHTV#R&%&1A{pO1A{yl
z#D(Ep5T7M*K`hANf@mz|Vqj2VU|^WY#lYaqz`(GL3u3`9E(V6h3=9nX+zbr-j0_B$
zxfvLY85kH2^FZ`}=Yd2a3oio$BP3bD$jRAEnv6=5r!tu{Do;Mkq|B%~`6H7xqsnGo
z=JQPTjzNB&e(qKZ;i(G6rNsrQ$t4Pv`K1bpMX3s<#hH2O3Z8i-sYQ9IB?_(;1v&Xe
zsYMDU`3hy3spSeK8JWcj#hE3kdJ18l0l^BH#R_@(B?>92#hK}OsVN|J<@rU~3gww4
z8JNcCfbFTzO{`Q%ttdz>%1q5mPE|-PD#|Y^R!GcCQOM0K20I`vHL;|$D79EmAs{C;
zu^8m8RE0!^l+3iW)S}e95{0Cq{PN<|A{~XC%<NPJ-^}Eq{Nnty5(U?k^i+lXA_e#S
z{Pdhu1?P;S{M=MMhVWFd?~3z_iYj#`bFj4wSm+v<=^B_T7@As{nrRytZJy62#8U6*
z66P2b?CN8s;F4ORP@Gz%P+Fo;oS&<ZQmT+tRGOVygy|`Tg2PJ{Qd0BsQWeTmlZrD_
zQuCmJlUk&ZnVp>q3!M^$wEQB4!%G#?O7qfFi&7PGQ&Uils|SU(jzTfWz*2==kkb63
zvedkiRE4zE%p8UMbcNi+y!4#Zyp&XsDcQwY`FV*snI)+udJ18wd3iaR>BXSHDa}?$
w%~QzDPXR@vLSAY~Nlq%rHz2Q|29}P3TV_#eT7HE>YEBMEDm3IKFXsvc0Jtat+5i9m
delta 670
zcmeB^`XgF@Pl#nI0|Ntt3IhX!3<Cp$4I=}CDFXvT3=>F{fx&>8fq{>Kfx(cOfq{pC
zfx&^9fkA+Qfx(xVfkA|Ufgz5Wfq|8QfuR_xu9BI7fs=uOp@W%$L5P8YVG=U~13Lo)
z!%}7j1~CQ(hPBKL4BQM13`dw57&sUh>KQIDGcfQoFfiO?W?+zDU|@I&wTOuYVlY1o
z#6VFNhy&zV7#Ktu7#MU|AP#V1VPKGCU|<MmVPIfkU|=YO%9pV)Fc>f}F!ZoM9I%%K
zY$3x@DE}M_1A{U{Jp;ov76t|-1_p*-EDQ|p3=9mitPBi-3=9mZtPBjz3=9nAtPBiB
z3=9mvSs@P9V}lrI$Hu@=#K^$l#s&$Yo$L_$1Utm%*V!2ugc%qZUa><g{>Ki{&&~nS
zFV4Zhz+2D2z#z}Tz`(`8z@W<kQDDIV2_g>;1_m|;28Ix*cr*vZ=h+;PkZ6R;_d(^S
zLdBPIKtg5{RQ+)d1_o&c28O#(`JWt+s9@t{V2CpZ`Ir;p!cb0#%i=g87Nl`PG!}D0
z(nmih1A{XI1H%?hhy_1585kBbFfj0PF)$c2FfeT7g6Mn71&OjxT$8hytQZ+4FJ&@k
zRGNI3Ntsb)G9$A!qw;23=JQOG|FKOLFxNFO(KR$uFf_I@Hr6#T-@K4rh-LC&9&Z5I
CsX`|J
diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
index 14d3d621..4202ee60 100755
--- a/VIPSWeb/locale/nb/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/nb/LC_MESSAGES/django.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: VIPSWeb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+0200\n"
"PO-Revision-Date: 2013-11-07 20:18+0200\n"
"Last-Translator: Tor-Einar Skog <tor-einar.skog@nibio.no>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -103,71 +103,79 @@ msgstr "ADVARSEL: Vi anbefaler å bruke nettleseren Chrome på Android-dingser.
"OK for å installere Chrome, eller Cancel for å fortsette uten å installere "
"Chrome."
-#: templates/index.html:72
+#: templates/index.html:45
+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/index.html:75
msgid "Surveillance and first observations"
msgstr "Overvåkning og førstefunn"
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr "Alle observasjoner"
-#: templates/index.html:78
+#: templates/index.html:81
msgid "Latest messages"
msgstr "Siste meldinger"
-#: templates/index.html:78
+#: templates/index.html:81
msgid "All messages"
msgstr "Alle meldinger"
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr "Kulturer"
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr "Fare for angrep"
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr "Mulig fare for angrep"
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr "Ingen fare for angrep"
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr "Data mangler"
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr "Varsel beregnes ikke"
-#: templates/index.html:134
+#: templates/index.html:137
msgid "My forecasts"
msgstr "Mine varsler"
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr "Varsler"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr "Sorter etter"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr "Målestasjon"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr "Skadegjører"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr "Modell"
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr "Velg kultur eller zoom inn for å se liste over varsler"
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.mo b/VIPSWeb/locale/vi/LC_MESSAGES/django.mo
index 0a47a126b92b76320a7847de6625b5c9ed6f5542..17951d7ce5b1ad7c34065fdf9389ec4894d164f2 100755
GIT binary patch
delta 28
jcmey(^P6WwHnV_*u7R1Zfw_XAsg<djwt>;&YG!5tea#1W
delta 28
jcmey(^P6WwHnV`au7QcJp^<{2v6Zp0u7UaDYG!5teMbjz
diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po
index c83cf31f..11605051 100755
--- a/VIPSWeb/locale/vi/LC_MESSAGES/django.po
+++ b/VIPSWeb/locale/vi/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-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+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"
@@ -90,75 +90,83 @@ msgid ""
"Chrome, or Cancel to proceed without installing Chrome."
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:45
+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 ""
+
+#: templates/index.html:75
msgid "Surveillance and first observations"
msgstr ""
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr ""
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "Latest messages"
msgstr "Tin nhắn"
-#: templates/index.html:78
+#: templates/index.html:81
#, fuzzy
#| msgid "Messages"
msgid "All messages"
msgstr "Tin nhắn"
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr "mùa gặt"
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr "Nguy cơ lây nhiễm cao"
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr "Rủi ro trung bình của nhiễm trùng"
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr "Không có nguy cơ lây nhiễm"
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr "Dữ liệu bị mất"
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr "Không dự báo có sẵn"
-#: templates/index.html:134
+#: templates/index.html:137
msgid "My forecasts"
msgstr "dự báo của tôi"
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr "dự báo"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr "Sắp xếp theo"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr "Trạm thời tiết"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr "côn trùng"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr "Kiểu mẫu"
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr "Chọn cây trồng hoặc phóng to để xem danh sách các dự báo"
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo
index 16fa236e85ec3539f50ac1ea4f247be3712b19a7..8f676f8fded144e674e07b2d0875ecc95c335b1f 100755
GIT binary patch
delta 29
kcmeAZ>J!@Vj8(uw*T78Iz+A!5)XLOM+rVh^H&zK|0DRU5%m4rY
delta 29
kcmeAZ>J!@Vj8(u~*T6*A&`811*vi;g*T8)9H&zK|0DMUY#Q*>R
diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po
index ec10c18b..ccc80889 100755
--- a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po
+++ b/VIPSWeb/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-04-12 13:33-0700\n"
+"POT-Creation-Date: 2018-06-07 15:56+0200\n"
"PO-Revision-Date: 2016-11-03 14:04+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -89,71 +89,79 @@ msgstr ""
"警告: 我们在安卓系统手机上推荐使用Chrome。点击OK安装Chrome，点击Cancel继续但"
"不安装Chrome。"
-#: templates/index.html:72
+#: templates/index.html:45
+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 ""
+
+#: templates/index.html:75
msgid "Surveillance and first observations"
msgstr "监测和首次观测"
-#: templates/index.html:72
+#: templates/index.html:75
msgid "All observations"
msgstr "所有观测"
-#: templates/index.html:78
+#: templates/index.html:81
msgid "Latest messages"
msgstr "最新新闻"
-#: templates/index.html:78
+#: templates/index.html:81
msgid "All messages"
msgstr "所有新闻"
-#: templates/index.html:91
+#: templates/index.html:94
msgid "Crops"
msgstr "作物"
-#: templates/index.html:109
+#: templates/index.html:112
msgid "High risk of infection"
msgstr "感染的高风险"
-#: templates/index.html:110
+#: templates/index.html:113
msgid "Medium risk of infection"
msgstr "感染的中度风险"
-#: templates/index.html:111
+#: templates/index.html:114
msgid "No risk of infection"
msgstr "无感染风险"
-#: templates/index.html:112
+#: templates/index.html:115
msgid "Missing data"
msgstr "缺失数据"
-#: templates/index.html:113
+#: templates/index.html:116
msgid "No forecast available"
msgstr "预报不可获取"
-#: templates/index.html:134
+#: templates/index.html:137
msgid "My forecasts"
msgstr "我的预报"
-#: templates/index.html:141
+#: templates/index.html:144
msgid "Forecasts"
msgstr "预报"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Sort by"
msgstr "排序方式"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Weather station"
msgstr "气象站"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Pest"
msgstr "病虫害"
-#: templates/index.html:142
+#: templates/index.html:145
msgid "Model"
msgstr "模型"
-#: templates/index.html:143
+#: templates/index.html:146
msgid "Select crops or zoom in to see list of forecasts"
msgstr "选择作物或放大看预报列表"
diff --git a/VIPSWeb/static/js/util.js b/VIPSWeb/static/js/util.js
index 8f2a2ce7..01db3feb 100755
--- a/VIPSWeb/static/js/util.js
+++ b/VIPSWeb/static/js/util.js
@@ -354,4 +354,4 @@ function getUnixTimestampFromJSON(ambiguousValue)
{
return possibleDateObject.getTime();
}
-}
\ No newline at end of file
+}
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index ac64fa20..83e19eeb 100755
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -41,6 +41,9 @@
{% 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 %}
var longitude = {{settings.MAP_CENTER_LONGITUDE|unlocalize}};
var latitude = {{settings.MAP_CENTER_LATITUDE|unlocalize}};
diff --git a/VIPSWeb/views.py b/VIPSWeb/views.py
index 329a49f9..50431799 100755
--- a/VIPSWeb/views.py
+++ b/VIPSWeb/views.py
@@ -31,8 +31,9 @@ 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
+ 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:
@@ -41,6 +42,8 @@ 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:
@@ -57,6 +60,7 @@ 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:
--
GitLab