From dc2a7d1b72ee98e667a13082b5d7cd9a952962d7 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 17 Sep 2020 10:05:28 +0200
Subject: [PATCH] Added explanation for the different notification services
---
.../no/nibio/vips/logic/i18n/vipslogictexts.properties | 3 +++
.../no/nibio/vips/logic/i18n/vipslogictexts_bs.properties | 3 +++
.../no/nibio/vips/logic/i18n/vipslogictexts_hr.properties | 3 +++
.../no/nibio/vips/logic/i18n/vipslogictexts_nb.properties | 3 +++
.../no/nibio/vips/logic/i18n/vipslogictexts_sr.properties | 3 +++
.../no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties | 3 +++
src/main/webapp/templates/notificationSubscriptionForm.ftl | 3 +++
7 files changed, 21 insertions(+)
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 8b63096e..67c44064 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 09e80271..0e83da3e 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 1c160f31..4de1656b 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 9744b7f3..eadcf8eb 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 a4112355..c922c590 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 3e21faf5..42a743b5 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 a5883391..edf0b8cb 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);">
--
GitLab