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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2018-03-01 00:40:17 +01:00
commit 693a8e73af
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
OsmAnd/res/values-ru/phrases.xml
View file

@ -3736,4 +3736,7 @@
<string name="poi_socket">Разъём</string> <string name="poi_socket">Разъём</string>
<string name="poi_flooring">Напольные покрытия</string>
<string name="poi_pottery">Глиняная посуда</string>
</resources> </resources>

3
OsmAnd/res/values/phrases.xml
View file

@ -3756,4 +3756,7 @@
<string name="poi_socket_schuko_output_medium">Medium</string> <string name="poi_socket_schuko_output_medium">Medium</string>
<string name="poi_socket_schuko_output_low">Low</string> <string name="poi_socket_schuko_output_low">Low</string>
<string name="poi_flooring">Flooring store</string>
<string name="poi_pottery">Pottery</string>
</resources> </resources>

3
OsmAnd/src/net/osmand/plus/mapcontextmenu/WikipediaDialogFragment.java
View file

@ -167,8 +167,7 @@ public class WikipediaDialogFragment extends DialogFragment {
if (TextUtils.isEmpty(preferredLanguage)) { if (TextUtils.isEmpty(preferredLanguage)) {
preferredLanguage = getMyApplication().getLanguage(); preferredLanguage = getMyApplication().getLanguage();
} }
final String title = TextUtils.isEmpty(preferredLanguage) ? amenity.getName() : amenity.getName(preferredLanguage);
final String title = TextUtils.isEmpty(preferredLanguage) ? amenity.getName() : amenity.getName(lang);
((TextView) mainView.findViewById(R.id.title_text_view)).setText(title); ((TextView) mainView.findViewById(R.id.title_text_view)).setText(title);
String lng = amenity.getContentLanguage("content", preferredLanguage, "en"); String lng = amenity.getContentLanguage("content", preferredLanguage, "en");