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

[strings] [ios] move types from Localizable to LocalizableTypes

Browse source 
1. add separate `LocalizableTypes.strings` file for the types
2. patch the `GetLocalizedTypeName` cpp function to fetch the value from the proper table

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2025-03-03 12:12:48 +04:00 • committed by Roman Tsisyk
parent ac1cbbfa2a
commit 173b7e4515
46 changed files with 143 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

1
iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings Normal file
View file

@ -0,0 +1 @@

98
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -519,6 +519,7 @@
ED810EC52D566E9B00ECDE2C /* SearchOnMapTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED810EC42D566E9B00ECDE2C /* SearchOnMapTests.swift */; };
ED8270F02C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */; };
ED83880F2D54DEB3002A0536 /* UIImage+FilledWithColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */; };
ED8A91E02D759B50009E063B /* LocalizableTypes.strings in Resources */ = {isa = PBXBuildFile; fileRef = ED8A91DE2D759B50009E063B /* LocalizableTypes.strings */; };
ED914AB22D35063A00973C45 /* TextColorStyleSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED914AB12D35063A00973C45 /* TextColorStyleSheet.swift */; };
ED914AB82D351DF000973C45 /* StyleApplicable.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED914AB72D351DF000973C45 /* StyleApplicable.swift */; };
ED914ABE2D351FF800973C45 /* UILabel+SetFontStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = ED914ABD2D351FF800973C45 /* UILabel+SetFontStyle.swift */; };
@ -1485,6 +1486,50 @@
ED810EC42D566E9B00ECDE2C /* SearchOnMapTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchOnMapTests.swift; sourceTree = "<group>"; };
ED8270EF2C2071A3005966DA /* SettingsTableViewDetailedSwitchCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsTableViewDetailedSwitchCell.swift; sourceTree = "<group>"; };
ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+FilledWithColor.swift"; sourceTree = "<group>"; };
ED8A91DF2D759B50009E063B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E32D759B59009E063B /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E42D759B61009E063B /* az */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = az; path = az.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E52D759B6C009E063B /* eu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = eu; path = eu.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E62D759B6D009E063B /* be */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = be; path = be.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E72D759B6F009E063B /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E82D759B70009E063B /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91E92D759B71009E063B /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LocalizableTypes.strings"; sourceTree = "<group>"; };
ED8A91EA2D759B72009E063B /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/LocalizableTypes.strings"; sourceTree = "<group>"; };
ED8A91EB2D759B73009E063B /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91EC2D759B74009E063B /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91ED2D759B75009E063B /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91EE2D759B76009E063B /* en-GB */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-GB"; path = "en-GB.lproj/LocalizableTypes.strings"; sourceTree = "<group>"; };
ED8A91EF2D759B79009E063B /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = et.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F02D759B7A009E063B /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F12D759B7C009E063B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F22D759B7D009E063B /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F32D759B7E009E063B /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F42D759B80009E063B /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F52D759B81009E063B /* hi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hi; path = hi.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F62D759B83009E063B /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F72D759B84009E063B /* id */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = id; path = id.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F82D759B86009E063B /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91F92D759B88009E063B /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91FA2D759B89009E063B /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91FB2D759B8A009E063B /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91FC2D759B8B009E063B /* mr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = mr; path = mr.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91FD2D759B8C009E063B /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91FE2D759B94009E063B /* fa */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fa; path = fa.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A91FF2D759B95009E063B /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92002D759B98009E063B /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92012D759B99009E063B /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/LocalizableTypes.strings"; sourceTree = "<group>"; };
ED8A92022D759B9A009E063B /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92032D759B9C009E063B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92042D759B9E009E063B /* sr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sr; path = sr.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92052D759B9F009E063B /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92062D759BA1009E063B /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92072D759BA2009E063B /* es-MX */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "es-MX"; path = "es-MX.lproj/LocalizableTypes.strings"; sourceTree = "<group>"; };
ED8A92082D759BA3009E063B /* sw */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sw; path = sw.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A92092D759BA4009E063B /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A920A2D759BA8009E063B /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A920B2D759BA9009E063B /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A920C2D759BA9009E063B /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED8A920D2D759BAA009E063B /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/LocalizableTypes.strings; sourceTree = "<group>"; };
ED914AB12D35063A00973C45 /* TextColorStyleSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextColorStyleSheet.swift; sourceTree = "<group>"; };
ED914AB72D351DF000973C45 /* StyleApplicable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StyleApplicable.swift; sourceTree = "<group>"; };
ED914ABD2D351FF800973C45 /* UILabel+SetFontStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UILabel+SetFontStyle.swift"; sourceTree = "<group>"; };
@ -2639,6 +2684,7 @@
34F73F5F1E082FF700AC1FD6 /* InfoPlist.strings */,
34F73F611E082FF800AC1FD6 /* Localizable.strings */,
A630D1E8207CA95900976DEA /* Localizable.stringsdict */,
ED8A91DE2D759B50009E063B /* LocalizableTypes.strings */,
);
path = LocalizedStrings;
sourceTree = "<group>";
@ -4343,6 +4389,7 @@
F6E2FE071E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.xib in Resources */,
F6E2FE0D1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */,
F6E2FE161E097BA00083EBEC /* MWMOpeningHoursTimeSelectorTableViewCell.xib in Resources */,
ED8A91E02D759B50009E063B /* LocalizableTypes.strings in Resources */,
F6E2FE1C1E097BA00083EBEC /* MWMOpeningHoursTimeSpanTableViewCell.xib in Resources */,
F6BD1D241CA412E40047B8E8 /* MWMOsmAuthAlert.xib in Resources */,
F6FE3C3C1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib in Resources */,
@ -5106,6 +5153,57 @@
name = Localizable.stringsdict;
sourceTree = "<group>";
};
ED8A91DE2D759B50009E063B /* LocalizableTypes.strings */ = {
isa = PBXVariantGroup;
children = (
ED8A91DF2D759B50009E063B /* en */,
ED8A91E32D759B59009E063B /* ar */,
ED8A91E42D759B61009E063B /* az */,
ED8A91E52D759B6C009E063B /* eu */,
ED8A91E62D759B6D009E063B /* be */,
ED8A91E72D759B6F009E063B /* bg */,
ED8A91E82D759B70009E063B /* ca */,
ED8A91E92D759B71009E063B /* zh-Hans */,
ED8A91EA2D759B72009E063B /* zh-Hant */,
ED8A91EB2D759B73009E063B /* cs */,
ED8A91EC2D759B74009E063B /* da */,
ED8A91ED2D759B75009E063B /* nl */,
ED8A91EE2D759B76009E063B /* en-GB */,
ED8A91EF2D759B79009E063B /* et */,
ED8A91F02D759B7A009E063B /* fi */,
ED8A91F12D759B7C009E063B /* fr */,
ED8A91F22D759B7D009E063B /* de */,
ED8A91F32D759B7E009E063B /* el */,
ED8A91F42D759B80009E063B /* he */,
ED8A91F52D759B81009E063B /* hi */,
ED8A91F62D759B83009E063B /* hu */,
ED8A91F72D759B84009E063B /* id */,
ED8A91F82D759B86009E063B /* it */,
ED8A91F92D759B88009E063B /* ja */,
ED8A91FA2D759B89009E063B /* ko */,
ED8A91FB2D759B8A009E063B /* lv */,
ED8A91FC2D759B8B009E063B /* mr */,
ED8A91FD2D759B8C009E063B /* nb */,
ED8A91FE2D759B94009E063B /* fa */,
ED8A91FF2D759B95009E063B /* pl */,
ED8A92002D759B98009E063B /* pt */,
ED8A92012D759B99009E063B /* pt-BR */,
ED8A92022D759B9A009E063B /* ro */,
ED8A92032D759B9C009E063B /* ru */,
ED8A92042D759B9E009E063B /* sr */,
ED8A92052D759B9F009E063B /* sk */,
ED8A92062D759BA1009E063B /* es */,
ED8A92072D759BA2009E063B /* es-MX */,
ED8A92082D759BA3009E063B /* sw */,
ED8A92092D759BA4009E063B /* sv */,
ED8A920A2D759BA8009E063B /* th */,
ED8A920B2D759BA9009E063B /* tr */,
ED8A920C2D759BA9009E063B /* uk */,
ED8A920D2D759BAA009E063B /* vi */,
);
name = LocalizableTypes.strings;
sourceTree = "<group>";
};
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */

2
platform/localization.mm
View file

@ -12,7 +12,7 @@ std::string GetLocalizedTypeName(std::string const & type)
std::replace(key.begin(), key.end(), '-', '.');
std::replace(key.begin(), key.end(), ':', '_');
return [NSLocalizedString(@(key.c_str()), @"") UTF8String];
return [NSLocalizedStringFromTableInBundle(@(key.c_str()), @"LocalizableTypes", NSBundle.mainBundle, @"") UTF8String];
}
std::string GetLocalizedBrandName(std::string const & brand)