From 577dbca22ee13b44c2bceb676f9ac180df1399eb Mon Sep 17 00:00:00 2001 From: Selim Mustafaev Date: Thu, 3 Dec 2020 22:38:43 +0300 Subject: [PATCH] Localization --- AutoCat.xcodeproj/project.pbxproj | 39 ++++++++++- .../xcshareddata/xcschemes/AutoCat.xcscheme | 1 + .../xcschemes/xcschememanagement.plist | 26 ++++---- AutoCat/Base.lproj/InfoPlist.strings | 9 +++ AutoCat/Base.lproj/Localizable.strings | 7 ++ AutoCat/Base.lproj/Main.storyboard | 66 +++++++++---------- AutoCat/Controllers/CheckController.swift | 10 +-- AutoCat/Controllers/SettingsController.swift | 35 +++++----- AutoCat/Models/DateSection.swift | 4 +- AutoCat/ru.lproj/InfoPlist.strings | 34 ++++++++++ AutoCat/ru.lproj/LaunchScreen.strings | 1 + AutoCat/ru.lproj/Localizable.strings | 60 +++++++++++++++++ AutoCat/ru.lproj/Main.strings | 54 +++++++++++++++ 13 files changed, 274 insertions(+), 72 deletions(-) create mode 100644 AutoCat/Base.lproj/InfoPlist.strings create mode 100644 AutoCat/Base.lproj/Localizable.strings create mode 100644 AutoCat/ru.lproj/InfoPlist.strings create mode 100644 AutoCat/ru.lproj/LaunchScreen.strings create mode 100644 AutoCat/ru.lproj/Localizable.strings create mode 100644 AutoCat/ru.lproj/Main.strings diff --git a/AutoCat.xcodeproj/project.pbxproj b/AutoCat.xcodeproj/project.pbxproj index a201847..4a47d83 100644 --- a/AutoCat.xcodeproj/project.pbxproj +++ b/AutoCat.xcodeproj/project.pbxproj @@ -53,6 +53,8 @@ 7A530B7E24017FEE00CBFE6E /* VehicleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A530B7D24017FEE00CBFE6E /* VehicleCell.swift */; }; 7A530B802401803A00CBFE6E /* Vehicle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A530B7F2401803A00CBFE6E /* Vehicle.swift */; }; 7A530B8B240181F500CBFE6E /* RxRealm in Frameworks */ = {isa = PBXBuildFile; productRef = 7A530B8A240181F500CBFE6E /* RxRealm */; }; + 7A61FF8B2575A2CD00D905D5 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7A61FF892575A2CD00D905D5 /* Localizable.strings */; }; + 7A61FF912575A5B300D905D5 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 7A61FF8F2575A5B300D905D5 /* InfoPlist.strings */; }; 7A64AE732469DFB600ABE48E /* DismissAnimationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A64AE6F2469DFB600ABE48E /* DismissAnimationController.swift */; }; 7A64AE742469DFB600ABE48E /* MediaContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A64AE702469DFB600ABE48E /* MediaContentView.swift */; }; 7A64AE752469DFB600ABE48E /* MediaBrowserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A64AE712469DFB600ABE48E /* MediaBrowserViewController.swift */; }; @@ -144,6 +146,12 @@ 7A530B7924001D3300CBFE6E /* CheckController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckController.swift; sourceTree = ""; }; 7A530B7D24017FEE00CBFE6E /* VehicleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VehicleCell.swift; sourceTree = ""; }; 7A530B7F2401803A00CBFE6E /* Vehicle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Vehicle.swift; sourceTree = ""; }; + 7A61FF8325759DE700D905D5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = ""; }; + 7A61FF8A2575A2CD00D905D5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Localizable.strings; sourceTree = ""; }; + 7A61FF8D2575A2F900D905D5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = ""; }; + 7A61FF902575A5B300D905D5 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = ""; }; + 7A61FF932575A5B600D905D5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InfoPlist.strings; sourceTree = ""; }; + 7A61FF962576C16400D905D5 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = ""; }; 7A64AE6B2469DC6900ABE48E /* AutoCat.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AutoCat.entitlements; sourceTree = ""; }; 7A64AE6F2469DFB600ABE48E /* DismissAnimationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DismissAnimationController.swift; sourceTree = ""; }; 7A64AE702469DFB600ABE48E /* MediaContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MediaContentView.swift; sourceTree = ""; }; @@ -270,6 +278,8 @@ 7A11470923FDE7E600B424AF /* Assets.xcassets */, 7A11470B23FDE7E600B424AF /* LaunchScreen.storyboard */, 7A11470E23FDE7E600B424AF /* Info.plist */, + 7A61FF892575A2CD00D905D5 /* Localizable.strings */, + 7A61FF8F2575A5B300D905D5 /* InfoPlist.strings */, ); path = AutoCat; sourceTree = ""; @@ -484,6 +494,7 @@ knownRegions = ( en, Base, + ru, ); mainGroup = 7A1146F423FDE7E500B424AF; packageReferences = ( @@ -512,8 +523,10 @@ buildActionMask = 2147483647; files = ( 7A0420BA25693D2C00034941 /* dkbm.js in Resources */, + 7A61FF912575A5B300D905D5 /* InfoPlist.strings in Resources */, 7ADF6C99250F872C00F237B2 /* RoadNumbers.otf in Resources */, 7A11470D23FDE7E600B424AF /* LaunchScreen.storyboard in Resources */, + 7A61FF8B2575A2CD00D905D5 /* Localizable.strings in Resources */, 7A6DD90A24329541009DE740 /* RoadNumbers2.0.otf in Resources */, 7A11470A23FDE7E600B424AF /* Assets.xcassets in Resources */, 7A11470823FDE7E500B424AF /* Main.storyboard in Resources */, @@ -609,6 +622,7 @@ isa = PBXVariantGroup; children = ( 7A11470723FDE7E500B424AF /* Base */, + 7A61FF962576C16400D905D5 /* ru */, ); name = Main.storyboard; sourceTree = ""; @@ -617,10 +631,29 @@ isa = PBXVariantGroup; children = ( 7A11470C23FDE7E600B424AF /* Base */, + 7A61FF8325759DE700D905D5 /* ru */, ); name = LaunchScreen.storyboard; sourceTree = ""; }; + 7A61FF892575A2CD00D905D5 /* Localizable.strings */ = { + isa = PBXVariantGroup; + children = ( + 7A61FF8A2575A2CD00D905D5 /* Base */, + 7A61FF8D2575A2F900D905D5 /* ru */, + ); + name = Localizable.strings; + sourceTree = ""; + }; + 7A61FF8F2575A5B300D905D5 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 7A61FF902575A5B300D905D5 /* Base */, + 7A61FF932575A5B600D905D5 /* ru */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -628,6 +661,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"; @@ -688,6 +722,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"; @@ -744,7 +779,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 56; + CURRENT_PROJECT_VERSION = 57; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; @@ -767,7 +802,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = AutoCat/AutoCat.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 56; + CURRENT_PROJECT_VERSION = 57; DEVELOPMENT_TEAM = 46DTTB8X4S; INFOPLIST_FILE = AutoCat/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 13.0; diff --git a/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme b/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme index defffdc..462ef37 100644 --- a/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme +++ b/AutoCat.xcodeproj/xcshareddata/xcschemes/AutoCat.xcscheme @@ -34,6 +34,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "ru" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist index 1ac3540..50bdf8c 100644 --- a/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/AutoCat.xcodeproj/xcuserdata/selim.xcuserdatad/xcschemes/xcschememanagement.plist @@ -14,35 +14,35 @@ isShown orderHint - 8 + 5 DifferenceKit (Playground) 2.xcscheme isShown orderHint - 9 + 6 DifferenceKit (Playground).xcscheme isShown orderHint - 7 + 1 Eureka (Playground) 1.xcscheme isShown orderHint - 5 + 8 Eureka (Playground) 2.xcscheme isShown orderHint - 6 + 9 Eureka (Playground) 3.xcscheme @@ -70,7 +70,7 @@ isShown orderHint - 4 + 7 GettingStarted (Playground) 1.xcscheme @@ -112,42 +112,42 @@ isShown orderHint - 13 + 10 Rx (Playground) 1.xcscheme isShown orderHint - 2 + 3 Rx (Playground) 2.xcscheme isShown orderHint - 3 + 4 Rx (Playground).xcscheme isShown orderHint - 1 + 2 SwiftDate (Playground) 1.xcscheme isShown orderHint - 11 + 12 SwiftDate (Playground) 2.xcscheme isShown orderHint - 12 + 13 SwiftDate (Playground) 3.xcscheme @@ -175,7 +175,7 @@ isShown orderHint - 10 + 11 SuppressBuildableAutocreation diff --git a/AutoCat/Base.lproj/InfoPlist.strings b/AutoCat/Base.lproj/InfoPlist.strings new file mode 100644 index 0000000..1e16b53 --- /dev/null +++ b/AutoCat/Base.lproj/InfoPlist.strings @@ -0,0 +1,9 @@ +/* + InfoPlist.strings + AutoCat + + Created by Selim Mustafaev on 01.12.2020. + Copyright © 2020 Selim Mustafaev. All rights reserved. +*/ + +"CFBundleDisplayName" = "AutoCat"; diff --git a/AutoCat/Base.lproj/Localizable.strings b/AutoCat/Base.lproj/Localizable.strings new file mode 100644 index 0000000..862d69d --- /dev/null +++ b/AutoCat/Base.lproj/Localizable.strings @@ -0,0 +1,7 @@ +/* + Localizable.strings + AutoCat + + Created by Selim Mustafaev on 01.12.2020. + Copyright © 2020 Selim Mustafaev. All rights reserved. +*/ diff --git a/AutoCat/Base.lproj/Main.storyboard b/AutoCat/Base.lproj/Main.storyboard index 7d0c147..e81baa6 100644 --- a/AutoCat/Base.lproj/Main.storyboard +++ b/AutoCat/Base.lproj/Main.storyboard @@ -100,23 +100,23 @@ - + - + - + -