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

Merge branch 'master' of github.com:osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2015-06-15 01:30:47 +02:00
commit d53e1be14b
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2018,6 +2018,6 @@ Per retornar a l\'estil habitual dels mapes d\'OsmAnd, només cal desactivar aqu
<string name="disable_recording_once_app_killed_descrp">L\'enregistrament en format GPX s\'aturarà quan ho faci OsmAnd (via les aplicacions recents). (La indicació de procés de fons de l\'OsmAnd desapareixerà de la barra de notificacions d\'Android).</string>
<string name="shared_string_import2osmand">Importació a OsmAnd</string>
<string name="local_recordings_delete_all_confirm">Sou a punt d\'esborrar %1$d notes. N\'esteu segur?</string>
<string name="archive_wikipedia_data">Teniu dades baixades de viquipèdia antigues i incompatibles. Les voleu desar?</string>
<string name="archive_wikipedia_data">Teniu dades baixades de Viquipèdia, antigues i incompatibles. Les voleu desar?</string>
<string name="download_wikipedia_files">Voleu baixar dades addicionals de Viquipèdia (%1$s MB) ?</string>
</resources>

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

@ -2033,4 +2033,6 @@
<string name="disable_recording_once_app_killed">Forhindre uafhængig logning</string>
<string name="disable_recording_once_app_killed_descrp">Hvis markeret vil GPX logning blive pauset, når programmet afsluttes (via seneste programmer). OsmAnd dvaletilstandsmeddelse vil fosvinde fra notifikationslinien.</string>
<string name="gps_network_not_enabled">Placeringtjenesten er ikke aktiveret. Aktiver?</string>
<string name="archive_wikipedia_data">Der er gamle uforenelige wikipedia data hentet. Skal de arkiveres?</string>
<string name="download_wikipedia_files">Hent yderligere Wikipedia data (%1$s MB)?</string>
</resources>

4
OsmAnd/src/net/osmand/plus/views/POIMapLayer.java
View file

@ -401,10 +401,6 @@ public class POIMapLayer extends OsmandMapLayer implements ContextMenuLayer.ICon
@Override
public void onClick(View v) {
String article = "http://"+langSelected.toLowerCase()+".wikipedia.org/wiki/" + title.replace(' ', '_');
// If Default language, use EN for the URL, unless we find a better way to determine what the articles default language is
if(langSelected.equals("")) {
article = "http://en.wikipedia.org/wiki/" + title.replace(' ', '_');
}
Intent i = new Intent(Intent.ACTION_VIEW);
i.setData(Uri.parse(article));
ctx.startActivity(i);