diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.mo b/VIPSWeb/locale/bg/LC_MESSAGES/django.mo index f6ee1889235d40b2cde3f28c796b6219a29d95ee..ee05aa1e2e96d67f0a34370c06c636908519c3d4 100755 Binary files a/VIPSWeb/locale/bg/LC_MESSAGES/django.mo and b/VIPSWeb/locale/bg/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/bg/LC_MESSAGES/django.po b/VIPSWeb/locale/bg/LC_MESSAGES/django.po index 4bdc5fa15d48e132aa49e6e61932c50c3f2d815a..31391364d8a57b525073bcfff0e17100e3f52690 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 Binary files a/VIPSWeb/locale/bs/LC_MESSAGES/django.mo and b/VIPSWeb/locale/bs/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/bs/LC_MESSAGES/django.po b/VIPSWeb/locale/bs/LC_MESSAGES/django.po index 59b2aed31ec67cc4556eba8b693694808cf54f7d..309cb233f6bc66cffd3d25f816280debeca6d121 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 Binary files a/VIPSWeb/locale/de/LC_MESSAGES/django.mo and b/VIPSWeb/locale/de/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/de/LC_MESSAGES/django.po b/VIPSWeb/locale/de/LC_MESSAGES/django.po index 8d2c94fa137c471db1ac11ef08285329c12589c2..4b39a93a05c4534bc11fa164c8dfab2f9c74a7f9 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 Binary files a/VIPSWeb/locale/fi/LC_MESSAGES/django.mo and b/VIPSWeb/locale/fi/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/fi/LC_MESSAGES/django.po b/VIPSWeb/locale/fi/LC_MESSAGES/django.po index 6dc94f9f5fe6a5f34faaeebce6fc9619cdc130d4..18edd8ca35ce26ed0df98dff1c75fad9d07eac98 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 Binary files a/VIPSWeb/locale/nb/LC_MESSAGES/django.mo and b/VIPSWeb/locale/nb/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/nb/LC_MESSAGES/django.po b/VIPSWeb/locale/nb/LC_MESSAGES/django.po index 14d3d621af9709f53ff2319659af80c5f26623c2..4202ee6047fedb195d1391ffb3e40555cd9544c5 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 Binary files a/VIPSWeb/locale/vi/LC_MESSAGES/django.mo and b/VIPSWeb/locale/vi/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/vi/LC_MESSAGES/django.po b/VIPSWeb/locale/vi/LC_MESSAGES/django.po index c83cf31f0feddef31ceb3025fc3ec5d1bff59483..116050518a0295454b791f21982835a886f86ee5 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 Binary files a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo and b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po b/VIPSWeb/locale/zh_CN/LC_MESSAGES/django.po index ec10c18bbac4468529aad22a9cdca449dede0bfb..ccc808897693f6dfd67f35f183144b33e429b8df 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 8f2a2ce7c723363bf32d853bf9b59226cb8cbdb5..01db3feb0fa24d6354fb60d53e4005b3dd6db03e 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 ac64fa208180b9d195f774e9705720979e8dacbf..83e19eeba38588610b769c198b52c6379deb100a 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 329a49f9bd57718854962e97f83c96bc6d448b19..5043179989491b7be98d789e4c83d2ee3bed6463 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: