CLIM-1145: Fix: Missing a dash between "30" and "year" (#616)

* fix(i18n): map 30-year range
* fix(i18n): adjust this too?
* fix: consistency in comments

---------

Co-authored-by: Renoir Boulanger <renoir.boulanger@crim.ca>

Author: renoirb

apps/src/components/climate-data-chart.tsx

@@ -156,7 +156,7 @@ const ClimateDataChart: React.FC<{
 	// Get the label for the current threshold, or null if not found.
 	const thresholdLabel = getLabelByValue(threshold);
 
-	// Tooltip: find closest timestamp for 30 years options
+	// Tooltip: find closest timestamp for 30-years options
 	const findClosetTimestamp = (timestamp: number, data: Record<string, number[]> | undefined) => {
 		if (!data) return null;
 		const sortedKeys = Object.keys(data)
@@ -175,7 +175,7 @@ const ClimateDataChart: React.FC<{
 		[data, version, climateVariableId, chartDataOptions]
 	);
 
-	// Tooltip formatter for 30 years averages and changes
+	// Tooltip formatter for 30-years averages and changes
 	const tooltip30yFormatter = (x: number, prefix: string, isDelta: boolean, currentActiveSeries: string[]) => {
 		// Chart reference
 		const chart = chartRef.current?.chart;
@@ -202,7 +202,7 @@ const ClimateDataChart: React.FC<{
 		const startYear = new Date(timestampKey).getUTCFullYear();
 		const endYear = startYear + 29;
 
-		// Add plot band on 30 years range
+		// Add plot band on 30-years range
 		chart.xAxis[0].addPlotBand({
 			from: Date.UTC(startYear, 0, 1),
 			to: Date.UTC(startYear + 29, 11, 31),
@@ -420,12 +420,12 @@ const ClimateDataChart: React.FC<{
 		},
 		{
 			value: '30-year-averages',
-			label: __('30 year averages'),
+			label: __('30-year averages'),
 			enabled: isThirtyYearAveragingEnabled(),
 		},
 		{
 			value: '30-year-changes',
-			label: __('30 year changes'),
+			label: __('30-year changes'),
 			enabled: isThirtyYearAveragingEnabled(),
 		},
 	], [isThirtyYearAveragingEnabled, __]);

apps/src/components/download/step-additional-details.tsx

@@ -164,7 +164,7 @@ const StepAdditionalDetails = React.forwardRef<StepComponentRef>((_, ref) => {
 		},
 		{
 			value: AveragingType.THIRTY_YEARS,
-			label: __('30 year averages'),
+			label: __('30-year averages'),
 		},
 	].filter((option) =>
 		climateVariable?.getAveragingOptions()?.includes(option.value)

fw-child/languages/react-apps/fr_CA.mo

@@ -71,7 +71,7 @@ msgstr "Choisir la date"
 msgid "All years"
 msgstr "Toutes les années"
 
-msgid "30 years"
+msgid "30-years"
 msgstr "Moyennes sur 30 ans"
 
 msgid "WMO Parameters"
@@ -237,7 +237,7 @@ msgstr "Désélectionnez tout pour obtenir les résultats des modèles individue
 msgid "Temporal frequency"
 msgstr "Fréquence temporelle"
 
-msgid "30 years average"
+msgid "30-years average"
 msgstr "Moyennes sur 30 ans"
 
 msgid "Station type"
@@ -456,10 +456,10 @@ msgstr "Changement par rapport à "
 msgid "Annual values"
 msgstr "Valeurs annuelles"
 
-msgid "30 year averages"
+msgid "30-year averages"
 msgstr "Moyennes sur 30 ans"
 
-msgid "30 year changes"
+msgid "30-year changes"
 msgstr "Changements sur 30 ans"
 
 msgid "Export failed. Please try again."