diff --git a/lib/java/com/google/android/material/datepicker/DateStrings.java b/lib/java/com/google/android/material/datepicker/DateStrings.java index ef29c6a6a3d..15d56fc38dc 100644 --- a/lib/java/com/google/android/material/datepicker/DateStrings.java +++ b/lib/java/com/google/android/material/datepicker/DateStrings.java @@ -90,7 +90,7 @@ static String getMonthDayOfWeekDay(long timeInMillis) { static String getMonthDayOfWeekDay(long timeInMillis, Locale locale) { if (VERSION.SDK_INT >= VERSION_CODES.N) { - return UtcDates.getAbbrMonthWeekdayDayFormat(locale).format(new Date(timeInMillis)); + return UtcDates.getMonthWeekdayDayFormat(locale).format(new Date(timeInMillis)); } return UtcDates.getFullFormat(locale).format(new Date(timeInMillis)); } @@ -101,7 +101,7 @@ static String getYearMonthDayOfWeekDay(long timeInMillis) { static String getYearMonthDayOfWeekDay(long timeInMillis, Locale locale) { if (VERSION.SDK_INT >= VERSION_CODES.N) { - return UtcDates.getYearAbbrMonthWeekdayDayFormat(locale).format(new Date(timeInMillis)); + return UtcDates.getYearMonthWeekdayDayFormat(locale).format(new Date(timeInMillis)); } return UtcDates.getFullFormat(locale).format(new Date(timeInMillis)); } diff --git a/lib/java/com/google/android/material/datepicker/UtcDates.java b/lib/java/com/google/android/material/datepicker/UtcDates.java index 4786a4fed13..e118441ce83 100644 --- a/lib/java/com/google/android/material/datepicker/UtcDates.java +++ b/lib/java/com/google/android/material/datepicker/UtcDates.java @@ -212,13 +212,13 @@ static android.icu.text.DateFormat getAbbrMonthDayFormat(Locale locale) { } @TargetApi(VERSION_CODES.N) - static android.icu.text.DateFormat getAbbrMonthWeekdayDayFormat(Locale locale) { - return getAndroidFormat(android.icu.text.DateFormat.ABBR_MONTH_WEEKDAY_DAY, locale); + static android.icu.text.DateFormat getMonthWeekdayDayFormat(Locale locale) { + return getAndroidFormat(android.icu.text.DateFormat.MONTH_WEEKDAY_DAY, locale); } @TargetApi(VERSION_CODES.N) - static android.icu.text.DateFormat getYearAbbrMonthWeekdayDayFormat(Locale locale) { - return getAndroidFormat(android.icu.text.DateFormat.YEAR_ABBR_MONTH_WEEKDAY_DAY, locale); + static android.icu.text.DateFormat getYearMonthWeekdayDayFormat(Locale locale) { + return getAndroidFormat(android.icu.text.DateFormat.YEAR_MONTH_WEEKDAY_DAY, locale); } static DateFormat getMediumFormat() { diff --git a/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java b/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java index 21827135f39..668983f8aaf 100644 --- a/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java +++ b/lib/javatests/com/google/android/material/datepicker/DateStringsTest.java @@ -310,7 +310,7 @@ public void getDayContentDescription_notToday() { /* isStartOfRange= */ false, /* isEndOfRange= */ false); - assertThat(contentDescription, is("Mon, Nov 30, 2020")); + assertThat(contentDescription, is("Monday, November 30, 2020")); } @Test @@ -324,7 +324,7 @@ public void getDayContentDescription_notToday_startOfRange() { /* isStartOfRange= */ true, /* isEndOfRange= */ false); - assertThat(contentDescription, is("Start date Mon, Nov 30, 2020")); + assertThat(contentDescription, is("Start date Monday, November 30, 2020")); } @Test @@ -338,7 +338,7 @@ public void getDayContentDescription_notToday_endOfRange() { /* isStartOfRange= */ false, /* isEndOfRange= */ true); - assertThat(contentDescription, is("End date Mon, Nov 30, 2020")); + assertThat(contentDescription, is("End date Monday, November 30, 2020")); } @Test @@ -352,7 +352,7 @@ public void getDayContentDescription_notToday_startAndEndOfRange() { /* isStartOfRange= */ true, /* isEndOfRange= */ true); - assertThat(contentDescription, is("Start date Mon, Nov 30, 2020")); + assertThat(contentDescription, is("Start date Monday, November 30, 2020")); } @Test @@ -366,7 +366,7 @@ public void getDayContentDescription_today() { /* isStartOfRange= */ false, /* isEndOfRange= */ false); - assertThat(contentDescription, is("Today Mon, Nov 30, 2020")); + assertThat(contentDescription, is("Today Monday, November 30, 2020")); } @Test @@ -380,7 +380,7 @@ public void getDayContentDescription_today_startOfRange() { /* isStartOfRange= */ true, /* isEndOfRange= */ false); - assertThat(contentDescription, is("Start date Today Mon, Nov 30, 2020")); + assertThat(contentDescription, is("Start date Today Monday, November 30, 2020")); } @Test @@ -394,7 +394,7 @@ public void getDayContentDescription_today_endOfRange() { /* isStartOfRange= */ false, /* isEndOfRange= */ true); - assertThat(contentDescription, is("End date Today Mon, Nov 30, 2020")); + assertThat(contentDescription, is("End date Today Monday, November 30, 2020")); } @Test @@ -408,7 +408,21 @@ public void getDayContentDescription_today_startAndEndOfRange() { /* isStartOfRange= */ true, /* isEndOfRange= */ true); - assertThat(contentDescription, is("Start date Today Mon, Nov 30, 2020")); + assertThat(contentDescription, is("Start date Today Monday, November 30, 2020")); + } + + @Test + public void getLocalizedDayContentDescription_german() { + startDate = setupLocalizedCalendar(Locale.GERMAN, 2020, 10, 30); + String contentDescription = + DateStrings.getDayContentDescription( + ApplicationProvider.getApplicationContext(), + startDate.getTimeInMillis(), + /* isToday= */ false, + /* isStartOfRange= */ false, + /* isEndOfRange= */ false); + + assertThat(contentDescription, is("Montag, 30. November 2020")); } @Test