From 48f76b70927d59a29758c2a75465a327784f775a Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Thu, 16 Jan 2025 14:47:09 +0100
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20changement=20de=20l'intitul=C3=A9=20?=
 =?UTF-8?q?des=20p=C3=A9riodes.=20fixes=20#96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/migration.sql    | 25 +++++++++++++++++++++++++
 sql/translations.csv | 10 ++++------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/sql/migration.sql b/sql/migration.sql
index 0df4eb2..a3f274c 100644
--- a/sql/migration.sql
+++ b/sql/migration.sql
@@ -219,6 +219,31 @@ END;
 $BODY$
 language plpgsql;
 
+--
+-- #96 : periods
+--
+CREATE OR REPLACE FUNCTION upgrade20250116() RETURNS boolean AS $BODY$
+BEGIN
+    CREATE TEMPORARY TABLE IF NOT EXISTS tmp_translation (
+        key VARCHAR,
+        locale VARCHAR,
+        translation VARCHAR
+    );
+    INSERT INTO tmp_translation (key, locale, translation) VALUES
+    ('summer', 'en', 'Summer crop (01/04 − 15/10)'),
+    ('summer', 'fr', 'Culture d’été (01/04 − 15/10)'),
+    ('winter', 'en', 'Winter crop (31/10 − 31/8)'),
+    ('winter', 'fr', 'Culture d’hiver (31/10 − 31/8)');
+
+	UPDATE i18n
+    	SET translation=t.translation
+    	FROM i18nkey AS k, locale AS l, tmp_translation AS t
+    	WHERE i18n.i18nkey=k.id AND i18n.locale=l.id AND l.languagetag=t.locale AND k.string=t.key;
+    RETURN true;
+END;
+$BODY$
+language plpgsql;
+
 ---
 --
 -- Keep this call at the end to apply migration functions.
diff --git a/sql/translations.csv b/sql/translations.csv
index 0181ecf..4eeafc6 100644
--- a/sql/translations.csv
+++ b/sql/translations.csv
@@ -27,11 +27,9 @@ rainsum,en,Rain sum
 rainsum,fr,Cumul de pluie
 rainsum-description,en,Total precipitation
 rainsum-description,fr,Cumul des précipitations
-spring,en,Spring
-spring,fr,Printemps
-summer,en,Summer
-summer,fr,Été
-winter,en,Winter
-winter,fr,Hiver
+summer,en,Summer crop (01/04 − 15/10)
+summer,fr,Culture d’été (01/04 − 15/10)
+winter,en,Winter crop (31/10 − 31/8)
+winter,fr,Culture d’hiver (31/10 − 31/8)
 year,en,Year
 year,fr,Année
-- 
GitLab


From 88309f2b08015b8eceac832dc8dfef47af41eabf Mon Sep 17 00:00:00 2001
From: Olivier Maury <Olivier.Maury@inrae.fr>
Date: Wed, 22 Jan 2025 14:45:56 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Afficher=20la=20p=C3=A9riode=20dans=20le=20?=
 =?UTF-8?q?sous-titre=20du=20graphique.=20refs=20#96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/agrometinfo/www/client/ui/chart/DailyValuesChart.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www-client/src/main/java/fr/agrometinfo/www/client/ui/chart/DailyValuesChart.java b/www-client/src/main/java/fr/agrometinfo/www/client/ui/chart/DailyValuesChart.java
index 6e9d2dc..76f08c0 100644
--- a/www-client/src/main/java/fr/agrometinfo/www/client/ui/chart/DailyValuesChart.java
+++ b/www-client/src/main/java/fr/agrometinfo/www/client/ui/chart/DailyValuesChart.java
@@ -69,7 +69,7 @@ public final class DailyValuesChart extends TimeSeriesLineChart {
         GWT.log("DailyValuesChart() " + values.size());
         this.unit = summary.getIndicator().getUnit();
 
-        final var subtitle = MSGS.chartSubtitle(summary.getDate(), unit);
+        final var subtitle = new String[] {summary.getPeriod(), MSGS.chartSubtitle(summary.getDate(), unit)};
         setTitle(CSTS.dailyValues() + " − " + DateUtils.getYear(summary.getDate()), subtitle);
         setPlugins();
 
@@ -125,7 +125,7 @@ public final class DailyValuesChart extends TimeSeriesLineChart {
         this.getPlugins().add(new LogoPlugin());
     }
 
-    private void setTitle(final String title, final String subtitle) {
+    private void setTitle(final String title, final String[] subtitle) {
         this.getOptions().setResponsive(true);
         this.getOptions().setAnimationEnabled(false);
         this.getOptions().getLegend().setDisplay(false);
-- 
GitLab