Adding message and observation link to notifications

Adding i18n to observation form

src/main/java/no/nibio/vips/logic/messaging/MessagingBean.java

@@ -60,7 +60,7 @@ public class MessagingBean {
     
     public void sendUniversalMessage(Message message)
     {
-        String msgDownloadUrlTpl = "https://www.vips-landbruk.no/";
+        String msgDownloadUrlTpl = "https://www.vips-landbruk.no/messages/" + message.getMessageId() + "/";
         // Create a universal message from the message
         // TODO: When UniversalMessage has changed, pick
         UniversalMessage uMessage = new UniversalMessage();
@@ -401,7 +401,7 @@ public class MessagingBean {
         {
             return;
         }
-        String msgDownloadUrlTpl = "https://www.vips-landbruk.no/";
+        String msgDownloadUrlTpl = "https://www.vips-landbruk.no/observations/" + observation.getObservationId() + "/";
         // Create a universal message from the message
         // TODO: When UniversalMessage has changed, pick
         UniversalMessage uMessage = new UniversalMessage();
@@ -412,7 +412,9 @@ public class MessagingBean {
         uMessage.setExpiresAt(cal.getTime());
         // For locale, we assume observer's language
         VipsLogicUser observer = em.find(VipsLogicUser.class, observation.getUserId());
-        uMessage.addMessageLocalVersion(observer.getPreferredLocale(), observation.getObservationHeading(), "", observation.getObservationText(), msgDownloadUrlTpl);
+        uMessage.addMessageLocalVersion(observer.getPreferredLocale(), observation.getObservationHeading(), "", 
+                observation.getObservationText()
+                , msgDownloadUrlTpl);
         
         // Find the suscribers, create distribution list
         uMessage.setDistributionList(this.getObservationNotificationSubscribers(observation));

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties

@@ -453,3 +453,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter
 pointOfInterestType_4=Region
 task_RunGridModelsTask_name=Run grid models
 task_RunGridModelsTask_description=Run models that cover several locations
+currentDate=Current date
+days=Days
+older=Older

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties

@@ -453,3 +453,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter
 pointOfInterestType_4=Region
 task_RunGridModelsTask_name=Run grid models
 task_RunGridModelsTask_description=Test
+currentDate=Current date
+days=Days
+older=Older

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties

@@ -452,3 +452,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter
 pointOfInterestType_4=Region
 task_RunGridModelsTask_name=Run grid models
 task_RunGridModelsTask_description=Test
+currentDate=Current date
+days=Days
+older=Older

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties

@@ -453,3 +453,6 @@ vipsLogicRole_8=Rogneb\u00e6rm\u00f8llklaseteller
 pointOfInterestType_4=Region
 task_RunGridModelsTask_name=Kj\u00f8r GRID-baserte modeller
 task_RunGridModelsTask_description=Kj\u00f8r modeller som spenner over flere lokaliteter 
+currentDate=Gjeldende dato
+days=Dager
+older=Eldre

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties

@@ -453,3 +453,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter
 pointOfInterestType_4=Region
 task_RunGridModelsTask_name=Run grid models
 task_RunGridModelsTask_description=Test
+currentDate=Current date
+days=Days
+older=Older

src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

@@ -450,3 +450,6 @@ vipsLogicRole_8=Apple Fruit Moth Rowanberry Cluster Counter
 pointOfInterestType_4=Region
 task_RunGridModelsTask_name=Run grid models
 task_RunGridModelsTask_description=Test
+currentDate=Current date
+days=Days
+older=Older

src/main/webapp/templates/observationMap.ftl

@@ -95,9 +95,9 @@
                     var html = "<ul>";
                     for(var i in colors)
                     {
-                            html += '<li><i style="color: ' + colors[i][1] + ';" class="fa fa-square" aria-hidden="true"></i> ' + (i > 0 ? colors[i-1][0] + 1 : '0') + '-' + colors[i][0] + ' dager</li>';
+                            html += '<li><i style="color: ' + colors[i][1] + ';" class="fa fa-square" aria-hidden="true"></i> ' + (i > 0 ? colors[i-1][0] + 1 : '0') + '-' + colors[i][0] + ' ${i18nBundle.days?lower_case}</li>';
                     }
-                        html += '<li><i style="color: black;" class="fa fa-square" aria-hidden="true"></i> Eldre</li>';
+                        html += '<li><i style="color: black;" class="fa fa-square" aria-hidden="true"></i> ${i18nBundle.older}</li>';
                     html += "</ul>";
                     lBox.innerHTML = html;
                 }
@@ -159,7 +159,7 @@
         <div id="observationMap" class="map" style="position:relative;">
             <div id="popover"></div>
             <div class="form-group" id="progressBar">
-                <label for="dayInPeriod">Gjeldende dato: <span id="dayInPeriodDate">${to?date}</span></label><br/>
+                <label for="dayInPeriod">${i18nBundle.currentDate}: <span id="dayInPeriodDate">${to?date}</span></label><br/>
                 <button type="button" id="playButton" class="btn" onclick="togglePlay(this);"><i class="fa fa-play" aria-hidden="true"></i></button>
                 <input type="range" id="dayInPeriod" name="dayInPeriod" min="1" max="${periodDays}" step="1" value="${periodDays}" oninput="updateCurrentDate(this);" onchange="updateMap(this)"/>