Leaderboard dates using format and language

src/main/java/com/faforever/client/util/TimeService.java

@@ -47,13 +47,24 @@ public String asDate(TemporalAccessor temporalAccessor, FormatStyle formatStyle)
     if (temporalAccessor == null) {
       return i18n.get("noDateAvailable");
     }
-    return DateTimeFormatter.ofLocalizedDate(formatStyle)
-        .withLocale(getCurrentDateLocale())
+
+    DateInfo dateInfo = localizationPrefs.getDateFormat();
+    DateTimeFormatter formatter;
+
+    if (dateInfo.equals(DateInfo.DAY_MONTH_YEAR)) {
+      formatter = DateTimeFormatter.ofPattern(getDatePatternForDayMonthYear(formatStyle));
+    } else if (dateInfo.equals(DateInfo.MONTH_DAY_YEAR)) {
+      formatter = DateTimeFormatter.ofPattern(getDatePatternForMonthDayYear(formatStyle));
+    } else {
+      formatter = DateTimeFormatter.ofLocalizedDate(formatStyle);
+    }
+
+    return formatter.withLocale(i18n.getUserSpecificLocale())
         .withZone(TimeZone.getDefault().toZoneId())
         .format(temporalAccessor);
   }
 
-  
+
   public String asShortTime(Temporal temporal) {
     if (temporal == null) {
       return "";
@@ -80,6 +91,38 @@ private Locale getCurrentDateLocale() {
 
   }
 
+  private String getDatePatternForDayMonthYear(FormatStyle style) {
+    switch (style) {
+      case SHORT -> {
+        return "d/M/yy";
+      }
+      case MEDIUM -> {
+        return "d MMM, yyyy";
+      }
+      default -> {
+        // for other styles extend this
+        return "d MMMM, yyyy";
+      }
+    }
+  }
+
+
+  private String getDatePatternForMonthDayYear(FormatStyle style) {
+    switch (style) {
+      case SHORT -> {
+        return "M/d/yy";
+      }
+      case MEDIUM -> {
+        return "MMM d, yyyy";
+      }
+      default -> {
+        // for other styles extend this
+        return "MMMM d, yyyy";
+      }
+    }
+  }
+
+
   /**
    * Returns the localized minutes and seconds (e.g. '20min 31s'), or hours and minutes (e.g. '1h 5min') of the
    * specified duration.

src/test/java/com/faforever/client/util/TimeServiceTest.java

@@ -0,0 +1,89 @@
+package com.faforever.client.util;
+
+import com.faforever.client.i18n.I18n;
+import com.faforever.client.preferences.ChatPrefs;
+import com.faforever.client.preferences.DateInfo;
+import com.faforever.client.preferences.LocalizationPrefs;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.parallel.Execution;
+import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+@Execution(ExecutionMode.CONCURRENT)
+@ExtendWith({MockitoExtension.class})
+class TimeServiceTest {
+
+  @Mock
+  I18n i18n;
+  @Mock
+  ChatPrefs chatPrefs;
+  @Mock
+  LocalizationPrefs localizationPrefs;
+
+  @InjectMocks
+  TimeService service;
+
+  @BeforeEach
+  void setUp() {
+
+  }
+
+  @Test
+  void asDateAuto() {
+    var date = generateDate();
+    var dateInfo = DateInfo.AUTO;
+    var locale = Locale.of("en", "US");
+
+    when(localizationPrefs.getDateFormat()).thenReturn(dateInfo);
+    when(i18n.getUserSpecificLocale()).thenReturn(locale);
+
+    var result = service.asDate(date, FormatStyle.MEDIUM);
+
+    assertEquals(result, "Sep 9, 2022");
+  }
+
+  @Test
+  void asDateMonthDayYear() {
+    var date = generateDate();
+    var dateInfo = DateInfo.MONTH_DAY_YEAR;
+    var locale = Locale.of("en", "US");
+
+    when(localizationPrefs.getDateFormat()).thenReturn(dateInfo);
+    when(i18n.getUserSpecificLocale()).thenReturn(locale);
+
+    var result = service.asDate(date, FormatStyle.MEDIUM);
+
+    assertEquals(result, "Sep 9, 2022");
+  }
+
+  @Test
+  void asDateDayMonthYear() {
+    var date = generateDate();
+    var dateInfo = DateInfo.DAY_MONTH_YEAR;
+    var locale = Locale.of("en", "US");
+
+    when(localizationPrefs.getDateFormat()).thenReturn(dateInfo);
+    when(i18n.getUserSpecificLocale()).thenReturn(locale);
+
+    var result = service.asDate(date, FormatStyle.MEDIUM);
+
+    assertEquals(result, "9 Sep, 2022");
+  }
+
+
+  private OffsetDateTime generateDate() {
+    return OffsetDateTime.of(2022, 9, 9, 9, 9, 9, 9, ZoneOffset.UTC);
+  }
+}