drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 22:03:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Rebase fixes for Add support for check_date & check_date:opening_hours

Browse Source 
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:
Harry Bond
2025-08-23 22:44:42 +01:00
committed by Konstantin Pastbin
parent 73238a6e3c
commit 47936df79c
103 changed files with 116 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
View File

@@ -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)

1
android/sdk/src/main/res/values-af/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Beperkte toegang</string>
<string name="not_shared">Privaat</string>
<string name="access_rules_author_only">Aanlyn wysiging</string>
<string name="today">Vandag</string>
</resources>

1
android/sdk/src/main/res/values-ar/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">مسموح الوصول بشكل محدود</string>
<string name="not_shared">خاص</string>
<string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
<string name="today">اليوم</string>
</resources>

1
android/sdk/src/main/res/values-ast/strings.xml
View File

@@ -9,4 +9,5 @@
<string name="km">km</string>
<string name="gb">GB</string>
<string name="m">m</string>
<string name="today">Güei</string>
</resources>

1
android/sdk/src/main/res/values-az/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="limited_access">Məhdud giriş</string>
<string name="not_shared">Gizli</string>
<string name="access_rules_author_only">Onlayn redaktə</string>
<string name="today">Bu gün</string>
</resources>

1
android/sdk/src/main/res/values-be/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Абмежаваны доступ</string>
<string name="not_shared">Прыватны</string>
<string name="access_rules_author_only">Рэдагаванне анлайн</string>
<string name="today">Сёння</string>
</resources>

1
android/sdk/src/main/res/values-bg/strings.xml
View File

@@ -31,4 +31,5 @@
<string name="maps_storage_removable">Карта памет</string>
<string name="maps_storage_external">Външно споделено хранилище</string>
<string name="maps_storage_shared">Вътрешно споделено хранилище</string>
<string name="today">Днес</string>
</resources>

1
android/sdk/src/main/res/values-bn/strings.xml
View File

@@ -10,4 +10,5 @@
<string name="category_wifi">ওয়াইফাই</string>
<string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
<string name="postal_code">ডাক কোড</string>
<string name="today">আজকে</string>
</resources>

1
android/sdk/src/main/res/values-ca/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Edició en línia</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Avui</string>
</resources>

1
android/sdk/src/main/res/values-cs/strings.xml
View File

@@ -31,4 +31,5 @@
<string name="maps_storage_shared">Interní sdílené úložiště</string>
<string name="maps_storage_internal">Interní soukromé úložiště</string>
<string name="maps_storage_external">Externí sdílené úložiště</string>
<string name="today">Dnes</string>
</resources>

1
android/sdk/src/main/res/values-cy/strings.xml
View File

@@ -18,4 +18,5 @@
<string name="public_access">Mynediad cyhoeddus</string>
<string name="limited_access">Mynediad cyfyngedig</string>
<string name="access_rules_author_only">Golygu ar-lein</string>
<string name="today">Heddiw</string>
</resources>

1
android/sdk/src/main/res/values-da/strings.xml
View File

@@ -31,4 +31,5 @@
<string name="maps_storage_shared">Intern delt lagerplads</string>
<string name="maps_storage_removable">SD-kort</string>
<string name="maps_storage_external">Ekstern delt lagerplads</string>
<string name="today">I dag</string>
</resources>

1
android/sdk/src/main/res/values-de/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Online bearbeiten</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">Heute</string>
</resources>

1
android/sdk/src/main/res/values-el/strings.xml
View File

@@ -34,4 +34,5 @@
<string name="access_rules_author_only">Online επεξεργασία</string>
<string name="mb">MB</string>
<string name="mi">μι</string>
<string name="today">Σήμερα</string>
</resources>

1
android/sdk/src/main/res/values-es/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Edición en línea</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Hoy</string>
</resources>

1
android/sdk/src/main/res/values-et/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Võrgupõhine muutmine</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Täna</string>
</resources>

1
android/sdk/src/main/res/values-eu/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Sarean editatzen</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Gaur</string>
</resources>

1
android/sdk/src/main/res/values-fa/strings.xml
View File

@@ -28,4 +28,5 @@
<string name="limited_access">دسترسی محدود</string>
<string name="not_shared">خصوصی</string>
<string name="access_rules_author_only">ویرایش آنلاین</string>
<string name="today">امروز</string>
</resources>

