pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Pass wifi localization to the core.

Browse source
This commit is contained in:
Alex Zolotarev 2016-02-18 15:41:09 +03:00 • committed by Sergey Yershov
parent 799ff7222a
commit 7bdd5bc1eb
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/src/com/mapswithme/maps/MwmApplication.java
View file

@ -142,6 +142,7 @@ public class MwmApplication extends Application
nativeAddLocalization("my_position", getString(R.string.my_position));
nativeAddLocalization("routes", getString(R.string.routes));
nativeAddLocalization("cancel", getString(R.string.cancel));
nativeAddLocalization("wifi", getString(R.string.wifi));
nativeAddLocalization("routing_failed_unknown_my_position", getString(R.string.routing_failed_unknown_my_position));
nativeAddLocalization("routing_failed_has_no_routing_file", getString(R.string.routing_failed_has_no_routing_file));

1
iphone/Maps/Classes/MapsAppDelegate.mm
View file

@ -77,6 +77,7 @@ void InitLocalizedStrings()
f.AddString("my_places", [L(@"my_places") UTF8String]);
f.AddString("my_position", [L(@"my_position") UTF8String]);
f.AddString("routes", [L(@"routes") UTF8String]);
f.AddString("wifi", L(@"wifi").UTF8String);
f.AddString("routing_failed_unknown_my_position", [L(@"routing_failed_unknown_my_position") UTF8String]);
f.AddString("routing_failed_has_no_routing_file", [L(@"routing_failed_has_no_routing_file") UTF8String]);

3
map/framework.cpp
View file

@ -303,6 +303,7 @@ Framework::Framework()
m_stringsBundle.SetDefaultString("dropped_pin", "Dropped Pin");
m_stringsBundle.SetDefaultString("my_places", "My Places");
m_stringsBundle.SetDefaultString("routes", "Routes");
m_stringsBundle.SetDefaultString("wifi", "WiFi");
m_stringsBundle.SetDefaultString("routing_failed_unknown_my_position", "Current location is undefined. Please specify location to create route.");
m_stringsBundle.SetDefaultString("routing_failed_has_no_routing_file", "Additional data is required to create the route. Download data now?");
@ -602,6 +603,7 @@ void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info)
guard.GetFeatureByIndex(fid.m_index, ft);
info.SetFromFeatureType(ft);
info.m_isEditable = osm::Editor::Instance().GetEditableProperties(ft).IsEditable();
info.m_localizedWifiString = m_stringsBundle.GetString("wifi");
}
void Framework::FillPointInfo(m2::PointD const & mercator, string const & customTitle, place_page::Info & info) const
@ -611,6 +613,7 @@ void Framework::FillPointInfo(m2::PointD const & mercator, string const & custom
{
info.SetFromFeatureType(*feature);
info.m_isEditable = osm::Editor::Instance().GetEditableProperties(*feature).IsEditable();
info.m_localizedWifiString = m_stringsBundle.GetString("WiFi");
}
else
{