Skip to content
Snippets Groups Projects
Commit c998d8ad authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Roughage: Custom growth start calc date [GROVFOR-10]

parent 5c57a04c
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
roughage/locale/nb/LC_MESSAGES/django.mo
+ 0
− 0
View file @ c998d8ad
No preview for this file type
roughage/locale/nb/LC_MESSAGES/django.po
+ 24
− 37
View file @ c998d8ad
...@@ -7,25 +7,8 @@ msgid "" ...@@ -7,25 +7,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD "POT-Creation-Date: 2023-03-17 10:04+0100\n"
"POT-Creation-Date: 2020-09-17 12:45+0200\n"
"PO-Revision-Date: 2020-09-17 12:46+0200\n"
=======
"POT-Creation-Date: 2020-09-30 10:36+0200\n"
"PO-Revision-Date: 2020-06-09 13:01+0200\n"
>>>>>>> epleviklerNewFeatures
"Last-Translator: \n"
"Language-Team: \n"
"Language: nb\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
<<<<<<< HEAD
"X-Generator: Poedit 2.3\n"
=======
"X-Generator: Poedit 2.0.6\n"
>>>>>>> epleviklerNewFeatures
#: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27 #: templates/roughage/nutrition.html:24 templates/roughage/nutrition.html:27
#: templates/roughage/nutrition_calibration.html:23 #: templates/roughage/nutrition_calibration.html:23
...@@ -41,82 +24,86 @@ msgid "Clover share" ...@@ -41,82 +24,86 @@ msgid "Clover share"
msgstr "Kløverandel" msgstr "Kløverandel"
#: templates/roughage/nutrition.html:92 #: templates/roughage/nutrition.html:92
msgid "Date of growth start calculation"
msgstr "Dato for beregning av vekststart"
#: templates/roughage/nutrition.html:97
msgid "First harvest date" msgid "First harvest date"
msgstr "Dato førsteslått" msgstr "Dato førsteslått"
#: templates/roughage/nutrition.html:97 #: templates/roughage/nutrition.html:102
msgid "Second harvest date" msgid "Second harvest date"
msgstr "Dato andreslått" msgstr "Dato andreslått"
#: templates/roughage/nutrition.html:119 #: templates/roughage/nutrition.html:124
msgid "Use weather scenarios" msgid "Use weather scenarios"
msgstr "Bruk værscenarier" msgstr "Bruk værscenarier"
#: templates/roughage/nutrition.html:122 #: templates/roughage/nutrition.html:127
msgid "Mean daily temperature" msgid "Mean daily temperature"
msgstr "Middeltemperatur pr. døgn" msgstr "Middeltemperatur pr. døgn"
#: templates/roughage/nutrition.html:131 #: templates/roughage/nutrition.html:136
msgid "Daily precipitation" msgid "Daily precipitation"
msgstr "Nedbør pr. døgn" msgstr "Nedbør pr. døgn"
#: templates/roughage/nutrition.html:140 #: templates/roughage/nutrition.html:145
msgid "Daily global radiation" msgid "Daily global radiation"
msgstr "Globalstråling pr. døgn" msgstr "Globalstråling pr. døgn"
#: templates/roughage/nutrition.html:154 #: templates/roughage/nutrition.html:159
msgid "Add artificial watering" msgid "Add artificial watering"
msgstr "Legg til vanning" msgstr "Legg til vanning"
#: templates/roughage/nutrition.html:164 #: templates/roughage/nutrition.html:169
msgid "Delete matrix contents" msgid "Delete matrix contents"
msgstr "Tøm matrise for kalibreringsverdier" msgstr "Tøm matrise for kalibreringsverdier"
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274 #: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284
msgid "Time of day" msgid "Time of day"
msgstr "Klokkeslett" msgstr "Klokkeslett"
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286 #: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296
msgid "Harvest width" msgid "Harvest width"
msgstr "Slåttebredde" msgstr "Slåttebredde"
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293 #: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303
msgid "Estimated harvest" msgid "Estimated harvest"
msgstr "Estimert avling" msgstr "Estimert avling"
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302 #: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312
msgid "Conditioning" msgid "Conditioning"
msgstr "Kondisjonering" msgstr "Kondisjonering"
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304 #: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314
msgid "Weak" msgid "Weak"
msgstr "Svak" msgstr "Svak"
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305 #: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315
msgid "Strong" msgid "Strong"
msgstr "Sterk" msgstr "Sterk"
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306 #: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316
msgid "Crushed" msgid "Crushed"
msgstr "Knust" msgstr "Knust"
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313 #: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323
msgid "String width" msgid "String width"
msgstr "Strengbredde" msgstr "Strengbredde"
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320 #: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330
msgid "Estimated dry matter fraction" msgid "Estimated dry matter fraction"
msgstr "Anslått tørrstoffprosent" msgstr "Anslått tørrstoffprosent"
#: templates/roughage/nutrition.html:332 #: templates/roughage/nutrition.html:342
msgid "Run model" msgid "Run model"
msgstr "Kjør modell" msgstr "Kjør modell"
#: templates/roughage/nutrition.html:336 #: templates/roughage/nutrition.html:346
msgid "Model is running, please wait" msgid "Model is running, please wait"
msgstr "Modellen kjører, vennligst vent" msgstr "Modellen kjører, vennligst vent"
#: templates/roughage/nutrition.html:355 #: templates/roughage/nutrition.html:365
msgid "Results" msgid "Results"
msgstr "Resultater" msgstr "Resultater"
......
roughage/locale/zh_CN/LC_MESSAGES/django.po
+ 24
− 20
View file @ c998d8ad
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-17 12:45+0200\n" "POT-Creation-Date: 2023-03-17 09:58+0100\n"
"PO-Revision-Date: 2016-11-03 13:59+0100\n" "PO-Revision-Date: 2016-11-03 13:59+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
...@@ -32,82 +32,86 @@ msgid "Clover share" ...@@ -32,82 +32,86 @@ msgid "Clover share"
msgstr "苜蓿共享" msgstr "苜蓿共享"
#: templates/roughage/nutrition.html:92 #: templates/roughage/nutrition.html:92
msgid "Date of growth start calculation"
msgstr ""
#: templates/roughage/nutrition.html:97
msgid "First harvest date" msgid "First harvest date"
msgstr "第一次收获日期" msgstr "第一次收获日期"
#: templates/roughage/nutrition.html:97 #: templates/roughage/nutrition.html:102
msgid "Second harvest date" msgid "Second harvest date"
msgstr "第二次收获日期" msgstr "第二次收获日期"
#: templates/roughage/nutrition.html:119 #: templates/roughage/nutrition.html:124
msgid "Use weather scenarios" msgid "Use weather scenarios"
msgstr "使用天气情景" msgstr "使用天气情景"
#: templates/roughage/nutrition.html:122 #: templates/roughage/nutrition.html:127
msgid "Mean daily temperature" msgid "Mean daily temperature"
msgstr "日均温" msgstr "日均温"
#: templates/roughage/nutrition.html:131 #: templates/roughage/nutrition.html:136
msgid "Daily precipitation" msgid "Daily precipitation"
msgstr "日降水量" msgstr "日降水量"
#: templates/roughage/nutrition.html:140 #: templates/roughage/nutrition.html:145
msgid "Daily global radiation" msgid "Daily global radiation"
msgstr "日全球辐射" msgstr "日全球辐射"
#: templates/roughage/nutrition.html:154 #: templates/roughage/nutrition.html:159
msgid "Add artificial watering" msgid "Add artificial watering"
msgstr "人工加水" msgstr "人工加水"
#: templates/roughage/nutrition.html:164 #: templates/roughage/nutrition.html:169
msgid "Delete matrix contents" msgid "Delete matrix contents"
msgstr "" msgstr ""
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274 #: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284
msgid "Time of day" msgid "Time of day"
msgstr "一天中的时间" msgstr "一天中的时间"
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286 #: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296
msgid "Harvest width" msgid "Harvest width"
msgstr "收获的宽度" msgstr "收获的宽度"
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293 #: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303
msgid "Estimated harvest" msgid "Estimated harvest"
msgstr "估算的收获" msgstr "估算的收获"
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302 #: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312
msgid "Conditioning" msgid "Conditioning"
msgstr "情形" msgstr "情形"
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304 #: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314
msgid "Weak" msgid "Weak"
msgstr "弱" msgstr "弱"
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305 #: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315
msgid "Strong" msgid "Strong"
msgstr "强" msgstr "强"
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306 #: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316
msgid "Crushed" msgid "Crushed"
msgstr "奔溃" msgstr "奔溃"
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313 #: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323
msgid "String width" msgid "String width"
msgstr "线宽" msgstr "线宽"
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320 #: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330
msgid "Estimated dry matter fraction" msgid "Estimated dry matter fraction"
msgstr "估算的干物质组成比例" msgstr "估算的干物质组成比例"
#: templates/roughage/nutrition.html:332 #: templates/roughage/nutrition.html:342
msgid "Run model" msgid "Run model"
msgstr "运行模型" msgstr "运行模型"
#: templates/roughage/nutrition.html:336 #: templates/roughage/nutrition.html:346
msgid "Model is running, please wait" msgid "Model is running, please wait"
msgstr "模型在运行中，请等候" msgstr "模型在运行中，请等候"
#: templates/roughage/nutrition.html:355 #: templates/roughage/nutrition.html:365
msgid "Results" msgid "Results"
msgstr "结果" msgstr "结果"
......
roughage/locale/zh_Hans/LC_MESSAGES/django.po
+ 24
− 20
View file @ c998d8ad
...@@ -7,7 +7,7 @@ msgid "" ...@@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-09-17 12:45+0200\n" "POT-Creation-Date: 2023-03-17 09:58+0100\n"
"PO-Revision-Date: 2016-11-03 13:59+0100\n" "PO-Revision-Date: 2016-11-03 13:59+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
...@@ -32,82 +32,86 @@ msgid "Clover share" ...@@ -32,82 +32,86 @@ msgid "Clover share"
msgstr "苜蓿共享" msgstr "苜蓿共享"
#: templates/roughage/nutrition.html:92 #: templates/roughage/nutrition.html:92
msgid "Date of growth start calculation"
msgstr ""
#: templates/roughage/nutrition.html:97
msgid "First harvest date" msgid "First harvest date"
msgstr "第一次收获日期" msgstr "第一次收获日期"
#: templates/roughage/nutrition.html:97 #: templates/roughage/nutrition.html:102
msgid "Second harvest date" msgid "Second harvest date"
msgstr "第二次收获日期" msgstr "第二次收获日期"
#: templates/roughage/nutrition.html:119 #: templates/roughage/nutrition.html:124
msgid "Use weather scenarios" msgid "Use weather scenarios"
msgstr "使用天气情景" msgstr "使用天气情景"
#: templates/roughage/nutrition.html:122 #: templates/roughage/nutrition.html:127
msgid "Mean daily temperature" msgid "Mean daily temperature"
msgstr "日均温" msgstr "日均温"
#: templates/roughage/nutrition.html:131 #: templates/roughage/nutrition.html:136
msgid "Daily precipitation" msgid "Daily precipitation"
msgstr "日降水量" msgstr "日降水量"
#: templates/roughage/nutrition.html:140 #: templates/roughage/nutrition.html:145
msgid "Daily global radiation" msgid "Daily global radiation"
msgstr "日全球辐射" msgstr "日全球辐射"
#: templates/roughage/nutrition.html:154 #: templates/roughage/nutrition.html:159
msgid "Add artificial watering" msgid "Add artificial watering"
msgstr "人工加水" msgstr "人工加水"
#: templates/roughage/nutrition.html:164 #: templates/roughage/nutrition.html:169
msgid "Delete matrix contents" msgid "Delete matrix contents"
msgstr "" msgstr ""
#: templates/roughage/nutrition.html:212 templates/roughage/nutrition.html:274 #: templates/roughage/nutrition.html:222 templates/roughage/nutrition.html:284
msgid "Time of day" msgid "Time of day"
msgstr "一天中的时间" msgstr "一天中的时间"
#: templates/roughage/nutrition.html:224 templates/roughage/nutrition.html:286 #: templates/roughage/nutrition.html:234 templates/roughage/nutrition.html:296
msgid "Harvest width" msgid "Harvest width"
msgstr "收获的宽度" msgstr "收获的宽度"
#: templates/roughage/nutrition.html:231 templates/roughage/nutrition.html:293 #: templates/roughage/nutrition.html:241 templates/roughage/nutrition.html:303
msgid "Estimated harvest" msgid "Estimated harvest"
msgstr "估算的收获" msgstr "估算的收获"
#: templates/roughage/nutrition.html:240 templates/roughage/nutrition.html:302 #: templates/roughage/nutrition.html:250 templates/roughage/nutrition.html:312
msgid "Conditioning" msgid "Conditioning"
msgstr "情形" msgstr "情形"
#: templates/roughage/nutrition.html:242 templates/roughage/nutrition.html:304 #: templates/roughage/nutrition.html:252 templates/roughage/nutrition.html:314
msgid "Weak" msgid "Weak"
msgstr "弱" msgstr "弱"
#: templates/roughage/nutrition.html:243 templates/roughage/nutrition.html:305 #: templates/roughage/nutrition.html:253 templates/roughage/nutrition.html:315
msgid "Strong" msgid "Strong"
msgstr "强" msgstr "强"
#: templates/roughage/nutrition.html:244 templates/roughage/nutrition.html:306 #: templates/roughage/nutrition.html:254 templates/roughage/nutrition.html:316
msgid "Crushed" msgid "Crushed"
msgstr "奔溃" msgstr "奔溃"
#: templates/roughage/nutrition.html:251 templates/roughage/nutrition.html:313 #: templates/roughage/nutrition.html:261 templates/roughage/nutrition.html:323
msgid "String width" msgid "String width"
msgstr "线宽" msgstr "线宽"
#: templates/roughage/nutrition.html:258 templates/roughage/nutrition.html:320 #: templates/roughage/nutrition.html:268 templates/roughage/nutrition.html:330
msgid "Estimated dry matter fraction" msgid "Estimated dry matter fraction"
msgstr "估算的干物质组成比例" msgstr "估算的干物质组成比例"
#: templates/roughage/nutrition.html:332 #: templates/roughage/nutrition.html:342
msgid "Run model" msgid "Run model"
msgstr "运行模型" msgstr "运行模型"
#: templates/roughage/nutrition.html:336 #: templates/roughage/nutrition.html:346
msgid "Model is running, please wait" msgid "Model is running, please wait"
msgstr "模型在运行中，请等候" msgstr "模型在运行中，请等候"
#: templates/roughage/nutrition.html:355 #: templates/roughage/nutrition.html:365
msgid "Results" msgid "Results"
msgstr "结果" msgstr "结果"
......
roughage/templates/roughage/nutrition.html
+ 5
− 0
View file @ c998d8ad
...@@ -88,6 +88,11 @@ ...@@ -88,6 +88,11 @@
</select> </select>
<span class="help-block" id="{{ form_id }}_cloverShare_validation"></span> <span class="help-block" id="{{ form_id }}_cloverShare_validation"></span>
</div> </div>
<div class="form-group">
<label for="firstPossibleGrowthStartDate">{% trans "Date of growth start calculation" %}</label>
<input type="date" name="firstPossibleGrowthStartDate" class="form-control" value="{% now "Y" %}-03-01"/>
<span class="help-block" id="{{ form_id }}_firstPossibleGrowthStartDate_validation"></span>
</div>
<div class="form-group"> <div class="form-group">
<label for="firstHarvest">{% trans "First harvest date" %}</label> <label for="firstHarvest">{% trans "First harvest date" %}</label>
<input type="date" name="firstHarvest" class="form-control"/> <input type="date" name="firstHarvest" class="form-control"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment