Merge branch 'develop'

# Conflicts:
#	DEVELOPERS_MANUAL.md
#	sabi-webclient/pom.xml

CHANGELOG.md

@@ -1,5 +1,15 @@
 # History of changes (since 5/2022)
 
+## Release 1.2.4
+
+### Bugfixes
+* i18n usage for Measurement threshold info in Measurement-View
+
+## Release 1.2.3
+
+### New Features
+* SABI-146: Support to add freshwater tanks as well
+
 ## Release 1.2.2
 
 ### Technical Maintenance

DEVELOPERS_MANUAL.md

@@ -4,14 +4,6 @@ The following helps new developers to setup the required local build environment
 
 ## Technology Stack
 
-[![CodeQL](https://github.com/StefanSchubert/sabi/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/StefanSchubert/sabi/actions/workflows/codeql-analysis.yml)
-[![Java CI with Maven](https://github.com/StefanSchubert/sabi/actions/workflows/maven.yml/badge.svg)](https://github.com/StefanSchubert/sabi/actions/workflows/maven.yml)
-
-## Architectural Notes
-
-Before starting to contribute on this project, make sure that you have read the architectural notes in the [wiki](https://github.com/StefanSchubert/sabi/wiki) which
-are based upon arc42 templates.
-
 ### Common
 
 * Java 21
@@ -43,6 +35,18 @@ The two main reasons for me are:
 
 ----
 
+## Architectural Notes
+
+Before starting to contribute on this project, make sure that you have read the architectural notes in the [wiki](https://github.com/StefanSchubert/sabi/wiki) which
+are based upon arc42 templates.
+
+### Current Code-Quality State
+
+[![CodeQL](https://github.com/StefanSchubert/sabi/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/StefanSchubert/sabi/actions/workflows/codeql-analysis.yml)
+[![Java CI with Maven](https://github.com/StefanSchubert/sabi/actions/workflows/maven.yml/badge.svg)](https://github.com/StefanSchubert/sabi/actions/workflows/maven.yml)
+
+----
+
 ## Setting up the development environment
 
 With a look at [Building-Block View](https://github.com/StefanSchubert/sabi/wiki/05.-Building-Block-View) from the arc42 documentation you see that sabi is not just a single app but consists of using several modules that are configured to work together. Your environment might look different, depending on which module you intent to work on, but the good news is that we already rely on docker here, which makes the setup for you so much easier.

sabi-database/src/main/resources/db/migration/version1_3_0/V1_3_0_1__addedWaterType.sql

@@ -0,0 +1 @@
+ALTER TABLE `aquarium` ADD COLUMN `water_type` VARCHAR(20) DEFAULT 'SEA_WATER';

sabi-webclient/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2023 by Stefan Schubert under the MIT License (MIT).
+  ~ Copyright (c) 2024 by Stefan Schubert under the MIT License (MIT).
   ~ See project LICENSE file for the detailed terms and conditions.
   -->
 
@@ -10,7 +10,7 @@
 
     <groupId>de.bluewhale</groupId>
     <artifactId>sabi-webclient</artifactId>
-    <version>1.2.3</version>
+    <version>1.2.4</version>
     <packaging>jar</packaging>
     <name>sabi-webclient</name>
     <description>A JSF based webclient for sabi.</description>
@@ -57,11 +57,11 @@
         <java.version>21</java.version>
         <log4j2.version>2.20.0</log4j2.version>
         <jakarta.cdi.version>4.0.1</jakarta.cdi.version>
-        <micrometer.prometheus.version>1.12.1</micrometer.prometheus.version>
+        <micrometer.prometheus.version>1.12.2</micrometer.prometheus.version>
         <joinfaces.version>5.1.4</joinfaces.version>
         <sabi.boundary.version>1.2.5</sabi.boundary.version>
         <passay.version>1.6.4</passay.version>
-        <owasp.plugin.version>9.0.7</owasp.plugin.version>
+        <owasp.plugin.version>9.0.9</owasp.plugin.version>
         <lombok.version>1.18.30</lombok.version>
         <versions.maven.plugin.version>2.16.2</versions.maven.plugin.version>
     </properties>

sabi-webclient/src/main/java/de/bluewhale/sabi/webclient/controller/MeasurementListView.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 by Stefan Schubert under the MIT License (MIT).
+ * Copyright (c) 2024 by Stefan Schubert under the MIT License (MIT).
  * See project LICENSE file for the detailed terms and conditions.
  */
 
@@ -26,6 +26,7 @@
 import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Controller for the Measurement View as shown in measureView.xhtml
@@ -159,8 +160,9 @@ public String getGetThresholdInfoFor(Integer unitId) {
         if (unitId != null && unitId != 0) {
             try {
                 ParameterTo parameterTo = measurementService.getParameterFor(unitId, userSession.getSabiBackendToken());
-                if (parameterTo != null) {
-                    result = String.format("min = %.03f / max = %.03f", parameterTo.getMinThreshold(), parameterTo.getMaxThreshold());
+                Locale usersLocale = userSession.getLocale();
+                if (parameterTo != null && usersLocale != null) {
+                    result = String.format(usersLocale, "min = %.03f / max = %.03f", parameterTo.getMinThreshold(), parameterTo.getMaxThreshold());
                 }
             } catch (Exception e) {
                 log.warn("Could not resolve parameter info for unit {}", unitId);