diff --git a/calculators/locale/bg/LC_MESSAGES/django.po b/calculators/locale/bg/LC_MESSAGES/django.po
index 63b5ee2819e3d959ca8895f27b94a34d835b1199..6cf0b3dedb99b879af194a463322d1d02f9f3b08 100644
--- a/calculators/locale/bg/LC_MESSAGES/django.po
+++ b/calculators/locale/bg/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\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"
@@ -17,114 +17,109 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/bs/LC_MESSAGES/django.po b/calculators/locale/bs/LC_MESSAGES/django.po
index 807a4463cb99787b79e242fab8217cc33a9321f1..e6dbe56bd1e96d750549f6b40d548eb44bdbf1af 100644
--- a/calculators/locale/bs/LC_MESSAGES/django.po
+++ b/calculators/locale/bs/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\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"
@@ -18,114 +18,109 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/de/LC_MESSAGES/django.po b/calculators/locale/de/LC_MESSAGES/django.po
index 8c3f7b896f351d17c6a0e7792de0563b27837eff..6cf0b3dedb99b879af194a463322d1d02f9f3b08 100755
--- a/calculators/locale/de/LC_MESSAGES/django.po
+++ b/calculators/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: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\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"
@@ -18,114 +18,108 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/fi/LC_MESSAGES/django.po b/calculators/locale/fi/LC_MESSAGES/django.po
index 63b5ee2819e3d959ca8895f27b94a34d835b1199..6cf0b3dedb99b879af194a463322d1d02f9f3b08 100644
--- a/calculators/locale/fi/LC_MESSAGES/django.po
+++ b/calculators/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: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\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"
@@ -17,114 +17,109 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/nb/LC_MESSAGES/django.mo b/calculators/locale/nb/LC_MESSAGES/django.mo
index f8017712ceda8160b682b9b26e5f94f87b213eac..033c6aa767f47a2af48a1e014b5711cb4547b6fe 100755
Binary files a/calculators/locale/nb/LC_MESSAGES/django.mo and b/calculators/locale/nb/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/nb/LC_MESSAGES/django.po b/calculators/locale/nb/LC_MESSAGES/django.po
index bc61b5a0acf81a10a4fd0dc8a3445e411b632ca3..6f24cb45f6ce57a883e5575b5b109e78663d5e25 100755
--- a/calculators/locale/nb/LC_MESSAGES/django.po
+++ b/calculators/locale/nb/LC_MESSAGES/django.po
@@ -3,48 +3,47 @@
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
-#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+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"
-"Language: \n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\n"
+"PO-Revision-Date: 2022-01-20 16:51+0100\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.3\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "Økonomisk skadeterskelkalkulator (EIL)"
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr "Inndata"
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
"Kostnaden ved innkjøp og bruk av bekjempelsesmetode (f.eks. plantevernmiddel)"
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr "Bekjempelseskostnad"
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr "Markedsverdi i lokal valuta pr vektenhet"
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr "Markedsverdi i lokal valuta"
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
@@ -52,83 +51,81 @@ msgstr ""
"Maksimalt avlingsnivå per arealenhet. Det er vanlig å bruke historiske "
"verdier."
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr "Avlingspotensial"
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr "Andelen av skadegjører som drepes"
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr "Bekjempelseseffekt"
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr "Skade uttrykt som avlingstap per skadegjørermåleenhet"
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr "Skade per skadegjørermåleenhet"
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr "Innstillinger"
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr "Valuta"
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
-msgstr "Avlingsmasseenhet"
+msgstr "Masseenhet"
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
-msgstr "Avlingsarealenhet"
+msgstr "Arealenhet"
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr "Skadegjørermåleenhet"
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr "Antall bladlus per plante"
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr "Kjør modell"
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr "Resultater"
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr "Beregnet EIL"
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr "EIL som funksjon av avlingstap per skadegjørerenhet"
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr "EIL som funksjon av bekjempelseskostnad"
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr "EIL som funksjon av markedsverdi"
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr "EIL som funksjon av avlingspotensial"
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr "EIL som funksjon av bekjempelseseffekt"
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr "Kalkulatorer"
+
+#~ msgid "EIL as a function of yield potential"
+#~ msgstr "EIL som funksjon av avlingspotensial"
diff --git a/calculators/locale/vi/LC_MESSAGES/django.po b/calculators/locale/vi/LC_MESSAGES/django.po
index ec54a0577f7a5007a50ac1b0a12ac6f0807eb9f4..ca9653d21b7ca9ba6a603b47d6a2366032c19efc 100644
--- a/calculators/locale/vi/LC_MESSAGES/django.po
+++ b/calculators/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: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\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"
@@ -17,114 +17,109 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr ""
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr ""
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr ""
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr ""
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr ""
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr ""
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr ""
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr ""
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr ""
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr ""
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr ""
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr ""
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr ""
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr ""
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr ""
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr ""
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr ""
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr ""
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr ""
diff --git a/calculators/locale/zh_CN/LC_MESSAGES/django.mo b/calculators/locale/zh_CN/LC_MESSAGES/django.mo
index f961147f33cccb8f91b462ed833cc11a1cf0e20b..e504835297b19e9418ee17f53e6f39639368be8e 100755
Binary files a/calculators/locale/zh_CN/LC_MESSAGES/django.mo and b/calculators/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/zh_CN/LC_MESSAGES/django.po b/calculators/locale/zh_CN/LC_MESSAGES/django.po
index 99436f0a5f6f55c4d9f2c12998ca43d1eaf93f98..b35a5363e427d983eba3ece690f7ded98995df3b 100755
--- a/calculators/locale/zh_CN/LC_MESSAGES/django.po
+++ b/calculators/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: 2016-09-28 13:04-0700\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\n"
"PO-Revision-Date: 2016-06-01 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: templates/calculators/eil.html:25 templates/calculators/eil.html.py:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "经济损害水平计算器"
@@ -116,13 +116,12 @@ msgid "EIL as a function of market value"
msgstr "经济损害水平作为市场价值的参数"
#: templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr "经济损害水平作为产量潜力的参数"
-
-#: templates/calculators/eil.html:119
msgid "EIL as a function of insecticide efficacy"
msgstr "经济损害水平作为杀虫剂效力的参数"
#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr "计算器"
+
+#~ msgid "EIL as a function of yield potential"
+#~ msgstr "经济损害水平作为产量潜力的参数"
diff --git a/calculators/locale/zh_Hans/LC_MESSAGES/django.mo b/calculators/locale/zh_Hans/LC_MESSAGES/django.mo
index 4f1faa2afe372a4a2928caa859aa55d005accc59..eaa43689e82ee2e87c2f89f5ea388b5888f8b9a7 100644
Binary files a/calculators/locale/zh_Hans/LC_MESSAGES/django.mo and b/calculators/locale/zh_Hans/LC_MESSAGES/django.mo differ
diff --git a/calculators/locale/zh_Hans/LC_MESSAGES/django.po b/calculators/locale/zh_Hans/LC_MESSAGES/django.po
index ceae23e9d4b1b979ab2fe26123db8424657b45aa..ae6a5f0f0e2f4484e4978234156a207a8642d460 100755
--- a/calculators/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/calculators/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-24 15:02+0200\n"
+"POT-Creation-Date: 2022-01-20 17:04+0100\n"
"PO-Revision-Date: 2016-06-01 12:21+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -17,114 +17,111 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.8.7\n"
-#: calculators/templates/calculators/eil.html:25
-#: calculators/templates/calculators/eil.html:27
+#: templates/calculators/eil.html:25 templates/calculators/eil.html:27
msgid "Economic injury level (EIL) calculator"
msgstr "经济损害水平计算器"
-#: calculators/templates/calculators/eil.html:32
+#: templates/calculators/eil.html:32
msgid "Input"
msgstr "输入"
-#: calculators/templates/calculators/eil.html:35
+#: templates/calculators/eil.html:35
msgid "The cost of purchasing and applying the control action (insecticide)"
msgstr "购买和采取控制措施的成本(杀虫剂)"
-#: calculators/templates/calculators/eil.html:36
+#: templates/calculators/eil.html:36
msgid "Control cost"
msgstr "控制成本"
-#: calculators/templates/calculators/eil.html:42
+#: templates/calculators/eil.html:42
msgid "The market value of the crop in local currency per weight unit"
msgstr "按当地货币计算的单位产量作物的市场价"
-#: calculators/templates/calculators/eil.html:43
+#: templates/calculators/eil.html:43
msgid "Market value"
msgstr "市场价值"
-#: calculators/templates/calculators/eil.html:49
+#: templates/calculators/eil.html:49
msgid ""
"The maximum yield per production unit. Historical values are typically used "
"for this expression."
msgstr "每生产单位的最大产量。在这个表达式中，通常使用历史数据。"
-#: calculators/templates/calculators/eil.html:50
+#: templates/calculators/eil.html:50
msgid "Yield potential"
msgstr "产量潜力"
-#: calculators/templates/calculators/eil.html:57
+#: templates/calculators/eil.html:57
msgid "The proportion of the pest population killed."
msgstr "被杀死害虫的比例"
-#: calculators/templates/calculators/eil.html:58
+#: templates/calculators/eil.html:58
msgid "Control efficacy"
msgstr "控制效力"
-#: calculators/templates/calculators/eil.html:64
+#: templates/calculators/eil.html:64
msgid "Damage expressed as crop yield loss per pest measuring unit"
msgstr "损失表现为每害虫测定单位的作物产量损失"
-#: calculators/templates/calculators/eil.html:65
+#: templates/calculators/eil.html:65
msgid "Damage per pest measuring unit"
msgstr "每害虫测定单位的损害"
-#: calculators/templates/calculators/eil.html:69
+#: templates/calculators/eil.html:69
msgid "Settings"
msgstr "设置"
-#: calculators/templates/calculators/eil.html:71
+#: templates/calculators/eil.html:71
msgid "Currency"
msgstr "货币"
-#: calculators/templates/calculators/eil.html:75
+#: templates/calculators/eil.html:75
msgid "Crop mass unit"
msgstr "作物重量单位"
-#: calculators/templates/calculators/eil.html:79
+#: templates/calculators/eil.html:79
msgid "Crop area unit"
msgstr "作物面积单位"
-#: calculators/templates/calculators/eil.html:83
+#: templates/calculators/eil.html:83
msgid "Pest measuring unit"
msgstr "害虫测定单位"
-#: calculators/templates/calculators/eil.html:84
+#: templates/calculators/eil.html:84
msgid "Number of aphids per plant"
msgstr "每株植物的蚜虫数量"
-#: calculators/templates/calculators/eil.html:87
+#: templates/calculators/eil.html:87
msgid "Run model"
msgstr "运行模型"
-#: calculators/templates/calculators/eil.html:91
+#: templates/calculators/eil.html:91
msgid "Results"
msgstr "结果"
-#: calculators/templates/calculators/eil.html:93
+#: templates/calculators/eil.html:93
msgid "Calculated EIL"
msgstr "计算的经济损害水平"
-#: calculators/templates/calculators/eil.html:115
+#: templates/calculators/eil.html:115
msgid "EIL as a function of yield loss per pest unit"
msgstr "经济损害水平作为每害虫单位的产量损失的参数"
-#: calculators/templates/calculators/eil.html:116
+#: templates/calculators/eil.html:116
msgid "EIL as a function of control cost"
msgstr "经济损害水平作为控制成本的参数"
-#: calculators/templates/calculators/eil.html:117
+#: templates/calculators/eil.html:117
msgid "EIL as a function of market value"
msgstr "经济损害水平作为市场价值的参数"
-#: calculators/templates/calculators/eil.html:118
-msgid "EIL as a function of yield potential"
-msgstr "经济损害水平作为产量潜力的参数"
-
-#: calculators/templates/calculators/eil.html:119
+#: templates/calculators/eil.html:118
msgid "EIL as a function of insecticide efficacy"
msgstr "经济损害水平作为杀虫剂效力的参数"
-#: calculators/templates/calculators/index.html:25
-#: calculators/templates/calculators/index.html:27
+#: templates/calculators/index.html:25 templates/calculators/index.html:27
msgid "Calculators"
msgstr "计算器"
+
+#~ msgid "EIL as a function of yield potential"
+#~ msgstr "经济损害水平作为产量潜力的参数"
diff --git a/calculators/static/calculators/js/eil.js b/calculators/static/calculators/js/eil.js
index e8395adc87fa47777e70e00f4b8629242281d576..e2a830bffec774f1ad9c7b7fe91c9dcb0e12a5a4 100755
--- a/calculators/static/calculators/js/eil.js
+++ b/calculators/static/calculators/js/eil.js
@@ -41,7 +41,7 @@ function calculateEIL(C,V,K,D)
function renderResult(formId)
{
var theForm = document.getElementById(formId);
- var resultParameters = " = " + theForm["C"].value + " / (" + theForm["V"].value + " * (" + theForm["K"].value + "/100) * " + theForm["D"].value + ")";
+ var resultParameters = ": " + theForm["C"].value + " / (" + theForm["V"].value + " * (" + theForm["K"].value + "/100) * " + theForm["D"].value + ")";
var resultValue = calculateEIL(
theForm["C"].value,
theForm["V"].value,
@@ -50,7 +50,7 @@ function renderResult(formId)
);
document.getElementById("resultParameters").innerHTML = resultParameters;
- document.getElementById("resultValue").innerHTML = resultValue;
+ document.getElementById("resultValue").innerHTML = resultValue.toFixed(3);
}
diff --git a/calculators/templates/calculators/eil.html b/calculators/templates/calculators/eil.html
index 37af35784df43263b549624716b9c6e61d37afe3..be0a5010b5420f36130ed9e7669c7080c330c2df 100755
--- a/calculators/templates/calculators/eil.html
+++ b/calculators/templates/calculators/eil.html
@@ -3,7 +3,7 @@
{% comment %}
#
-# Copyright (c) 2015 NIBIO <http://www.nibio.no/>.
+# Copyright (c) 2022 NIBIO <http://www.nibio.no/>.
#
# This file is part of VIPSWeb.
# VIPSWeb is free software: you can redistribute it and/or modify
@@ -89,13 +89,14 @@
</div>
<div class="col-md-9">
<h1>{% trans "Results" %}</h1>
- <div id="result" style="font-weight: bold;">
- {% trans "Calculated EIL" %} = C / (V * D * (K/100))<span id="resultParameters"></span>: <span id="resultValue"></span>
+ <div id="result" style="font-weight: bold; background-color: white; padding: 15px;">
+ <h2>{% trans "Calculated EIL" %}</h2>
+ <p><strong>C / (V * D * (K/100))</strong><span id="resultParameters"></span> = <span id="resultValue" style="text-decoration: underline; font-weight: bold;"></span>
</div>
<div id="EILvC" style="width:50%; height:300px;float: right;"></div>
<div id="EILvV" style="width:50%; height:300px; "></div>
- <div id="EILvK" style="width:50%; height:300px;"></div>
+ <div id="EILvK" style="width:100%; height:300px;"></div>
<div id="EILvD" style="width:100%; height:300px;"></div>
</div>