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

[iOS] add localizations to elevation chart

Browse source
This commit is contained in:
Aleksey Belousov 2020-03-31 19:20:27 +03:00 • committed by Vladimir Byko-Ianko
parent 93523e5f13
commit 8b472b79b5
32 changed files with 160 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
iphone/Chart/Chart.xcodeproj/project.pbxproj
View file

@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
47375D9B2420D4DB00FFCC49 /* Chart.h in Headers */ = {isa = PBXBuildFile; fileRef = 47375D992420D4DB00FFCC49 /* Chart.h */; settings = {ATTRIBUTES = (Public, ); }; };
47375E3C2420E94E00FFCC49 /* ChartPresentationData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E392420E94C00FFCC49 /* ChartPresentationData.swift */; };
47375E3E2420E94E00FFCC49 /* ChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E3B2420E94E00FFCC49 /* ChartData.swift */; };
47375E4B2420E97100FFCC49 /* ChartXAxisView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E3F2420E96C00FFCC49 /* ChartXAxisView.swift */; };
@ -19,11 +18,11 @@
47375E512420E97100FFCC49 /* ChartMyPositionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E462420E96F00FFCC49 /* ChartMyPositionView.swift */; };
47375E522420E97100FFCC49 /* ChartYAxisView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E472420E96F00FFCC49 /* ChartYAxisView.swift */; };
47375E542420E97100FFCC49 /* ChartPreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47375E492420E97100FFCC49 /* ChartPreviewView.swift */; };
47D48BD324302FE200FEFB1F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 47D48BD524302FE200FEFB1F /* Localizable.strings */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
47375D962420D4DB00FFCC49 /* Chart.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Chart.framework; sourceTree = BUILT_PRODUCTS_DIR; };
47375D992420D4DB00FFCC49 /* Chart.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Chart.h; sourceTree = "<group>"; };
47375D9A2420D4DB00FFCC49 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
47375E392420E94C00FFCC49 /* ChartPresentationData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPresentationData.swift; sourceTree = "<group>"; };
47375E3B2420E94E00FFCC49 /* ChartData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartData.swift; sourceTree = "<group>"; };
@ -36,6 +35,35 @@
47375E462420E96F00FFCC49 /* ChartMyPositionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartMyPositionView.swift; sourceTree = "<group>"; };
47375E472420E96F00FFCC49 /* ChartYAxisView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartYAxisView.swift; sourceTree = "<group>"; };
47375E492420E97100FFCC49 /* ChartPreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChartPreviewView.swift; sourceTree = "<group>"; };
47D48BD6243030A200FEFB1F /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/Localizable.strings"; sourceTree = "<group>"; };
47D48BD7243030B900FEFB1F /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
47D48BD8243030C300FEFB1F /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = "<group>"; };
47D48BD9243030CB00FEFB1F /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BDA243030DF00FEFB1F /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BDB243030EB00FEFB1F /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BDC243030F300FEFB1F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BDD2430310000FEFB1F /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BDE2430312400FEFB1F /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BDF2430312C00FEFB1F /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE02430313E00FEFB1F /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE1243031A900FEFB1F /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE2243031C700FEFB1F /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE3243031D300FEFB1F /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE4243031DC00FEFB1F /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE5243031EE00FEFB1F /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE6243031F600FEFB1F /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE72430320100FEFB1F /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BE82430320F00FEFB1F /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BEA243032D800FEFB1F /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BEB243032DF00FEFB1F /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BEC243032E700FEFB1F /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BED2430330B00FEFB1F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BEE2430332200FEFB1F /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BEF2430332800FEFB1F /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BF02430333000FEFB1F /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BF12430333900FEFB1F /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BF22430334B00FEFB1F /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/Localizable.strings; sourceTree = "<group>"; };
47D48BF32430335F00FEFB1F /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -70,8 +98,8 @@
children = (
47375DC22420D60200FFCC49 /* ChartData */,
47375DC72420D60300FFCC49 /* Views */,
47375D992420D4DB00FFCC49 /* Chart.h */,
47375D9A2420D4DB00FFCC49 /* Info.plist */,
47D48BD524302FE200FEFB1F /* Localizable.strings */,
);
path = Chart;
sourceTree = "<group>";
@ -116,7 +144,6 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
47375D9B2420D4DB00FFCC49 /* Chart.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -163,6 +190,34 @@
knownRegions = (
en,
Base,
"en-GB",
"zh-Hans",
"zh-Hant",
ar,
cs,
da,
de,
el,
es,
fr,
ja,
fi,
hu,
id,
it,
ko,
nb,
nl,
pl,
pt,
ro,
ru,
tr,
th,
sv,
vi,
sk,
uk,
);
mainGroup = 47375D8C2420D4DB00FFCC49;
productRefGroup = 47375D972420D4DB00FFCC49 /* Products */;
@ -179,6 +234,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
47D48BD324302FE200FEFB1F /* Localizable.strings in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -205,11 +261,51 @@
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
47D48BD524302FE200FEFB1F /* Localizable.strings */ = {
isa = PBXVariantGroup;
children = (
47D48BD6243030A200FEFB1F /* en-GB */,
47D48BD7243030B900FEFB1F /* zh-Hans */,
47D48BD8243030C300FEFB1F /* zh-Hant */,
47D48BD9243030CB00FEFB1F /* ar */,
47D48BDA243030DF00FEFB1F /* cs */,
47D48BDB243030EB00FEFB1F /* da */,
47D48BDC243030F300FEFB1F /* de */,
47D48BDD2430310000FEFB1F /* el */,
47D48BDE2430312400FEFB1F /* es */,
47D48BDF2430312C00FEFB1F /* fr */,
47D48BE02430313E00FEFB1F /* ja */,
47D48BE1243031A900FEFB1F /* fi */,
47D48BE2243031C700FEFB1F /* hu */,
47D48BE3243031D300FEFB1F /* id */,
47D48BE4243031DC00FEFB1F /* it */,
47D48BE5243031EE00FEFB1F /* ko */,
47D48BE6243031F600FEFB1F /* nb */,
47D48BE72430320100FEFB1F /* nl */,
47D48BE82430320F00FEFB1F /* pl */,
47D48BEA243032D800FEFB1F /* pt */,
47D48BEB243032DF00FEFB1F /* ro */,
47D48BEC243032E700FEFB1F /* ru */,
47D48BED2430330B00FEFB1F /* en */,
47D48BEE2430332200FEFB1F /* tr */,
47D48BEF2430332800FEFB1F /* th */,
47D48BF02430333000FEFB1F /* sv */,
47D48BF12430333900FEFB1F /* vi */,
47D48BF22430334B00FEFB1F /* sk */,
47D48BF32430335F00FEFB1F /* uk */,
);
name = Localizable.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
47375D9C2420D4DB00FFCC49 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@ -273,6 +369,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@ -382,6 +479,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

7
iphone/Chart/Chart/Chart.h
View file

@ -1,7 +0,0 @@
#import <Foundation/Foundation.h>
//! Project version number for Chart.
FOUNDATION_EXPORT double ChartVersionNumber;
//! Project version string for Chart.
FOUNDATION_EXPORT const unsigned char ChartVersionString[];

2
iphone/Chart/Chart/ar.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "المسافة";
"you" = "أنت";

2
iphone/Chart/Chart/cs.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Vzdálenost";
"you" = "Vy";

2
iphone/Chart/Chart/da.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Afstand";
"you" = "Du";

2
iphone/Chart/Chart/de.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Entfernung";
"you" = "Sie";

2
iphone/Chart/Chart/el.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distance";
"you" = "Εσείς";

2
iphone/Chart/Chart/en-GB.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distance";
"you" = "You";

2
iphone/Chart/Chart/en.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distance";
"you" = "You";

2
iphone/Chart/Chart/es.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distancia";
"you" = "Usted";

2
iphone/Chart/Chart/fi.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Etäisyys";
"you" = "Sinä";

2
iphone/Chart/Chart/fr.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distance";
"you" = "Vous";

2
iphone/Chart/Chart/hu.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Távolság";
"you" = "Ön";

2
iphone/Chart/Chart/id.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Jarak";
"you" = "Anda";

2
iphone/Chart/Chart/it.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distanza";
"you" = "Voi";

2
iphone/Chart/Chart/ja.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "距離";
"you" = "君";

2
iphone/Chart/Chart/ko.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "거리";
"you" = "당신";

2
iphone/Chart/Chart/nb.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Avstand";
"you" = "Du";

2
iphone/Chart/Chart/nl.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Afstand";
"you" = "Je";

2
iphone/Chart/Chart/pl.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Dystans";
"you" = "Ty";

2
iphone/Chart/Chart/pt.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distância";
"you" = "Você";

2
iphone/Chart/Chart/ro.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Distanță";
"you" = "Tu";

2
iphone/Chart/Chart/ru.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Расстояние";
"you" = "Вы";

2
iphone/Chart/Chart/sk.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Vzdialenosť";
"you" = "Vy";

2
iphone/Chart/Chart/sv.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Avstånd";
"you" = "Du";

2
iphone/Chart/Chart/th.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "ระยะห่าง";
"you" = "คุณ";

2
iphone/Chart/Chart/tr.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Mesafe";
"you" = "Sen";

2
iphone/Chart/Chart/uk.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Відстань";
"you" = "Ви";

2
iphone/Chart/Chart/vi.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "Khoảng cách";
"you" = "Bạn";

2
iphone/Chart/Chart/zh-Hans.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "距离";
"you" = "您";

2
iphone/Chart/Chart/zh-Hant.lproj/Localizable.strings Normal file
View file

@ -0,0 +1,2 @@
"placepage_distance" = "距离";
"you" = "您";

70
iphone/Maps/UI/Settings/MWMNightModeController.mm
View file

@ -1,70 +0,0 @@
#import "MWMNightModeController.h"
#import "MWMSettings.h"
#import "Statistics.h"
#import "SwiftBridge.h"
@interface MWMNightModeController ()
@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * autoSwitch;
@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * on;
@property(weak, nonatomic) IBOutlet SettingsTableViewSelectableCell * off;
@property(weak, nonatomic) SettingsTableViewSelectableCell * selectedCell;
@end
@implementation MWMNightModeController
- (void)viewDidLoad
{
[super viewDidLoad];
self.title = L(@"pref_map_style_title");
SettingsTableViewSelectableCell * selectedCell = nil;
switch ([MWMSettings theme])
{
case MWMThemeVehicleDay: NSAssert(false, @"Invalid case");
case MWMThemeDay: selectedCell = self.off; break;
case MWMThemeVehicleNight: NSAssert(false, @"Invalid case");
case MWMThemeNight: selectedCell = self.on; break;
case MWMThemeAuto: selectedCell = self.autoSwitch; break;
}
selectedCell.accessoryType = UITableViewCellAccessoryCheckmark;
self.selectedCell = selectedCell;
}
- (void)setSelectedCell:(SettingsTableViewSelectableCell *)cell
{
if ([_selectedCell isEqual:cell])
return;
_selectedCell = cell;
NSString * statValue = @"";
if ([cell isEqual:self.on])
{
[MWMSettings setTheme:MWMThemeNight];
statValue = kStatOn;
}
else if ([cell isEqual:self.off])
{
[MWMSettings setTheme:MWMThemeDay];
statValue = kStatOff;
}
else if ([cell isEqual:self.autoSwitch])
{
[MWMSettings setTheme:MWMThemeAuto];
statValue = kStatValue;
}
[Statistics logEvent:kStatNightMode withParameters:@{kStatValue : statValue}];
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
SettingsTableViewSelectableCell * selectedCell = self.selectedCell;
selectedCell.accessoryType = UITableViewCellAccessoryNone;
selectedCell = [tableView cellForRowAtIndexPath:indexPath];
selectedCell.accessoryType = UITableViewCellAccessoryCheckmark;
selectedCell.selected = NO;
self.selectedCell = selectedCell;
[tableView deselectRowAtIndexPath:indexPath animated:YES];
}
@end