Skip to content

Commit c6b11f3

Browse files
committed
Temporary removal of menu option to change app language
1 parent b843ff1 commit c6b11f3

File tree

6 files changed

+23
-54
lines changed

6 files changed

+23
-54
lines changed

Scribe.xcodeproj/project.pbxproj

+3-7
Original file line numberDiff line numberDiff line change
@@ -1006,8 +1006,6 @@
10061006
ED2486F12B0B4E8C0038AE6A /* AboutTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutTableViewCell.swift; sourceTree = "<group>"; };
10071007
ED2486F22B0B4E8C0038AE6A /* AboutTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutTableViewCell.xib; sourceTree = "<group>"; };
10081008
EDB4601A2AF9FD8200BEA967 /* Localizable.xcstrings */ = {isa = PBXFileReference; lastKnownFileType = text.json.xcstrings; path = Localizable.xcstrings; sourceTree = "<group>"; };
1009-
EDB4601C2AF9FDD600BEA967 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/AppScreen.strings; sourceTree = "<group>"; };
1010-
EDB4601D2AF9FDD600BEA967 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
10111009
EDB460202B03B3E400BEA967 /* BaseTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseTableViewController.swift; sourceTree = "<group>"; };
10121010
EDC364682AE408F20001E456 /* InterfaceConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InterfaceConstants.swift; sourceTree = "<group>"; };
10131011
EDEE62242B2DE65A00A0B9C1 /* UIEdgeInsetsExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIEdgeInsetsExtensions.swift; sourceTree = "<group>"; };
@@ -1603,7 +1601,7 @@
16031601
isa = PBXNativeTarget;
16041602
buildConfigurationList = 38BD214522D5908100C6795D /* Build configuration list for PBXNativeTarget "Scribe" */;
16051603
buildPhases = (
1606-
D103B184273C356E00B97121 /* ShellScript */,
1604+
D103B184273C356E00B97121 /* Run Script */,
16071605
38BD212C22D5907E00C6795D /* Sources */,
16081606
38BD212D22D5907E00C6795D /* Frameworks */,
16091607
38BD212E22D5907E00C6795D /* Resources */,
@@ -1910,7 +1908,6 @@
19101908
knownRegions = (
19111909
en,
19121910
Base,
1913-
fr,
19141911
);
19151912
mainGroup = 38BD212722D5907E00C6795D;
19161913
packageReferences = (
@@ -2073,7 +2070,7 @@
20732070
/* End PBXResourcesBuildPhase section */
20742071

20752072
/* Begin PBXShellScriptBuildPhase section */
2076-
D103B184273C356E00B97121 /* ShellScript */ = {
2073+
D103B184273C356E00B97121 /* Run Script */ = {
20772074
isa = PBXShellScriptBuildPhase;
20782075
alwaysOutOfDate = 1;
20792076
buildActionMask = 2147483647;
@@ -2083,6 +2080,7 @@
20832080
);
20842081
inputPaths = (
20852082
);
2083+
name = "Run Script";
20862084
outputFileListPaths = (
20872085
);
20882086
outputPaths = (
@@ -2913,7 +2911,6 @@
29132911
isa = PBXVariantGroup;
29142912
children = (
29152913
38BD213822D5907F00C6795D /* Base */,
2916-
EDB4601C2AF9FDD600BEA967 /* fr */,
29172914
);
29182915
name = AppScreen.storyboard;
29192916
sourceTree = "<group>";
@@ -2922,7 +2919,6 @@
29222919
isa = PBXVariantGroup;
29232920
children = (
29242921
38BD214022D5908100C6795D /* Base */,
2925-
EDB4601D2AF9FDD600BEA967 /* fr */,
29262922
);
29272923
name = LaunchScreen.storyboard;
29282924
sourceTree = "<group>";

Scribe/Base.lproj/LaunchScreen.storyboard

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
33
<device id="retina6_1" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
77
<capability name="Named colors" minToolsVersion="9.0"/>
88
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
99
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

Scribe/SettingsTab/SettingsTableData.swift

+16-16
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,22 @@ import Foundation
2121

2222
enum SettingsTableData {
2323
static let settingsTableData: [ParentTableCellModel] = [
24-
ParentTableCellModel(
25-
headingTitle: NSLocalizedString(
26-
"settings.appSettings", comment: "The title of the app settings section"
27-
),
28-
section: [
29-
Section(
30-
sectionTitle: NSLocalizedString(
31-
"settings.appSettings.appLanguage", comment: "Change the language of the Scribe App"
32-
),
33-
imageString: "globe",
34-
hasToggle: false,
35-
sectionState: .appLang
36-
)
37-
],
38-
hasDynamicData: nil
39-
),
24+
// ParentTableCellModel(
25+
// headingTitle: NSLocalizedString(
26+
// "settings.appSettings", comment: "The title of the app settings section"
27+
// ),
28+
// section: [
29+
// Section(
30+
// sectionTitle: NSLocalizedString(
31+
// "settings.appSettings.appLanguage", comment: "Change the language of the Scribe App"
32+
// ),
33+
// imageString: "globe",
34+
// hasToggle: false,
35+
// sectionState: .appLang
36+
// )
37+
// ],
38+
// hasDynamicData: nil
39+
// ),
4040
ParentTableCellModel(
4141
headingTitle: NSLocalizedString(
4242
"settings.installedKeyboards", comment: "The title of the installed keyboards section"

Scribe/SettingsTab/SettingsViewController.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ final class SettingsViewController: UIViewController {
8686

8787
func commonMethodToRefresh() {
8888
DispatchQueue.main.async {
89-
self.tableData[1].section = SettingsTableData.getInstalledKeyboardsSections()
89+
self.tableData[0].section = SettingsTableData.getInstalledKeyboardsSections()
9090
self.parentTable.reloadData()
9191
self.setFooterButtonView()
9292
}
@@ -96,7 +96,7 @@ final class SettingsViewController: UIViewController {
9696
}
9797

9898
func setFooterButtonView() {
99-
if tableData.count > 1 && tableData[1].section.count != 0 {
99+
if tableData.count > 0 && tableData[0].section.count != 0 {
100100
parentTable.tableFooterView?.isHidden = true
101101
} else {
102102
parentTable.tableFooterView?.isHidden = false

Scribe/fr.lproj/AppScreen.strings

-27
This file was deleted.

Scribe/fr.lproj/LaunchScreen.strings

Whitespace-only changes.

0 commit comments

Comments
 (0)