Merge branch 'v2_9_1'

Dockerfile

 FROM tomcat:9-jdk17
 
 RUN rm -rf /usr/local/tomcat/webapps/*
-COPY build/2.9.0/BudgetMaster-v2.9.0.war $CATALINA_HOME/webapps/ROOT.war
+COPY build/2.9.1/BudgetMaster-v2.9.1.war $CATALINA_HOME/webapps/ROOT.war
 COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 
 EXPOSE 8080
\ No newline at end of file

Dockerfile_jre

@@ -5,7 +5,7 @@ ARG APP_DIR=/BudgetMaster
 RUN mkdir -p $APP_DIR
 RUN mkdir -p /root/.Deadlocker/BudgetMaster
 
-COPY build/2.9.0/BudgetMaster-v2.9.0.jar /BudgetMaster/BudgetMaster.jar
+COPY build/2.9.1/BudgetMaster-v2.9.1.jar /BudgetMaster/BudgetMaster.jar
 COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties
 RUN echo "server.port=9000" > ~/.Deadlocker/BudgetMaster/settings.properties
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>de.deadlocker8</groupId>
     <artifactId>BudgetMaster</artifactId>
-    <version>2.9.0</version>
+    <version>2.9.1</version>
     <name>BudgetMaster</name>
 
     <repositories>
@@ -77,7 +77,7 @@
 
         <app.versionDate>${maven.build.timestamp}</app.versionDate>
         <maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
-        <app.versionCode>35</app.versionCode>
+        <app.versionCode>36</app.versionCode>
         <app.author>Robert Goldmann</app.author>
 
         <project.outputDirectory>build/${project.version}</project.outputDirectory>

src/main/java/de/deadlocker8/budgetmaster/controller/AboutController.java

@@ -53,6 +53,7 @@ public class AboutController extends BaseController
 		newsEntries.add(NewsEntry.createWithLocalizationKey("saveAndContinue"));
 		newsEntries.add(NewsEntry.createWithLocalizationKey("newCharts"));
 		newsEntries.add(NewsEntry.createWithLocalizationKey("fix.transferDirectionInCharts"));
+		newsEntries.add(NewsEntry.createWithLocalizationKey("fix.repeatingTransactions"));
 
 		model.addAttribute(ModelAttributes.NEWS_ENTRIES, newsEntries);
 		return ReturnValues.WHATS_NEW;

src/main/java/de/deadlocker8/budgetmaster/transactions/TransactionController.java

@@ -218,7 +218,7 @@ public class TransactionController extends BaseController
 				repeatingEnd = new RepeatingEndAfterXTimes(Integer.parseInt(repeatingEndValue));
 				break;
 			case DATE:
-				LocalDate endDate = LocalDate.parse(repeatingEndValue, DateTimeFormatter.ofPattern(DateFormatStyle.NORMAL.getKey()).withLocale(settingsService.getSettings().getLanguage().getLocale()));
+				LocalDate endDate = LocalDate.parse(repeatingEndValue, DateTimeFormatter.ofPattern(DateFormatStyle.LONG.getKey()).withLocale(settingsService.getSettings().getLanguage().getLocale()));
 				repeatingEnd = new RepeatingEndDate(endDate);
 				break;
 		}

src/main/resources/languages/news_de.properties

@@ -19,3 +19,7 @@ news.newCharts.description=BudgetMaster bietet jetzt vier neue Standarddiagramme
 
 news.fix.transferDirectionInCharts.headline=Bugfix: Verhalten von Umbuchungen in Diagrammen
 news.fix.transferDirectionInCharts.description=Umbuchungen werden in Diagrammen nun entsprechend ihrer Richtung behandelt.
+
+news.fix.repeatingTransactions.headline=Bugfix: Fehler beim Speichern von wiederholenden Buchungen behoben
+news.fix.repeatingTransactions.description=Fehler behoben, der beim Speichern von Buchungen, die sich wiederholen und an einem bestimmten Datum enden sollen, entstand.
+

src/main/resources/languages/news_en.properties

@@ -19,3 +19,6 @@ news.newCharts.description=BudgetMaster now features four new default charts.
 
 news.fix.transferDirectionInCharts.headline=Bugfix: Transfer direction in charts
 news.fix.transferDirectionInCharts.description=The direction of a transfer is now respected in charts.
+
+news.fix.repeatingTransactions.headline=Bugfix: Fixed error when saving repeating transactions
+news.fix.repeatingTransactions.description=Fixed an error that occurred when saving repeating transaction that should end on a certain date.