Merge pull request #4921 from Isira-Seneviratne/Call_offsetDateTime_instead_of_date

Call DateWrapper's offsetDateTime() instead of date().
This commit is contained in:
Tobias Groza 2020-11-20 15:58:22 +01:00 committed by GitHub
commit 4700f35739
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions

View file

@ -30,6 +30,7 @@ import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.Arrays;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.List;
import java.util.Locale;
@ -312,12 +313,12 @@ public final class Localization {
prettyTime.removeUnit(Decade.class);
}
private static PrettyTime getPrettyTime() {
return prettyTime;
public static String relativeTime(final OffsetDateTime offsetDateTime) {
return relativeTime(GregorianCalendar.from(offsetDateTime.toZonedDateTime()));
}
public static String relativeTime(final Calendar calendarTime) {
return getPrettyTime().formatUnrounded(calendarTime);
return prettyTime.formatUnrounded(calendarTime);
}
private static void changeAppLanguage(final Locale loc, final Resources res) {