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 dd150cdced77c7dd4aaac5afb066c59a27b12336..e8b9b640b676d1c744d36c4e6df32168766aa44d 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 ae2b3ac16deb47f630e9c5dee526e81916a31c36..69c8db61d34bb071bc609b7776cb5b8a21836e44 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 ebba027558ab893a96a127e15f5126b7b384f6d6..7e650bf225b3a968b243a9cfbce60f9b6dbcf158 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>