From 3ce8e7bad15e9edad0d1826580dff3cc34944f2c Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 13 Jan 2012 15:29:04 +0100
Subject: [PATCH] Add information about current version in GET requests

Take advantage to refine strings

FEA: ItEr76S10NewVersionsNotification
---
 .../org/libreplan/business/common/VersionInformation.java | 7 +++++--
 libreplan-webapp/src/main/webapp/common/configuration.zul | 8 ++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java b/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java
index bc3d8b092..57680dc33 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/common/VersionInformation.java
@@ -46,7 +46,9 @@ public class VersionInformation {
      */
     private static final String LIBREPLAN_VERSION_URL = "http://libreplan.org/VERSION";
 
-    private static final String LIBREPLAN_USAGE_STATS_PARAM = "?stats=1";
+    private static final String LIBREPLAN_USAGE_STATS_PARAM = "stats";
+    private static final String LIBREPLAN_VERSION_PARAM = "version";
+
 
     /**
      * Delay to wait till we check the URL again
@@ -83,7 +85,8 @@ public class VersionInformation {
             throws MalformedURLException {
         String url = LIBREPLAN_VERSION_URL;
         if (allowToGatherUsageStatsEnabled) {
-            url += LIBREPLAN_USAGE_STATS_PARAM;
+            url += "?" + LIBREPLAN_USAGE_STATS_PARAM + "=1";
+            url += "&version=" + projectVersion;
         }
         return new URL(url);
     }
diff --git a/libreplan-webapp/src/main/webapp/common/configuration.zul b/libreplan-webapp/src/main/webapp/common/configuration.zul
index 4b8a86fe8..29317ce1a 100644
--- a/libreplan-webapp/src/main/webapp/common/configuration.zul
+++ b/libreplan-webapp/src/main/webapp/common/configuration.zul
@@ -93,15 +93,15 @@
                                     onCheck="configurationController.reloadGeneralConfiguration();" />
                             </row>
                             <row>
-                                <label value="${i18n:_('Warning new version')}" />
+                                <label value="${i18n:_('Check for updates')}" />
                                 <vbox>
                                     <checkbox
-                                        label="${i18n:_('Show a warning when new LibrePlan versions are released')}"
+                                        label="${i18n:_('Show a notification when new LibrePlan versions are released')}"
                                         tooltiptext="${i18n:_('Enable/Disable warning about new LibrePlan versions available')}"
                                         checked="@{configurationController.checkNewVersionEnabled}" />
                                     <checkbox
-                                        label="${i18n:_('Help project developers to collect information about LibrePlan usage thanks to this feature')}"
-                                        tooltiptext="${i18n:_('If you ask us to do so, we will not use your requests to generate usage statistics')}"
+                                        label="${i18n:_('Help project developers to collect information about which LibrePlan version you are using')}"
+                                        tooltiptext="${i18n:_('Check this option to send this information to LibrePlan developers in order to generate usage statistics')}"
                                         checked="@{configurationController.allowToGatherUsageStatsEnabled}" />
                                 </vbox>
                             </row>