Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix translation for 3.0

Browse source
This commit is contained in:
Victor Shcherb 2018-05-16 23:27:44 +02:00
parent 82256a7e3d
commit 9eedf1d7ce
32 changed files with 32 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-az/strings.xml
View file

@ -1966,8 +1966,6 @@
<string name="empty_state_my_tracks">İzlər əlavə et və qeyd et</string>
<string name="empty_state_my_tracks_desc">Baxmaq üçün izləri qeyd edin və ya idxal edin.</string>
<string name="enter_the_file_name">Fayl adını daxil edin.</string>
<string name="release_3_0">•
\n</string>
<string name="distance_indication_descr">Aktiv işarələrə qədər məsafənin necə göstəriləcəyini seçin.</string>
<string name="tunnel_warning">İrəlidə tunel</string>
<string name="show_guide_line_descr">Mövqeyinizdən aktiv işarə məkanlarına bələdçi xətlərini göstər.</string>

14
OsmAnd/res/values-b+ast/strings.xml
View file

@ -1050,15 +1050,11 @@ Puntos</string>
<string name="additional_actions">Más aiciones</string>
<string name="av_locations_selected_desc">Ficheru GPX con coordenaes y datos de les notes esbillaes.</string>
<string name="av_locations_all_desc">Ficheru GPX con coordenaes y datos de toles notes.</string>
<string name="release_3_0">\\022 Nuevu menú Viaxe : consultar los artículos de WikiVoyage ensin conexón
\n
\n • Wikipedia : nuevu aspeutu, imaxes
\n
\n • Interfazd\'apertura de traces : ver grupos de puntos de ruta
\n
\n • Marcadores del mapa : importar grupos seleicionaos dende ficheros GPX, nuevu aspeutu de la entrada de coordenaes
\n
\n • La suscripción a OsmAnd Live agora incluye toles funciones d\'OsmAnd
<string name="release_3_0">Nuevu menú Viaxe : consultar los artículos de WikiVoyage ensin conexón
\u2022 Wikipedia, Wikivoyage : nuevu aspeutu, imaxes
\u2022 Interfazd\'apertura de traces : ver grupos de puntos de ruta
\u2022 Marcadores del mapa : importar grupos seleicionaos dende ficheros GPX, nuevu aspeutu de la entrada de coordenaes
\u2022 La suscripción a OsmAnd Live agora incluye toles funciones d\'OsmAnd
\n</string>
<string name="modify_the_search_query">Cambiar la consulta de la gueta.</string>
<string name="shared_string_actions">Aiciones</string>

3
OsmAnd/res/values-be-rBY/strings.xml
View file

@ -2918,9 +2918,6 @@ U vypadku, kali vy lubіcie OsmAnd і OSM і chočacie padtrymać jaho, heta іd
<string name="empty_state_av_notes">Rabi natatki!</string>
<string name="empty_state_av_notes_desc">Dadajcie aŭdyjo-, videa- ci fotanatatku na lubuju kropku na mapie, vykarystoŭvajučy vidžet ci kantekstnaje mieniu.</string>
<string name="modify_the_search_query">Źmianicie pošukavy zapyt.</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="what_is_here">Što tut:</string>
<string name="parked_at">pryparkavany na</string>
<string name="pick_up_till">Uziać da</string>

8
OsmAnd/res/values-be/strings.xml
View file

@ -3004,9 +3004,6 @@
<string name="empty_state_av_notes">Рабі нататкі!</string>
<string name="empty_state_av_notes_desc">Дадайце аўдыё-, відэа- ці фотанататку на любую кропку на мапе, выкарыстоўваючы віджэт ці кантэкстнае меню.</string>
<string name="modify_the_search_query">Зьмяніце пошукавы запыт.</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="what_is_here">Што тут:</string>
<string name="parked_at">прыпаркаваны на</string>
<string name="pick_up_till">Узяць да</string>
@ -3014,11 +3011,6 @@
<string name="context_menu_read_full_article">Чытаць увесь артыкул</string>
<string name="context_menu_read_article">Чытаць артыкул</string>
<string name="context_menu_points_of_group">Усе кропкі групы</string>
<string name="additional_actions">Дадатковыя дзеяньні</string>
<string name="av_locations_selected_desc">GPX-файл з каардынатамі і данымі выбраных нататак.</string>
<string name="av_locations_all_desc">GPX-файл з каардынатамі і данымі ўсіх нататак.</string>

