Merge branch 'master' of github.com:osmandapp/Osmand
This commit is contained in:
Victor Shcherb
commit
a99a8db8d9
17 changed files with 148 additions and 24 deletions
|
|
@ -1860,4 +1860,5 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
|
|||
<string name="access_from_map">Accés des el mapa</string>
|
||||
<string name="use_dashboard_btn">Utilitza el tauler</string>
|
||||
<string name="use_drawer_btn">Utilitza el menú</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Especifiqueu el tipus de PDI adient o deixeu-ho buit. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2010,7 +2010,7 @@
|
|||
<string name="favorite_category_dublicate_message">Kategorinavnet findes allerede. Angiv et andet navn.</string>
|
||||
<string name="favorite_category_name">Kategorinavn</string>
|
||||
<string name="favorite_category_add_new_title">Tilføj ny kategori</string>
|
||||
<string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet kort allerede er hentet?</string>
|
||||
<string name="confirm_download_roadmaps">Hent kort kun med veje, selv om et komplet standardkort allerede er hentet?</string>
|
||||
<string name="value_downloaded_from_max">%1$.1f af %2$.1f MB</string>
|
||||
<string name="file_size_in_mb">%.1f MB</string>
|
||||
<string name="update_all">Opdater alle (%1$s MB)</string>
|
||||
|
|
@ -2109,4 +2109,5 @@
|
|||
<string name="use_drawer_btn">Brug menuen</string>
|
||||
<string name="access_from_map_description">Menuknappen viser betjeningspanel, ikke menuen</string>
|
||||
<string name="access_from_map">Adgang fra kort</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Angiv korrekt IP type eller spring over. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="regions">Regionen</string>
|
||||
<string name="region_maps">Regionsweite Karten</string>
|
||||
|
|
@ -2175,7 +2175,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
|
|||
<string name="activate_seamarks_plugin">Bitte das Seezeichen-Plugin aktivieren</string>
|
||||
<string name="activate_srtm_plugin">Bitte das SRTM-Plugin aktivieren</string>
|
||||
<string name="get_full_version">Vollversion</string>
|
||||
<string name="confirm_download_roadmaps">Soll die reine Straßenkarte wirklich heruntergeladen werden, obwohl die vollständige Karte vorhanden ist?</string>
|
||||
<string name="confirm_download_roadmaps">Soll wirklich die reine Straßenkarte heruntergeladen werden, obwohl bereits die vollständige Standardkarte vorhanden ist?</string>
|
||||
<string name="value_downloaded_from_max">%1$.1f von %2$.1f MB</string>
|
||||
<string name="update_all">Alles aktualisieren (%1$s MB)</string>
|
||||
<string name="free_downloads_used">Verbrauchte freie Downloads</string>
|
||||
|
|
|
|||
|
|
@ -1987,4 +1987,5 @@
|
|||
<string name="dashboard_or_drawer_description">Nueva opción para controlar principalmente la aplicación a través del panel de control flexible o un menú estático. Puedes cambiar esto luego, en los ajustes del panel.</string>
|
||||
<string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
|
||||
<string name="access_from_map">Acceso desde el mapa</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1986,4 +1986,5 @@
|
|||
<string name="use_drawer_btn">Usar menú</string>
|
||||
<string name="access_from_map_description">El botón del menú, muestra el panel de control, en lugar del menú</string>
|
||||
<string name="access_from_map">Acceso desde el mapa</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Especifique el tipo de PDI correcto u omítelo. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1388,4 +1388,60 @@
|
|||
<string name="poi_waste_basket_yes">Szemetessel</string>
|
||||
<string name="poi_waste_basket_no">Szemetes nélkül</string>
|
||||
|
||||
<string name="poi_resource_antimony">Antimon</string>
|
||||
<string name="poi_resource_asbestos">Azbeszt</string>
|
||||
<string name="poi_resource_barite">Barit</string>
|
||||
<string name="poi_resource_basalt">Bazalt</string>
|
||||
<string name="poi_resource_bauxite">Bauxit</string>
|
||||
<string name="poi_resource_beryl">Berill</string>
|
||||
<string name="poi_resource_bismuth">Bizmut</string>
|
||||
<string name="poi_resource_cereal">Gabona</string>
|
||||
<string name="poi_resource_chromite">Kromit</string>
|
||||
<string name="poi_resource_clay">Agyag</string>
|
||||
<string name="poi_resource_coal">Szén</string>
|
||||
<string name="poi_resource_copper">Réz</string>
|
||||
<string name="poi_resource_diamond">Gyémánt</string>
|
||||
<string name="poi_resource_dimension_stone">Vágott kő</string>
|
||||
<string name="poi_resource_dolomite">Dolomit</string>
|
||||
<string name="poi_resource_gas">Gáz</string>
|
||||
<string name="poi_resource_gold">Arany</string>
|
||||
<string name="poi_resource_graphite">Grafit</string>
|
||||
<string name="poi_resource_gravel">Kavics</string>
|
||||
<string name="poi_resource_gypsum">Gipsz</string>
|
||||
<string name="poi_resource_iron_ore">Vasérc</string>
|
||||
<string name="poi_resource_lead">Ólom</string>
|
||||
<string name="poi_resource_lignite">Lignit</string>
|
||||
<string name="poi_resource_limestone">Mészkő</string>
|
||||
<string name="poi_resource_marble">Márvány</string>
|
||||
<string name="poi_resource_mercury">Higany</string>
|
||||
<string name="poi_resource_mica">Csillám</string>
|
||||
<string name="poi_resource_mineral_oil">Ásványolaj</string>
|
||||
<string name="poi_resource_nickel">Nikkel</string>
|
||||
<string name="poi_resource_oil">Olaj</string>
|
||||
<string name="poi_resource_opal">Opál</string>
|
||||
<string name="poi_resource_peat">Tőzeg</string>
|
||||
<string name="poi_resource_platinum">Platina</string>
|
||||
<string name="poi_resource_radium">Rádium</string>
|
||||
<string name="poi_resource_ruby">Rubin</string>
|
||||
<string name="poi_resource_rutile">Rutil</string>
|
||||
<string name="poi_resource_salt">Só</string>
|
||||
<string name="poi_resource_sand">Homok</string>
|
||||
<string name="poi_resource_sandstone">Homokkő</string>
|
||||
<string name="poi_resource_silica">Kova</string>
|
||||
<string name="poi_resource_silver">Ezüst</string>
|
||||
<string name="poi_resource_slate_iron_ore_copper">Pala; vasérc; réz</string>
|
||||
<string name="poi_resource_slate">Pala</string>
|
||||
<string name="poi_resource_stone">Kő</string>
|
||||
<string name="poi_resource_tin">Ón</string>
|
||||
<string name="poi_resource_tuff">Tufa</string>
|
||||
<string name="poi_resource_uranium">Uránium</string>
|
||||
<string name="poi_resource_vanadium">Vanádium</string>
|
||||
<string name="poi_resource_water">Víz</string>
|
||||
<string name="poi_resource_zinc">Cink</string>
|
||||
<string name="poi_resource_zircon">Cirkon</string>
|
||||
|
||||
<string name="poi_beach_sand">Part típus: homokos</string>
|
||||
<string name="poi_beach_shingle">Part típus: kavicsos</string>
|
||||
<string name="poi_beach_rocky">Part típus: köves</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="send_files_to_osm">GPX fájl küldése OSM-re?</string>
|
||||
<string name="gpx_visibility_txt">Láthatóság</string>
|
||||
<string name="gpx_tags_txt">Címkék</string>
|
||||
|
|
@ -2025,6 +2026,14 @@
|
|||
<string name="poi_dialog_reopen">Újranyitás</string>
|
||||
<string name="save_poi_without_poi_type_message">Biztosan elmented a POI-t típus nélkül?</string>
|
||||
<string name="poi_context_menu_modify_osm_change">OSM szerkesztés módosítása</string>
|
||||
<string name="release_2_2">" • Új környezetérzékeny felhasználói felület térképre tapintáskor\n\n • Az alkalmazás már közvetlenül a térkép képernyővel indul a Műszerfal helyett\n\n • A Műszerfal kártyái elrejthetőek, testre szabhatóak\n\n • Térkép letöltéséhez elég a világtérkép régióira tapintani\n\n • A POI kereső már sokkal speciálisabb kérdéseket is megért\n\n • Továbbfejlesztett OSM POI szerkesztés\n\n • A térképletöltő felület felépítése és kezelőfelülete át lett dolgozva\n\n és sok egyéb fejlesztés… "</string>
|
||||
<string name="release_2_2">" • Új, környezetérzékeny menü térképre tapintáskor\n\n • Az alkalmazás már közvetlenül a térkép képernyővel indul a műszerfal helyett\n\n • A műszerfal kártyái elrejthetőek, testre szabhatóak\n\n • Kiválasztható, hogy a térkép menü gombja a műszerfalat, vagy az oldalsávot hozza be\n\n • Térkép letöltéséhez elég a világtérkép régióira tapintani\n\n • A POI kereső már sokkal speciálisabb kérdéseket is megért\n\n • Továbbfejlesztett POI és OSM szerkesztési lehetőségek\n\n • A térképletöltő felület felépítése és kezelőfelülete át lett dolgozva\n\n és sok egyéb fejlesztés… "</string>
|
||||
<string name="shared_string_card_was_hidden">Kártya el volt rejtve</string>
|
||||
</resources>
|
||||
<string name="please_specify_poi_type_only_from_list">"Kérlek add meg a helyes POI típust, vagy hagyd ki. "</string>
|
||||
<string name="access_from_map_description">A menü gomb a menü helyett a műszerfalat indítja</string>
|
||||
<string name="access_from_map">Elérés a térképről</string>
|
||||
<string name="copied_to_clipboard">Vágólapra másolva</string>
|
||||
<string name="use_dashboard_btn">Műszerfal használata</string>
|
||||
<string name="use_drawer_btn">Menü használata</string>
|
||||
<string name="dashboard_or_drawer_title">Menü működés meghatározása</string>
|
||||
<string name="dashboard_or_drawer_description">Eldöntheted, hogy az alkalmazást az interaktív műszerfalon, vagy a statikus oldalsáv menün keresztül szeretnéd vezérelni. A működést bármikor módosíthatod a műszerfal beállításokban.</string>
|
||||
</resources>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,4 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
|
||||
<string name="layer_map_appearance">Configureer scherm</string>
|
||||
<string name="show_lanes">Toon rijstroken</string>
|
||||
|
|
@ -2213,13 +2214,13 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="osn_close_dialog_title">Sluit notitie</string>
|
||||
<string name="osn_add_dialog_success">Notitie aangemaakt</string>
|
||||
<string name="osn_add_dialog_error">Er was een probleem: notitie niet aangemaakt</string>
|
||||
<string name="osn_close_dialog_success">Bug is gesloten</string>
|
||||
<string name="osn_close_dialog_success">Notitie is gesloten</string>
|
||||
<string name="osn_close_dialog_error">Er was een probleem: notitie is niet afgesloten</string>
|
||||
<string name="osm_save_offline">Bewaar voor off-line gebruik</string>
|
||||
|
||||
<string name="dashboard_or_drawer_description">U kunt kiezen tussen het dashboard of het uitklapmenu. Via de instellingen kunt u dit altijd wijzigen.</string>
|
||||
<string name="dashboard_or_drawer_description">Kies tussen het flexibele dashboard of een vast menu. Dit is altijd te wijzigen via de dashboard-instellingen.</string>
|
||||
<string name="copied_to_clipboard">Gekopieerd naar klembord</string>
|
||||
<string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer... "</string>
|
||||
<string name="release_2_2">" • Nieuw contextmenu bij het aantikken van plekken op de kaart en op andere schermen\n\n • De kaart wordt direct getoond, tenzij \'Toon dashboard bij starten van de app\' is gekozen\n\n • Kies welke kaarten worden getoond op het dashboard\n\n • Mogelijkheid menu te grbuiken in plaats van het dashboard\n\n • Kaarten downloaden door op de wereldkaart te tikken\n\n • Fijnmaziger zoeken van POI\n\n • Betere bewerkingsmogelijkheden van POI en OSM\n\n • Kaarten downloaden is makkelijker en overzichtelijker\n\n en meer... "</string>
|
||||
<string name="shared_string_commit">Verstuur</string>
|
||||
|
||||
<string name="context_menu_item_delete_waypoint">GPX routepunt wissen?</string>
|
||||
|
|
@ -2234,5 +2235,10 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="save_poi_without_poi_type_message">Deze POI echt bewaren zonder het type aan te geven?</string>
|
||||
<string name="poi_context_menu_modify_osm_change">Verander OSM-wijziging</string>
|
||||
|
||||
<string name="dashboard_or_drawer_title">Nieuw menu</string>
|
||||
</resources>
|
||||
<string name="dashboard_or_drawer_title">Kies tussen dashboard of menu</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Geef een correct type POI of sla dit over "</string>
|
||||
<string name="access_from_map_description">Menu-knop toont dashboard in plaats van menu</string>
|
||||
<string name="access_from_map">Toegang vanaf kaart</string>
|
||||
<string name="use_dashboard_btn">Gebruik dashboard</string>
|
||||
<string name="use_drawer_btn">Gebruik menu</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8" standalone="no"?><resources>
|
||||
|
||||
<string name="poi_context_menu_modify_osm_change">Редактировать POI</string>
|
||||
<string name="osm_edit_reopened_note">Заметка OSM открыта снова</string>
|
||||
<string name="osm_edit_commented_note">К заметке OSM добавлен комментарий</string>
|
||||
<string name="osm_edit_removed_note">Заметка OSM удалена</string>
|
||||
|
|
|
|||
|
|
@ -1930,7 +1930,7 @@
|
|||
<string name="favorite_category_dublicate_message">Su nùmene dislindadu pro sa categoria esistit giai. Pro praghere dislinda-ne unu diferente.</string>
|
||||
<string name="favorite_category_name">Nùmene de sa categoria</string>
|
||||
<string name="favorite_category_add_new_title">Annanghe una categoria noa</string>
|
||||
<string name="confirm_download_roadmaps">Seguru ses de bòlere iscarrigare mapas petzi istadales, fintzas si tenes giai cussas cumpridas?</string>
|
||||
<string name="confirm_download_roadmaps">Seguru ses de bòlere iscarrigare sa mapa cun petzi sas istradas, fintzas si tenes giai cussa cumprida?</string>
|
||||
<string name="value_downloaded_from_max">%1$.1f dae %2$.1f MB</string>
|
||||
<string name="file_size_in_mb">%.1f MB</string>
|
||||
<string name="update_all">Agiorna totu (%1$s MB)</string>
|
||||
|
|
@ -2024,4 +2024,5 @@
|
|||
<string name="access_from_map_description">Su butone de su menù alluet su pannellu de controllu, imbetzes de su menù</string>
|
||||
<string name="access_from_map">Intra dae sa mapa</string>
|
||||
<string name="release_2_2">" • Interfache impitadore noa pro incarcare positziones in sa mapa e in àteros ischermos\n\n • S\'ischermu de sa mapa est como postu come prima cosa a s’allumìngiu de s’aplicatzione, semper chi \'Ammustra pannellu de controllu in s\'allumìngiu\' no siet ischertadu\n\n • Como podes cunfigurare sas impostatziones pro isseberare cales sunt sas ischedas chi diant dèper’èssere ammustradas in su pannellu e comente\n\n • Brinca su pannellu de controllu, si preferis a impreare su menù pro sa gestione de s’aplicatzione\n\n • Pro iscarrigare mapas, sas regiones podent èssere ischertadas deretamente incarchende in sa mapa generale de su mundu\n\n • Sa chirca de PDI como suportat chircas prus dislindadas\n\n • Megioradas sas funtzionalidades de modìficas de PDI e OSM\n\n • Istrutura e s\'interfache de iscarrigamentu datos mapas torrada a fàghere\n\n e àteru... "</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Dislinda sa casta curreta de PDI o brinca custa parte. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1933,4 +1933,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
<string name="access_from_map">Prístup z mapy</string>
|
||||
<string name="use_dashboard_btn">Použiť úvodný panel</string>
|
||||
<string name="use_drawer_btn">Použiť menu</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"Prosím zadajte správny typ POI alebo ho preskočte. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2008,4 +2008,5 @@
|
|||
<string name="poi_dialog_reopen">Öppna igen</string>
|
||||
<string name="shared_string_commit">Skicka in</string>
|
||||
|
||||
<string name="please_specify_poi_type_only_from_list">"Ange rätt POI-typ eller hoppa över det. "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -408,7 +408,7 @@
|
|||
<string name="local_index_items_backuped">%2$d 項中的 %1$d 項已順利停用。</string>
|
||||
<string name="local_index_items_deleted">%2$d 項中的 %1$d 項已順利刪除。</string>
|
||||
<string name="local_index_items_restored">%2$d 項中的 %1$d 項已順利啟動。</string>
|
||||
<string name="local_index_action_do">您即將要 %2$s %1$s 個項目，要繼續嗎？</string>
|
||||
<string name="local_index_action_do">您即將要 %1$s %2$s 個項目，要繼續嗎？</string>
|
||||
<string name="local_index_descr_title">管理地圖檔案</string>
|
||||
<string name="local_index_mi_restore">啟用</string>
|
||||
<string name="local_index_mi_backup">停用</string>
|
||||
|
|
@ -2013,4 +2013,5 @@
|
|||
<string name="access_from_map">從地圖進入</string>
|
||||
<string name="use_dashboard_btn">使用儀表板</string>
|
||||
<string name="use_drawer_btn">使用地圖</string>
|
||||
<string name="please_specify_poi_type_only_from_list">"請指定正確的興趣點類型或跳過它。 "</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -2062,7 +2062,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="later">Later</string>
|
||||
<string name="get_full_version">Full version</string>
|
||||
<string name="downloads">Downloads</string>
|
||||
<string name="confirm_download_roadmaps">Are you sure you want to download map of roads, even though you have full map?</string>
|
||||
<string name="confirm_download_roadmaps">Are you sure you want to download the roads-only map, even though you already have the standard (full) map?</string>
|
||||
<string name="value_downloaded_from_max">%1$.1f from %2$.1f MB</string>
|
||||
<string name="file_size_in_mb">%.1f MB</string>
|
||||
<string name="update_all">Update all (%1$s MB)</string>
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ public class SearchPoiFilterFragment extends OsmAndListFragment implements Searc
|
|||
currentTask.cancel(true);
|
||||
}
|
||||
currentTask = new SearchPoiByNameTask();
|
||||
currentTask.execute(s.toString());
|
||||
currentTask.execute(s.toString().trim());
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ import net.osmand.util.Algorithms;
|
|||
import net.osmand.util.OpeningHoursParser;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class AmenityMenuBuilder extends MenuBuilder {
|
||||
|
|
@ -141,6 +143,12 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
public void buildInternal(View view) {
|
||||
boolean hasWiki = false;
|
||||
MapPoiTypes poiTypes = app.getPoiTypes();
|
||||
String preferredLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
|
||||
if (Algorithms.isEmpty(preferredLang)) {
|
||||
preferredLang = app.getLanguage();
|
||||
}
|
||||
List<AmenityDescription> descriptions = new LinkedList<>();
|
||||
|
||||
for (Map.Entry<String, String> e : amenity.getAdditionalInfo().entrySet()) {
|
||||
int iconId;
|
||||
Drawable icon = null;
|
||||
|
|
@ -156,10 +164,6 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
if (amenity.getType().isWiki()) {
|
||||
if (!hasWiki) {
|
||||
iconId = R.drawable.ic_action_note_dark;
|
||||
String preferredLang = app.getSettings().MAP_PREFERRED_LOCALE.get();
|
||||
if (Algorithms.isEmpty(preferredLang)) {
|
||||
preferredLang = app.getLanguage();
|
||||
}
|
||||
String lng = amenity.getContentSelected("content", preferredLang, "en");
|
||||
if (Algorithms.isEmpty(lng)) {
|
||||
lng = "en";
|
||||
|
|
@ -224,11 +228,43 @@ public class AmenityMenuBuilder extends MenuBuilder {
|
|||
}
|
||||
}
|
||||
|
||||
if (icon != null) {
|
||||
if (isText && iconId == R.drawable.ic_action_note_dark) {
|
||||
descriptions.add(new AmenityDescription(key, textPrefix, vl));
|
||||
} else if (icon != null) {
|
||||
buildRow(view, icon, vl, textPrefix, textColor, isWiki, isText, needLinks);
|
||||
} else {
|
||||
buildRow(view, iconId, vl, textPrefix, textColor, isWiki, isText, needLinks);
|
||||
}
|
||||
}
|
||||
|
||||
String langSuffix = ":" + preferredLang;
|
||||
AmenityDescription descInPrefLang = null;
|
||||
for (AmenityDescription desc : descriptions) {
|
||||
if (desc.key.length() > langSuffix.length()
|
||||
&& desc.key.substring(desc.key.length() - langSuffix.length(), desc.key.length()).equals(langSuffix)) {
|
||||
descInPrefLang = desc;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (descInPrefLang != null) {
|
||||
descriptions.remove(descInPrefLang);
|
||||
descriptions.add(0, descInPrefLang);
|
||||
}
|
||||
|
||||
for (AmenityDescription desc : descriptions) {
|
||||
buildRow(view, R.drawable.ic_action_note_dark, desc.text, desc.textPrefix, 0, false, true, true);
|
||||
}
|
||||
}
|
||||
|
||||
private static class AmenityDescription {
|
||||
private String key;
|
||||
private String textPrefix;
|
||||
private String text;
|
||||
|
||||
public AmenityDescription(String key, String textPrefix, String text) {
|
||||
this.key = key;
|
||||
this.textPrefix = textPrefix;
|
||||
this.text = text;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue