From 965071a703dd1e136e531f075371269ffd05868e Mon Sep 17 00:00:00 2001
From: Lene Wasskog <lene.wasskog@nibio.no>
Date: Wed, 30 Apr 2025 09:08:10 +0200
Subject: [PATCH] feat: Add texts to i18n files
---
.../no/nibio/vips/logic/i18n/vipslogictexts.properties | 4 ++++
.../no/nibio/vips/logic/i18n/vipslogictexts_nb.properties | 4 ++++
src/main/webapp/templates/observationForm.ftl | 6 ++----
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index dd150cdc..e8b9b640 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -902,6 +902,10 @@ tillageMethod = Tillage method
timeOfObservation = Time of observation
+timeSeries = Time series
+
+timeSeriesNonEditable = Culture, pest and location is common for all observations within a time series. This information cannot be modified.
+
timeZone = Time zone
timestamp = Timestamp
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index ae2b3ac1..69c8db61 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -900,6 +900,10 @@ tillageMethod = Jordarbeiding
timeOfObservation = Observasjonsdato
+timeSeries = Tidsserie
+
+timeSeriesNonEditable = Kultur, organisme og sted er felles for alle observasjoner innenfor en tidsserie, og kan derfor ikke redigeres per observasjon.
+
timeZone = Tidssone
timestamp = Tidspunkt
diff --git a/src/main/webapp/templates/observationForm.ftl b/src/main/webapp/templates/observationForm.ftl
index ebba0275..7e650bf2 100755
--- a/src/main/webapp/templates/observationForm.ftl
+++ b/src/main/webapp/templates/observationForm.ftl
@@ -561,10 +561,8 @@
</#if>
<#if observation.observationTimeSeries?has_content>
<div class="form-group">
- <label>Tidsserie: ${observation.observationTimeSeries.name}</label><br>
- <i>Tidsserier opprettes via appen VIPS feltobservasjoner. Kultur, organisme og sted er
- felles for alle observasjoner innenfor en tidsserie, og kan derfor ikke redigeres per
- observasjon.</i>
+ <label>${i18nBundle.timeSeries}: ${observation.observationTimeSeries.name}</label><br>
+ <i>${i18nBundle.timeSeriesNonEditable}</i>
</div>
<div class="form-group">
<label for="cropOrganismId">${i18nBundle.cropOrganismId}</label>
--
GitLab