2
OsmAnd/res/values-bg/strings.xml
View file

@ -2204,8 +2204,6 @@
<string name="additional_actions">Допълнителни действия</string>
<string name="av_locations_selected_desc">GPX файл с координати и данни от избрани бележки.</string>
<string name="av_locations_all_desc">GPX файл с координати и данни от всички бележки.</string>
<string name="release_3_0">\\022
\n</string>
<string name="modify_the_search_query">Променете заявката за търсене.</string>
<string name="shared_string_actions">Действия</string>
<string name="shared_string_marker">Маркер</string>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -2724,7 +2724,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
<string name="by_date">Per data</string>
<string name="by_type">Per tipus</string>
<string name="modify_the_search_query">Modifica la consulta de cerca.</string>
<string name="release_3_0">\\022 Nou menú Viatge: consulta articles de Viquiviatges sense internet
<string name="release_3_0"> Nou menú Viatge: consulta articles de Viquiviatges sense internet
\n
\n• Viquipèdia: nova imatge, enllaços actius, imatges
\n

3
OsmAnd/res/values-cs/strings.xml
View file

@ -2725,9 +2725,6 @@ Zobrazená oblast: %1$s x %2$s</string>
<string name="empty_state_markers_active_desc">Klepnutím nebo přidržením označte \'Místa\', pak klepněte na tlačítko značky s vlajkou.</string>
<string name="modify_the_search_query">Upravit vyhledávací dotaz.</string>
<string name="one_tap_active">Jedním klepnutím aktivní</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="rendering_attr_hidePOILabels_name">Popisky bodů</string>
<string name="shared_string_without_name">Bez názvu</string>
<string name="what_is_here">Co je zde:</string>

3
OsmAnd/res/values-de/strings.xml
View file

@ -2974,9 +2974,6 @@ Abgedeckte Fläche: %1$s x %2$s</string>
<string name="empty_state_av_notes_desc">Audio-, Video- oder Fotonotizen zu jedem Punkt auf der Karte über Bedienelement oder Kontextmenü hinzufügen.</string>
<string name="notes_by_date">Notizen nach Datum</string>
<string name="tap_on_map_to_hide_interface_descr">Ein Tippen auf die Karte schaltet die Steuerschaltflächen und Bedienelemente um.</string>
<string name="release_3_0">•
\n
\n</string>
<string name="one_tap_active">Mit einem Tippen aktiv</string>
<string name="what_is_here">Was ist hier:</string>
<string name="without_time_limit">Ohne Zeitbegrenzung</string>

2
OsmAnd/res/values-el/strings.xml
View file

@ -1814,7 +1814,7 @@
<string name="additional_actions">Πρόσθετες ενέργειες</string>
<string name="av_locations_selected_desc">Αρχείο GPX με συντεταγμένες και δεδομένα από τις επιλεγμένες σημειώσεις.</string>
<string name="av_locations_all_desc">Αρχείο GPX με συντεταγμένες και δεδομένα από όλες τις σημειώσεις.</string>
<string name="release_3_0">\\022 Νέο ταξιδιωτικό μενού: προβολή άρθρων βικιταξίδια χωρίς χρήση διαδικτύου
<string name="release_3_0">Νέο ταξιδιωτικό μενού: προβολή άρθρων βικιταξίδια χωρίς χρήση διαδικτύου
\n
\n • Βικιπαίδεια: νέα όψη, ενεργοί σύνδεσμοι, εικόνες
\n

3
OsmAnd/res/values-eu/strings.xml
View file

@ -2945,9 +2945,6 @@ Area honi dagokio: %1$s x %2$s</string>
<string name="shared_string_without_name">Izenik gabe</string>
<string name="av_locations_selected_desc">Hautatutako oharren koordenatuak eta datuak dituen GPX fitxategia.</string>
<string name="av_locations_all_desc">Ohar guztien koordenatuak eta datuak dituen GPX fitxategia.</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="modify_the_search_query">Aldatu bilaketaren galdera.</string>
<string name="shared_string_actions">Ekintzak</string>
<string name="shared_string_marker">Markatzailea</string>

2
OsmAnd/res/values-fr/strings.xml
View file

