mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-29 01:03:46 +00:00
[android] Rebase fixes for Add support for check_date & check_date:opening_hours
Following from https://codeberg.org/comaps/comaps/pulls/1572 Also add script for easy transfer of strings across modules Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
committed by
Konstantin Pastbin
parent
73238a6e3c
commit
47936df79c
@@ -10,7 +10,7 @@ import java.time.LocalDate;
|
||||
import java.time.format.DateTimeFormatter;
|
||||
import java.util.Locale;
|
||||
|
||||
import app.organicmaps.R;
|
||||
import app.organicmaps.sdk.R;
|
||||
|
||||
public final class DateUtils
|
||||
{
|
||||
@@ -40,9 +40,9 @@ public final class DateUtils
|
||||
int days = (int) (LocalDate.now().toEpochDay() - LocalDate.parse(dateString, formatter).toEpochDay());
|
||||
|
||||
if (days == 0)
|
||||
return resources.getString(R.string.today);
|
||||
return resources.getString(R.string.today).toLowerCase();
|
||||
if (days == 1)
|
||||
return resources.getString(R.string.yesterday);
|
||||
return resources.getString(R.string.yesterday).toLowerCase();
|
||||
if (days < 7)
|
||||
return resources.getString(R.string.days_ago, Integer.toString(days));
|
||||
if (days < 30)
|
||||
|
||||
Reference in New Issue
Block a user