PTBAS-737: using consistent english language now

* using system locale for date/times

Author: mal-saiaf

src/main/java/de/doubleslash/keeptime/App.java

@@ -21,9 +21,11 @@
 import java.io.StringWriter;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import de.doubleslash.keeptime.common.DateFormatter;
 import javafx.stage.Window;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -84,6 +86,8 @@ public class App extends Application {
    @Override
    public void init() throws Exception {
       LOG.info("Starting KeepTime.");
+      DateFormatter.setSystemLocale(Locale.getDefault());
+      Locale.setDefault(Locale.ENGLISH);
       final DefaultExceptionHandler defaultExceptionHandler = new DefaultExceptionHandler();
       defaultExceptionHandler.register();
 

src/main/java/de/doubleslash/keeptime/common/DateFormatter.java

@@ -16,15 +16,23 @@
 
 package de.doubleslash.keeptime.common;
 
+import javafx.scene.control.DatePicker;
+import javafx.util.StringConverter;
+
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.format.FormatStyle;
+import java.util.Locale;
 
 public class DateFormatter {
    private static DateTimeFormatter dayDateFormatter = DateTimeFormatter.ofPattern("eeee dd.MM.yyyy");
    private static DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("HH:mm:ss");
 
+   private static Locale systemLocale = Locale.GERMAN;
+
    private DateFormatter() {
       throw new IllegalStateException("Utility class: DateFormatter");
    }
@@ -55,4 +63,33 @@ public static String toTimeString(final LocalDateTime localDateTime) {
       return localDateTime.format(timeFormatter);
    }
 
+   public static void setSystemLocale(Locale locale) {
+      systemLocale = locale;
+   }
+
+   public static Locale getSystemLocale() {
+      return systemLocale;
+   }
+
+   public static void applySystemLocaleOnDate(DatePicker datePicker) {
+      DateTimeFormatter formatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT).withLocale(systemLocale);
+
+      datePicker.setConverter(new StringConverter<>() {
+         @Override
+         public String toString(LocalDate date) {
+            return (date != null) ? formatter.format(date) : "";
+         }
+
+         @Override
+         public LocalDate fromString(String s) {
+            try {
+               return (s != null && !s.isEmpty()) ? LocalDate.parse(s, formatter) : null;
+            } catch (DateTimeParseException e) {
+               return null;
+            }
+         }
+      });
+
+      datePicker.setPromptText(formatter.format(LocalDate.now()));
+   }
 }

src/main/java/de/doubleslash/keeptime/view/ManageWorkController.java

@@ -21,6 +21,7 @@
 import java.time.format.DateTimeParseException;
 import java.time.format.FormatStyle;
 
+import de.doubleslash.keeptime.common.DateFormatter;
 import javafx.scene.control.skin.ComboBoxListViewSkin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -120,6 +121,9 @@ private void initialize() {
 
    private void setUpTimeRestriction() {
 
+      DateFormatter.applySystemLocaleOnDate(startDatePicker);
+      DateFormatter.applySystemLocaleOnDate(endDatePicker);
+
       BooleanBinding isValidBinding = Bindings.createBooleanBinding(() -> {
          if (startTimeSpinner.getValue() == null || endTimeSpinner.getValue() == null
                || startDatePicker.getValue() == null || endDatePicker.getValue() == null) {
@@ -150,8 +154,11 @@ private void setUpTimeRestriction() {
    }
 
    private void setUpTimeSpinner(final Spinner<LocalTime> spinner) {
+      final LocalTimeStringConverter stringConverter = new LocalTimeStringConverter(
+            FormatStyle.MEDIUM,
+            DateFormatter.getSystemLocale()
+            );
       spinner.focusedProperty().addListener((e) -> {
-         final LocalTimeStringConverter stringConverter = new LocalTimeStringConverter(FormatStyle.MEDIUM);
          final StringProperty text = spinner.getEditor().textProperty();
          try {
             stringConverter.fromString(text.get());
@@ -188,7 +195,7 @@ public void increment(final int steps) {
 
       });
 
-      spinner.getValueFactory().setConverter(new LocalTimeStringConverter(FormatStyle.MEDIUM));
+      spinner.getValueFactory().setConverter(stringConverter);
 
    }
 

src/main/java/de/doubleslash/keeptime/view/ReportController.java

@@ -355,6 +355,7 @@ private void updateReport(final LocalDate dateToShow) {
 
    private void loadCalenderWidget() {
       final DatePicker myDatePicker = new DatePicker(this.currentReportDate);
+      DateFormatter.applySystemLocaleOnDate(myDatePicker);
       myDatePicker.valueProperty().addListener((observable, oldvalue, newvalue) -> {
          LOG.info("Datepicker selected value changed to {}", newvalue);
          updateReport(newvalue);