@ -3038,7 +3038,7 @@ représentant la zone : %1$s x %2$s</string>
<string name="by_date">Par date</string>
<string name="by_type">Par type</string>
<string name="modify_the_search_query">Modifier la recherche.</string>
<string name="release_3_0">\\022 Nouveau Menu Voyage : consulter les articles WikiVoyage hors connexion
<string name="release_3_0">Nouveau Menu Voyage : consulter les articles WikiVoyage hors connexion
\n
\n • Wikipedia : nouvelle apparence, images
\n

2
OsmAnd/res/values-he/strings.xml
View file

@ -2536,7 +2536,7 @@
<string name="animate_my_location_desc">הפעלת הנפשת גלישת מפה של ה‚מיקום שלי’ במהלך ניווט.</string>
<string name="shared_string_in_name">ב־%1$s</string>
<string name="one_tap_active_descr">ניתן לגעת בסמן על המפה כדי להעביר אותו לראש הסמנים הפעילים מבלי לפתוח את תפריט ההקשר.</string>
<string name="release_3_0">\\022 תפריט טיולים חדש: הצגת ערכים מוויקימסע ללא שימוש באינטרנט
<string name="release_3_0">תפריט טיולים חדש: הצגת ערכים מוויקימסע ללא שימוש באינטרנט
\n
\n • ויקיפדיה: מראה חדש, קישורים פעילים, תמונות
\n

3
OsmAnd/res/values-hu/strings.xml
View file

@ -2882,9 +2882,6 @@ Kérlek adj meg egy teljes kódot</string>
<string name="additional_actions">További műveletek</string>
<string name="av_locations_selected_desc">GPX fájl a kijelölt megjegyzések koordinátáival és adataival.</string>
<string name="av_locations_all_desc">GPX fájl az összes megjegyzés koordinátáival és adataival.</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="modify_the_search_query">Keresési kifejezés módosítása.</string>
<string name="shared_string_actions">Műveletek</string>
<string name="shared_string_marker">Jelölő</string>

3
OsmAnd/res/values-hy/strings.xml
View file

@ -2632,8 +2632,7 @@
<string name="additional_actions">Լրացուցիչ գործողություններ</string>
<string name="av_locations_selected_desc">GPX ֆայլը կոորդինատներով և ընտրված գրառումների տվյալներով:</string>
<string name="av_locations_all_desc">GPX ֆայլը կոորդինատներով և բոլոր նշումների տվյալները։</string>
<string name="release_3_0">\\022
\n
<string name="release_3_0">
\nՆոր Ճամփորդության մենյու. Դիտեք WikiVoyage- ի հոդվածները առանց ինտերնետի օգտագործման
\n
\n • Wikipedia՝ նոր տեսք, ակտիվ հղումներ, պատկերներ

2
OsmAnd/res/values-id/strings.xml
View file

@ -73,7 +73,7 @@
<string name="osm_live_ask_for_purchase">Harap beli berlangganan OSM Live terlebih dahulu</string>
<string name="sort_by">Urutkan dengan</string>
<string name="release_3_0">\\022 mendeteksi tanda Berhenti sekarang dan beranggapan itu arah mengemudi.
<string name="release_3_0"> mendeteksi tanda Berhenti sekarang dan beranggapan itu arah mengemudi.
\n
\n• algoritma baru memberikan nilai pendakian/turunan yang bermakna trek GPX.
\n

2
OsmAnd/res/values-is/strings.xml
View file

@ -2567,7 +2567,7 @@ Stendur fyrir svæði: %1$s x %2$s</string>
<string name="non_optimal_route_calculation">Reikna leiðir yfir langar fjarlægðir sem hugsanlega eru ekki þær bestu</string>
<string name="av_locations_selected_desc">GPX-skrá með hnitum og gögnum valinna minnispunkta.</string>
<string name="av_locations_all_desc">GPX-skrá með hnitum og gögnum allra minnispunkta.</string>
<string name="release_3_0">\\022 Ný ferðavalmynd: skoða WikiVoyage-greinar án internet-tengingar
<string name="release_3_0">Ný ferðavalmynd: skoða WikiVoyage-greinar án internet-tengingar
\n
\n • Wikipedia: nýtt útlit, virkir tenglar, myndir
\n

3
OsmAnd/res/values-it/strings.xml
View file

