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 8b63096e97cb3168c8d55e7907eef47c67932a9d..67c4406404198678a847cc31d51123b87a29e651 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties @@ -497,3 +497,6 @@ sprayingDate04=Spraying Date 04 fieldIsRequired=The field is required fields=Fields farms=Farms +forecastNotificationsDescription=Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status. +observationNotificationsDescription=An observation notification is issued when a field observation is made of a pest or disease in a specific crop group. +messageNotificationsDescription=A message notification is issued when a news message is published for a specific crop group. diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties index 09e80271881045b91bbdc3692cd1520a75cb8170..0e83da3e9ef599d6c7c2a57d481f76a48d4bfdd5 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties @@ -497,3 +497,6 @@ sprayingDate03=Spraying Date 03 sprayingDate04=Spraying Date 04 fields=Fields farms=Farms +forecastNotificationsDescription=Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status. +observationNotificationsDescription=An observation notification is issued when a field observation is made of a pest or disease in a specific crop group. +messageNotificationsDescription=A message notification is issued when a news message is published for a specific crop group. diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties index 1c160f31ef5052cfe47352603c76aa0db99a9573..4de1656bc890828a9968eb4cd1f6b6c8e186b34b 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties @@ -496,3 +496,6 @@ sprayingDate03=Spraying Date 03 sprayingDate04=Spraying Date 04 fields=Fields farms=Farms +forecastNotificationsDescription=Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status. +observationNotificationsDescription=An observation notification is issued when a field observation is made of a pest or disease in a specific crop group. +messageNotificationsDescription=A message notification is issued when a news message is published for a specific crop group. 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 9744b7f391d76485bc5a1fe06f95c45c036ba6ae..eadcf8eb160dc62f3ae2ae042787eb2fb2e4e328 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 @@ -497,3 +497,6 @@ sprayingDate03=Dato for spr\u00f8yting #3 sprayingDate04=Dato for spr\u00f8yting #4 fields=Felt farms=G\u00e5rder +forecastNotificationsDescription=En varslingsnotis sendes ut n\u00e5r et varsel (en varslingsmodell som kj\u00f8rer for en gitt lokalitet) endrer sin status til et h\u00f8yere risikoniv\u00e5, f.eks. fra gr\u00f8nn til gul eller fra gul til r\u00f8d status. +observationNotificationsDescription=En observasjonsnotis sendes ut n\u00e5r en observasjon i felt er gjort av en skadegj\u00f8rer i en spesifikk kulturgruppe. +messageNotificationsDescription=En meldingsnotis sendes ut n\u00e5r en nyhet/fagmelding sendes ut for en spesifikk kulturgruppe. Man kan ogs\u00e5 bli varslet n\u00e5r VIPS har driftsproblemer diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties index a411235554614487d51b4d670225ac1fae83219f..c922c590d06f3a3920ef0b5ac2d1e09d496f7a52 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties @@ -497,3 +497,6 @@ sprayingDate03=Spraying Date 03 sprayingDate04=Spraying Date 04 fields=Fields farms=Farms +forecastNotificationsDescription=Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status. +observationNotificationsDescription=An observation notification is issued when a field observation is made of a pest or disease in a specific crop group. +messageNotificationsDescription=A message notification is issued when a news message is published for a specific crop group. diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties index 3e21faf58a800dd6e9c1768e4636fe3b0fc49ba6..42a743b57443791ef46f9535c187d96b6ab03512 100755 --- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties +++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties @@ -494,3 +494,6 @@ sprayingDate03=Spraying Date 03 sprayingDate04=Spraying Date 04 fields=Fields farms=Farms +forecastNotificationsDescription=Forecast notifications are issued when a specific forecast (a model running for a location) changes its status to a higher risk level. E.g. green to yellow or yellow to red status. +observationNotificationsDescription=An observation notification is issued when a field observation is made of a pest or disease in a specific crop group. +messageNotificationsDescription=A message notification is issued when a news message is published for a specific crop group. diff --git a/src/main/webapp/templates/notificationSubscriptionForm.ftl b/src/main/webapp/templates/notificationSubscriptionForm.ftl index a5883391223c7c5dcea52d515ef8d192aeb47ee3..edf0b8cbdffc85f97787da19cab586da797830b3 100755 --- a/src/main/webapp/templates/notificationSubscriptionForm.ftl +++ b/src/main/webapp/templates/notificationSubscriptionForm.ftl @@ -54,6 +54,7 @@ <input type="hidden" name="userId" value="${viewUser.userId}"/> <h2>${i18nBundle.forecastNotifications}</h2> + <p>${i18nBundle.forecastNotificationsDescription}</p> <div class="form-group"> <label for="forecastN_universalMessageFormatId">${i18nBundle.messageFormat}</label> <select name="forecastN_universalMessageFormatId" onblur="validateField(this);"> @@ -85,6 +86,7 @@ <span class="help-block" id="${formId}_weatherStationPointOfInterestId_validation"></span> </div> <h2>${i18nBundle.observationNotifications}</h2> + <p>${i18nBundle.observationNotificationsDescription}</p> <div class="form-group"> <label for="observationN_universalMessageFormatId">${i18nBundle.messageFormat}</label> <select name="observationN_universalMessageFormatId" onblur="validateField(this);"> @@ -106,6 +108,7 @@ </select> </div> <h2>${i18nBundle.messageNotifications}</h2> + <p>${i18nBundle.messageNotificationsDescription}</p> <div class="form-group"> <label for="messageN_universalMessageFormatId">${i18nBundle.messageFormat}</label> <select name="messageN_universalMessageFormatId" onblur="validateField(this);">