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

Reverted wifi string key

Browse source
This commit is contained in:
r.kuznetsov 2018-02-21 14:16:11 +03:00 • committed by Arsentiy Milchakov
parent 1988757fb2
commit 64a346a646
6 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/res/layout/fragment_editor.xml
View file

@ -257,7 +257,7 @@
android:layout_marginStart="@dimen/editor_margin_left"
android:layout_toLeftOf="@+id/sw__wifi"
android:layout_toStartOf="@+id/sw__wifi"
android:text="@string/core_wifi"/>
android:text="@string/wifi"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/sw__wifi"

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

@ -274,7 +274,7 @@ public class MwmApplication extends Application
nativeAddLocalization("core_my_places", getString(R.string.core_my_places));
nativeAddLocalization("core_my_position", getString(R.string.core_my_position));
nativeAddLocalization("core_placepage_unknown_place", getString(R.string.core_placepage_unknown_place));
nativeAddLocalization("core_wifi", getString(R.string.core_wifi));
nativeAddLocalization("wifi", getString(R.string.wifi));
}
public void initCrashlytics()

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

@ -70,7 +70,7 @@ void InitLocalizedStrings()
f.AddString("core_my_places", L(@"core_my_places").UTF8String);
f.AddString("core_my_position", L(@"core_my_position").UTF8String);
f.AddString("core_placepage_unknown_place", L(@"core_placepage_unknown_place").UTF8String);
f.AddString("core_wifi", L(@"core_wifi").UTF8String);
f.AddString("wifi", L(@"wifi").UTF8String);
}
void InitCrashTrackers()

2
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -529,7 +529,7 @@ void registerCellsForTableView(vector<MWMEditorCellType> const & cells, UITableV
// TODO(Vlad, IgorTomko): Support all other possible Internet statuses.
[tCell configWithDelegate:self
icon:[UIImage imageNamed:@"ic_placepage_wifi"]
text:L(@"core_wifi")
text:L(@"wifi")
on:m_mapObject.GetInternet() == osm::Internet::Wlan];
break;
}

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm
View file

@ -73,7 +73,7 @@
break;
case MetainfoRows::Internet:
self.toggleImage.hidden = YES;
name = @"core_wifi";
name = @"wifi";
break;
case MetainfoRows::Coordinate:
self.toggleImage.hidden = NO;

5
map/framework.cpp
View file

@ -397,7 +397,8 @@ Framework::Framework(FrameworkParams const & params)
m_stringsBundle.SetDefaultString("core_placepage_unknown_place", "Unknown Place");
m_stringsBundle.SetDefaultString("core_my_places", "My Places");
m_stringsBundle.SetDefaultString("core_my_position", "My Position");
m_stringsBundle.SetDefaultString("core_wifi", "WiFi");
// Wi-Fi string is used in categories that's why does not have core_ prefix
m_stringsBundle.SetDefaultString("wifi", "WiFi");
m_model.InitClassificator();
m_model.SetOnMapDeregisteredCallback(bind(&Framework::OnMapDeregistered, this, _1));
@ -803,7 +804,7 @@ void Framework::FillInfoFromFeatureType(FeatureType const & ft, place_page::Info
feature::TypesHolder buildingHolder;
buildingHolder.Assign(classif().GetTypeByPath({"building"}));
info.SetLocalizedWifiString(m_stringsBundle.GetString("core_wifi"));
info.SetLocalizedWifiString(m_stringsBundle.GetString("wifi"));
if (ftypes::IsAddressObjectChecker::Instance()(ft))
info.SetAddress(GetAddressInfoAtPoint(feature::GetCenter(ft)).FormatHouseAndStreet());