@ -2980,9 +2980,6 @@ Rappresenta l\'area: %1$s x %2$s</string>
<string name="notes_by_date">Note ordinate per data</string>
<string name="by_date">Per data</string>
<string name="by_type">Per tipo</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="modify_the_search_query">Modifica la richiesta di ricerca.</string>
<string name="osmand_extended_description_part6">Pedone, escursionismo, visita della città • La mappa mostra i percorsi pedonali ed escursionistici • Wikipedia nel tuo linguaggio preferito può dirti molto nelle visite alle città • Fermate dei trasporti pubblici (bus, tram, treni), inclusi i nomi delle linee, aiuta a navigare in una nuova città • Nella navigazione GPS nella modalità pedone costruisce il tuo percorso usando i sentieri • Puoi caricare e seguire un percorso GPX o registrarne uno e condividerlo</string>
<string name="what_is_here">Cosa c\'è qui:</string>

3
OsmAnd/res/values-ku/strings.xml
View file

@ -141,9 +141,6 @@
<string name="north_abbreviation">Bk</string>
<string name="all_data">Hemû daneyan</string>
<string name="context_menu_read_article">"Gotarê bixwîne "</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="shared_string_deleted">Jêbirî</string>
<string name="shared_string_edited">"Guhertî "</string>
<string name="shared_string_more_without_dots">Bêhtir</string>

2
OsmAnd/res/values-lt/strings.xml
View file

@ -2801,7 +2801,7 @@ Tai yra puikus būdas paremti OsmAnd ir OSM, jei jie jums patinka.</string>
<string name="additional_actions">Papildomi veiksmai</string>
<string name="av_locations_selected_desc">GPX failas su koordinačių ir pasirinktų pastabų duomenimis.</string>
<string name="av_locations_all_desc">GPX failas su koordinačių ir visų pastabų duomenimis.</string>
<string name="release_3_0">\\022 Stop ženklo nutatymas atliekamas atsižvelgiant į judėjimo kryptį
<string name="release_3_0">Stop ženklo nutatymas atliekamas atsižvelgiant į judėjimo kryptį
\n
\n• Naujas algoritmas, pateikiantis prasmingas pakilimo/nusileidimo vertes GPX trekams
\n

3
OsmAnd/res/values-nb/strings.xml
View file

@ -2604,9 +2604,6 @@
<string name="distance_indication_descr">Velg hvordan avstanden til aktive markører skal vises.</string>
<string name="active_markers_descr">Velg antall aktive markører som skal vises.</string>
<string name="tap_on_map_to_hide_interface_descr">Et trykk på kartet skjuler/viser kontrollknappene og miniprogrammene.</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="mark_passed">Marker som passert</string>
<string name="osn_modify_dialog_error">Kunne ikke endre notatet</string>
<string name="quick_action_auto_zoom_desc">Trykking på denne handlingsknappen slår av/på automatisk kartforstørrelse i henhold til hastigheten din.</string>

3
OsmAnd/res/values-pl/strings.xml
View file

@ -2922,9 +2922,6 @@ Reprezentuje obszar: %1$s x %2$s</string>
<string name="will_open_at">Zostanie otwarty o</string>
<string name="will_open_on">Zostanie otwarty o</string>
<string name="additional_actions">Dodatkowe czynności</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="shared_string_actions">Czynności</string>
<string name="shared_string_marker">Znacznik</string>
<string name="marker_activated">Uaktywniono znacznik %s.</string>

1
OsmAnd/res/values-ro/strings.xml
View file

@ -1912,7 +1912,6 @@
<string name="additional_actions">Acțiuni adiționale</string>
<string name="av_locations_selected_desc">Fișier GPX cu datele și coordonatele notelor selectate.</string>
<string name="av_locations_all_desc">Fișier GPX cu datele și coordonatele tuturor notelor.</string>
<string name="release_3_0">\\022</string>
<string name="modify_the_search_query">Modifică criteriul de căutare.</string>
<string name="shared_string_actions">Acțiuni</string>
<string name="shared_string_marker">Marcaj</string>

2
OsmAnd/res/values-sc/strings.xml
View file

@ -3017,7 +3017,7 @@ Pro praghere iscrie su còdighe intreu</string>
<string name="by_date">Pro data</string>
<string name="by_type">Pro casta</string>
<string name="modify_the_search_query">Modìfica sa rechesta de chirca.</string>
<string name="release_3_0">\\022 Menù de biàgiu nou: abbàida sos artìculos de WikiVoyage chene impreare sa connessione a ìnternet
<string name="release_3_0"> Menù de biàgiu nou: abbàida sos artìculos de WikiVoyage chene impreare sa connessione a ìnternet
\n
\n • Wikipedia: aspetu nou, ligàmenes ativos, immàgines
\n