1
android/sdk/src/main/res/values-fi/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Rajoitettu pääsy</string>
<string name="not_shared">Yksityinen</string>
<string name="access_rules_author_only">Nettimuokkaus</string>
<string name="today">Tänään</string>
</resources>

1
android/sdk/src/main/res/values-fr/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Accès limité</string>
<string name="not_shared">Privé</string>
<string name="access_rules_author_only">Édition en ligne</string>
<string name="today">Aujourd\'hui</string>
</resources>

1
android/sdk/src/main/res/values-gl/strings.xml
View File

@@ -22,4 +22,5 @@
<string name="category_wifi">Wifi</string>
<string name="maps_storage_removable">Tarxeta SD</string>
<string name="core_placepage_unknown_place">Punto do mapa</string>
<string name="today">Hoxe</string>
</resources>

1
android/sdk/src/main/res/values-gsw/strings.xml
View File

@@ -22,4 +22,5 @@
<string name="ft">ft</string>
<string name="core_entrance">Iigang</string>
<string name="public_access">Öffentliche Zuegriff</string>
<string name="today">Hüt</string>
</resources>

1
android/sdk/src/main/res/values-hr/strings.xml
View File

@@ -7,4 +7,5 @@
<string name="not_shared">Privatno</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Danas</string>
</resources>

1
android/sdk/src/main/res/values-hu/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Szerkesztés online</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Ma</string>
</resources>

1
android/sdk/src/main/res/values-in/strings.xml
View File

@@ -27,4 +27,5 @@
<string name="limited_access">Akses terbatas</string>
<string name="not_shared">Pribadi</string>
<string name="access_rules_author_only">Pengeditan online</string>
<string name="today">Hari ini</string>
</resources>

1
android/sdk/src/main/res/values-is/strings.xml
View File

@@ -22,4 +22,5 @@
<string name="core_placepage_unknown_place">Punktur á korti</string>
<string name="subway_data_unavailable">Kort fyrir neðanjarðarlest er ekki tiltækt</string>
<string name="access_rules_author_only">Breytingar á netinu</string>
<string name="today">Í dag</string>
</resources>

1
android/sdk/src/main/res/values-it/strings.xml
View File

@@ -30,4 +30,5 @@
<string name="maps_storage_removable">Scheda SD</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Oggi</string>
</resources>

1
android/sdk/src/main/res/values-iw/strings.xml
View File

@@ -33,4 +33,5 @@
<string name="access_rules_author_only">עריכה אונליין</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">היום</string>
</resources>

1
android/sdk/src/main/res/values-ja/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">オンライン編集</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">今日は</string>
</resources>

1
android/sdk/src/main/res/values-ko/strings.xml
View File

@@ -27,4 +27,5 @@
<string name="access_rules_author_only">온라인 수정</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">오늘</string>
</resources>

1
android/sdk/src/main/res/values-lt/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Ribota prieiga</string>
<string name="not_shared">Privatus</string>
<string name="access_rules_author_only">Taisymas internete</string>
<string name="today">Šiandien</string>
</resources>

1
android/sdk/src/main/res/values-lv/strings.xml
View File

@@ -34,4 +34,5 @@
<string name="core_placepage_unknown_place">Punkts kartē</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">Šodien</string>
</resources>

1
android/sdk/src/main/res/values-mr/strings.xml
View File

@@ -25,4 +25,5 @@
<string name="limited_access">मर्यादित प्रवेश</string>
<string name="not_shared">खाजगी</string>
<string name="access_rules_author_only">ऑनलाइन संपादन</string>
<string name="today">आज</string>
</resources>

1
android/sdk/src/main/res/values-mt/strings.xml
View File

@@ -23,4 +23,5 @@
<string name="not_shared">Privat</string>
<string name="access_rules_author_only">Editjar onlajn</string>
<string name="public_access">Aċċess pubbliku</string>
<string name="today">Illum</string>
</resources>

1
android/sdk/src/main/res/values-nb/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="not_shared">Privat</string>
<string name="access_rules_author_only">Redigering på nett</string>
<string name="gb">GB</string>
<string name="today">I dag</string>
</resources>

1
android/sdk/src/main/res/values-nl/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Wordt online bewerkt</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">Vandaag</string>
</resources>