2
OsmAnd/res/values-sk/strings.xml
View file

@ -2859,7 +2859,7 @@ Zodpovedá oblasti: %1$s x %2$s</string>
<string name="by_type">Podľa typu</string>
<string name="one_tap_active">Jedno stlačenie aktívne</string>
<string name="modify_the_search_query">Upraviť vyhľadávacie kritériá.</string>
<string name="release_3_0">\\022 Nové menu Cestovanie: zobrazte si články WikiVoyage bez použitia Internetu
<string name="release_3_0"> Nové menu Cestovanie: zobrazte si články WikiVoyage bez použitia Internetu
\n
\n • Wikipédia: nový vzhľad, aktívne linky, obrázky
\n

3
OsmAnd/res/values-sl/strings.xml
View file

@ -2924,9 +2924,6 @@ Koda predstavlja območje: %1$s x %2$s</string>
\n • Orodje za merjenje razdalje sedaj omogoča prilagajanje potem in shranjevanje točk kot sledi
\n
\n • OsmAnd Live: razrešeni hrošči in posodobitve, ki so samodejno vključene v navigacijo, se objavljajo vsakih 30 minut
\n</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="empty_state_osm_edits_descr">Ustvari ali spremeni točke POI, ureja opombe OSM in omogoča objavljanje zabeleženih sledi GPX.</string>
<string name="coordinate_input_accuracy_description">Samodejno preklopi na naslednje polje, ko je vpisana %1$d decimalka.</string>

2
OsmAnd/res/values-sr/strings.xml
View file

@ -1749,7 +1749,7 @@
<string name="first_intermediate_dest_description">Додаје прво стајање</string>
<string name="switch_osm_notes_visibility_desc">Прикажи/Сакриј ОСМ белешке на карти.</string>
<string name="gpx_file">GPX фајл</string>
<string name="release_3_0">\\022 Нови турустички мени: гледајте WikiVoyage чланке без коришћења интернета
<string name="release_3_0">Нови турустички мени: гледајте WikiVoyage чланке без коришћења интернета
\n
\n • Википедија: нови изглед, активне везе, слике
\n

3
OsmAnd/res/values-sv/strings.xml
View file

@ -2729,9 +2729,6 @@ Vänligen tillhandahåll fullständig kod</string>
<string name="additional_actions">Ytterligare åtgärder</string>
<string name="av_locations_selected_desc">GPX-fil med koordinater och data för valda anteckningar.</string>
<string name="av_locations_all_desc">GPX-fil med koordinater och data för alla anteckningar.</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="shared_string_actions">Åtgärder</string>
<string name="shared_string_marker">Markör</string>
<string name="one_tap_active_descr">Tryck på en markör på kartan för att flytta den till toppen av de aktiva markörerna utan att öppna sammanhangsmenyn.</string>

1
OsmAnd/res/values-uk/strings.xml
View file

@ -3095,7 +3095,6 @@
<string name="by_date">За датою</string>
<string name="by_type">За типом</string>
<string name="modify_the_search_query">Змінити пошуковий запит.</string>
<string name="release_3_0">"• "</string>
<string name="what_is_here">Що тут:</string>
<string name="parked_at">припаркований біля</string>
<string name="pick_up_till">Забрати до</string>

3
OsmAnd/res/values-zh-rCN/strings.xml
View file

@ -2668,9 +2668,6 @@
<string name="additional_actions">额外的活动</string>
<string name="av_locations_selected_desc">GPX文件，包含所选笔记的坐标和数据。</string>
<string name="av_locations_all_desc">GPX文件，包含所有注释的坐标和数据。</string>
<string name="release_3_0">\\022
\n
\n</string>
<string name="modify_the_search_query">修改搜索查询。</string>
<string name="shared_string_actions">操作</string>
<string name="shared_string_marker">标记</string>

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -3019,7 +3019,7 @@
<string name="by_type">按照類型</string>
<string name="one_tap_active_descr">輕點在地圖上的標記，將其移動到活動標記的頂端，而不用打開內容選單。</string>
<string name="modify_the_search_query">變更搜尋的查詢。</string>
<string name="release_3_0">\\022 新的旅行選單：檢視不用網路的維基導遊文章
<string name="release_3_0">新的旅行選單：檢視不用網路的維基導遊文章
\n
\n• 維基百科：嶄新的面貌、活動連結、圖片
\n