1
android/sdk/src/main/res/values-pl/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Edytowane online</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Dzisiaj</string>
</resources>

1
android/sdk/src/main/res/values-pt-rBR/strings.xml
View File

@@ -35,4 +35,5 @@
<string name="access_rules_author_only">Edição online</string>
<string name="mb">MB</string>
<string name="gb">GB</string>
<string name="today">Hoje</string>
</resources>

1
android/sdk/src/main/res/values-pt/strings.xml
View File

@@ -31,4 +31,5 @@
<string name="gb">GB</string>
<string name="maps_storage_shared">Armazenamento interno partilhado</string>
<string name="maps_storage_removable">Cartão SD</string>
<string name="today">Hoje</string>
</resources>

1
android/sdk/src/main/res/values-ro/strings.xml
View File

@@ -23,4 +23,5 @@
<string name="limited_access">Acces privat</string>
<string name="not_shared">Personal</string>
<string name="access_rules_author_only">Modifică online</string>
<string name="today">Azi</string>
</resources>

1
android/sdk/src/main/res/values-ru/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Ограниченный доступ</string>
<string name="not_shared">Личный</string>
<string name="access_rules_author_only">Редактируется онлайн</string>
<string name="today">Сегодня</string>
</resources>

1
android/sdk/src/main/res/values-sk/strings.xml
View File

@@ -33,4 +33,5 @@
<string name="limited_access">Obmedzený prístup</string>
<string name="not_shared">Súkromné</string>
<string name="access_rules_author_only">Online úprava</string>
<string name="today">Dnes</string>
</resources>

1
android/sdk/src/main/res/values-sr/strings.xml
View File

@@ -34,4 +34,5 @@
<string name="gb">ГБ</string>
<string name="mb">МБ</string>
<string name="core_placepage_unknown_place">Тачка на мапи</string>
<string name="today">Данас</string>
</resources>

1
android/sdk/src/main/res/values-sv/strings.xml
View File

@@ -30,4 +30,5 @@
<string name="maps_storage_internal">Internt, privat lagringsutrymme</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">Idag</string>
</resources>

1
android/sdk/src/main/res/values-th/strings.xml
View File

@@ -28,4 +28,5 @@
<string name="not_shared">ส่วนตัว</string>
<string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
<string name="gb">GB</string>
<string name="today">วันนี้</string>
</resources>

1
android/sdk/src/main/res/values-tr/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="not_shared">Gizli</string>
<string name="access_rules_author_only">Çevrimiçi düzenleme</string>
<string name="gb">GB</string>
<string name="today">Bugün</string>
</resources>

1
android/sdk/src/main/res/values-uk/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">Приватний доступ</string>
<string name="not_shared">Особистий</string>
<string name="access_rules_author_only">Редагується онлайн</string>
<string name="today">Сьогодні</string>
</resources>

1
android/sdk/src/main/res/values-vi/strings.xml
View File

@@ -27,4 +27,5 @@
<string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
<string name="gb">GB</string>
<string name="mb">MB</string>
<string name="today">Hôm nay</string>
</resources>

1
android/sdk/src/main/res/values-zh-rTW/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">不允許進入的私人空間</string>
<string name="not_shared">私人</string>
<string name="access_rules_author_only">線上編輯</string>
<string name="today">今天</string>
</resources>

1
android/sdk/src/main/res/values-zh/strings.xml
View File

@@ -36,4 +36,5 @@
<string name="limited_access">不允许访问的私人空间</string>
<string name="not_shared">私人</string>
<string name="access_rules_author_only">在线编辑</string>
<string name="today">今天</string>
</resources>

9
android/sdk/src/main/res/values/strings.xml
View File

@@ -36,4 +36,13 @@
<string name="limited_access">Limited access</string>
<string name="not_shared">Private</string>
<string name="access_rules_author_only">Online editing</string>
<string name="today">Today</string>
<string name="yesterday">Yesterday</string>
<string name="days_ago">%s days ago</string>
<string name="week_ago">%s week ago</string>
<string name="weeks_ago">%s weeks ago</string>
<string name="month_ago">%s month ago</string>
<string name="months_ago">%s months ago</string>
<string name="year_ago">%s year ago</string>
<string name="years_ago">%s years ago</string>
</resources>