20
OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
View file

@ -61,7 +61,7 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
private static final String EMPTY_URL = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d4//";
private long cityId = NO_VALUE;
private long tripId = NO_VALUE;
private ArrayList<String> langs;
private String selectedLang;
private TravelArticle article;
@ -187,10 +187,10 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
updateWebSettings();
populateArticle();
} else if (requestCode == WikivoyageArticleNavigationFragment.OPEN_ARTICLE_REQUEST_CODE) {
long cityId = data.getLongExtra(WikivoyageArticleNavigationFragment.CITY_ID_KEY, -1);
long tripId = data.getLongExtra(WikivoyageArticleNavigationFragment.TRIP_ID_KEY, -1);
String selectedLang = data.getStringExtra(WikivoyageArticleNavigationFragment.SELECTED_LANG_KEY);
if (cityId != -1 && !TextUtils.isEmpty(selectedLang)) {
this.cityId = cityId;
if (tripId != -1 && !TextUtils.isEmpty(selectedLang)) {
this.tripId = tripId;
this.selectedLang = selectedLang;
populateArticle();
}
@ -275,26 +275,26 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
}
protected void populateArticle() {
if (cityId == NO_VALUE || langs == null) {
if (tripId == NO_VALUE || langs == null) {
Bundle args = getArguments();
if (args != null) {
cityId = args.getLong(CITY_ID_KEY);
tripId = args.getLong(CITY_ID_KEY);
langs = args.getStringArrayList(LANGS_KEY);
}
}
if (cityId == NO_VALUE || langs == null || langs.isEmpty()) {
if (tripId == NO_VALUE || langs == null || langs.isEmpty()) {
return;
}
if (selectedLang == null) {
selectedLang = langs.get(0);
}
articleToolbarText.setText("");
article = getMyApplication().getTravelDbHelper().getArticle(cityId, selectedLang);
article = getMyApplication().getTravelDbHelper().getArticle(tripId, selectedLang);
if (article == null) {
return;
}
articleToolbarText.setText(article.getTitle());
if (article.getGpxFile() != null) {
if (article.getGpxFile() != null && article.getGpxFile().getPointsSize() > 0) {
trackButton.setText(getString(R.string.points) + " (" + article.getGpxFile().getPointsSize() + ")");
webViewClient.setArticle(article);
}
@ -401,7 +401,7 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
return;
}
WikivoyageArticleNavigationFragment.showInstance(fm,
WikivoyageArticleDialogFragment.this, cityId, selectedLang);
WikivoyageArticleDialogFragment.this, tripId, selectedLang);
}
}

10
OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleNavigationFragment.java
View file

@ -36,7 +36,7 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
public static final String TAG = WikivoyageArticleNavigationFragment.class.getSimpleName();
public static final String CITY_ID_KEY = "city_id_key";
public static final String TRIP_ID_KEY = "trip_id_key";
public static final String SELECTED_LANG_KEY = "selected_lang_key";
public static final int OPEN_ARTICLE_REQUEST_CODE = 2;
@ -59,12 +59,12 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
if (savedInstanceState != null) {
selectedLang = savedInstanceState.getString(SELECTED_LANG_KEY);
cityId = savedInstanceState.getLong(CITY_ID_KEY);
cityId = savedInstanceState.getLong(TRIP_ID_KEY);
} else {
Bundle args = getArguments();
if (args != null) {
selectedLang = args.getString(SELECTED_LANG_KEY);
cityId = args.getLong(CITY_ID_KEY);
cityId = args.getLong(TRIP_ID_KEY);
}
}
@ -132,7 +132,7 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putLong(CITY_ID_KEY, cityId);
outState.putLong(TRIP_ID_KEY, cityId);
outState.putString(SELECTED_LANG_KEY, selectedLang);
}
@ -156,7 +156,7 @@ public class WikivoyageArticleNavigationFragment extends MenuBottomSheetDialogFr
@NonNull String selectedLang) {
try {
Bundle args = new Bundle();
args.putLong(CITY_ID_KEY, cityId);
args.putLong(TRIP_ID_KEY, cityId);
args.putString(SELECTED_LANG_KEY, selectedLang);
WikivoyageArticleNavigationFragment fragment = new WikivoyageArticleNavigationFragment();
if (targetFragment != null) {