System to pick a translation language for each keyboard

Keyboards/KeyboardsBase/InterfaceVariables.swift

@@ -159,7 +159,6 @@ func checkLandscapeMode() {
 
 // Keyboard language variables.
 var controllerLanguage = String()
-var controllerLanguageAbbr = String()
 
 // Dictionary for accessing language abbreviations.
 let languagesAbbrDict = [
@@ -184,6 +183,13 @@ let languagesStringDict = [
   "Swedish": NSLocalizedString("_global.swedish", value: "Swedish", comment: "")
 ]
 
+func getKeyInDict(givenValue: String, dict: [String: String]) -> String {
+  for (key, value) in dict where value == givenValue {
+    return key
+  }
+  return ""
+}
+
 /// Returns the abbreviation of the language for use in commands.
 func getControllerLanguageAbbr() -> String {
   guard let abbreviation = languagesAbbrDict[controllerLanguage] else {
@@ -192,6 +198,17 @@ func getControllerLanguageAbbr() -> String {
   return abbreviation
 }
 
+func getControllerTranslateLangCode() -> String {
+  let userDefaults = UserDefaults(suiteName: "group.be.scri.userDefaultsContainer")!
+  let key = getControllerLanguageAbbr() + "TranslateLanguage"
+  if let translateLang = userDefaults.string(forKey: key) {
+    return translateLang
+  } else {
+    userDefaults.set("en", forKey: key)
+    return "en"
+  }
+}
+
 // Dictionary for accessing keyboard abbreviations and layouts.
 let keyboardLayoutDict: [String: () -> Void] = [
   // Layouts for French checked within setFRKeyboardLayout.
@@ -214,7 +231,12 @@ func setKeyboard() {
 /// Sets the keyboard layouts given the chosen keyboard and device type.
 func setKeyboardLayout() {
   if commandState == .translate {
-    setENKeyboardLayout()
+    let translateLanguage = getKeyInDict(givenValue: getControllerTranslateLangCode(), dict: languagesAbbrDict)
+    if let setLayoutFxn = keyboardLayoutDict[translateLanguage] {
+      setLayoutFxn()
+    } else {
+      setENKeyboardLayout()
+    }
   } else if let setLayoutFxn = keyboardLayoutDict[controllerLanguage] {
     setLayoutFxn()
   }

Keyboards/KeyboardsBase/KeyboardKeys.swift

@@ -210,27 +210,26 @@ class KeyboardKey: UIButton {
 
   /// Adjusts the width of a key if it's one of the special characters on the iPhone keyboard.
   func adjustPhoneKeyWidth() {
-    if key == "ABC" || key == "АБВ" {
+    if ["ABC", "АБВ"].contains(key) {
       layer.setValue(true, forKey: "isSpecial")
       widthAnchor.constraint(equalToConstant: numSymKeyWidth * 2).isActive = true
-    } else if key == "delete"
-      || key == "#+="
-      || key == "shift"
-      || key == "selectKeyboard" {
-      // Cancel Russian keyboard key resizing if translating as the keyboard is English.
-      if controllerLanguage == "Russian"
-        && keyboardState == .letters
-        && commandState != .translate {
+    } else if ["delete", "#+=", "shift", "selectKeyboard"].contains(key) {
+      if keyboardState == .letters
+        && (
+          (
+            commandState != .translate
+            && controllerLanguage == "Russian"
+          ) || (
+            commandState == .translate
+            && getControllerTranslateLangCode() == "ru"
+        )) {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1).isActive = true
       } else {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1.5).isActive = true
       }
-    } else if key == "123"
-      || key == ".?123"
-      || key == "return"
-      || key == "hideKeyboard" {
+    } else if ["123", ".?123", "return", "hideKeyboard"].contains(key) {
       if row == 2 {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1.5).isActive = true
@@ -256,7 +255,7 @@ class KeyboardKey: UIButton {
       scalarShiftKeyWidth = 1.5
       scalarSpecialKeysWidth = 1.0
 
-      if key == "ABC" || key == "АБВ" {
+      if ["ABC", "АБВ"].contains(key) {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1).isActive = true
       } else if ["#+=", "selectKeyboard"].contains(key) {
@@ -281,15 +280,18 @@ class KeyboardKey: UIButton {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * scalarReturnKeyWidth).isActive = true
       } else if ["123", ".?123", "return", "hideKeyboard"].contains(key) {
-        if key == "return"
+        if DeviceType.isPad
+          && key == "return"
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || controllerLanguage == "Italian"
-            || commandState == .translate
+            (
+              commandState != .translate
+              && ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+            )
           )
-          && row == 1
-          && DeviceType.isPad {
+          && row == 1 {
           layer.setValue(true, forKey: "isSpecial")
           widthAnchor.constraint(equalToConstant: numSymKeyWidth * scalarReturnKeyWidth).isActive = true
         } else {
@@ -300,22 +302,25 @@ class KeyboardKey: UIButton {
         widthAnchor.constraint(equalToConstant: keyWidth).isActive = true
       }
     } else {
-      if key == "ABC" || key == "АБВ" {
+      if ["ABC", "АБВ"].contains(key) {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1).isActive = true
       } else if ["delete", "#+=", "shift", "selectKeyboard", SpecialKeys.indent, SpecialKeys.capsLock].contains(key) {
         layer.setValue(true, forKey: "isSpecial")
         widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1).isActive = true
       } else if ["123", ".?123", "return", "hideKeyboard"].contains(key) {
-        if key == "return"
+        if DeviceType.isPad
+          && key == "return"
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || controllerLanguage == "Italian"
-            || commandState == .translate
+            (
+              commandState != .translate
+              && ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+            )
           )
-          && row == 1
-          && DeviceType.isPad {
+          && row == 1 {
           layer.setValue(true, forKey: "isSpecial")
           widthAnchor.constraint(equalToConstant: numSymKeyWidth * 1.5).isActive = true
         } else {

Keyboards/KeyboardsBase/KeyboardViewController.swift

@@ -1563,7 +1563,7 @@ class KeyboardViewController: UIInputViewController {
             } else {
               conjugationToDisplay = "was/were " + conjugationToDisplay
             }
-          } else if index == 3 && allConjugations[index] == "presPerfTPS" {
+          } else if index == 2 && allConjugations[index] == "presPerfTPS" {
             conjugationToDisplay = "have/" + conjugationToDisplay
           } else if index == 3 && allConjugations[index] == "presPerfTPSCont" {
             conjugationToDisplay = "have/" + conjugationToDisplay
@@ -1707,60 +1707,77 @@ class KeyboardViewController: UIInputViewController {
         var leftPadding = CGFloat(0)
         if DeviceType.isPhone
           && key == "y"
-          && ["German", "Swedish"].contains(controllerLanguage)
-          && commandState != .translate
-          && disableAccentCharacters != true {
+          && (
+            (
+              commandState != .translate
+              && ["German", "Swedish"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["de", "sv"].contains(getControllerTranslateLangCode())
+            )
+          )
+          && !disableAccentCharacters {
           leftPadding = keyWidth / 3
           addPadding(to: stackView2, width: leftPadding, key: "y")
         }
         if DeviceType.isPhone
           && key == "a"
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || controllerLanguage == "Italian"
-            || commandState == .translate
-            || (
-              (
-                controllerLanguage == "German"
-                || controllerLanguage == "Spanish"
-                || controllerLanguage == "Swedish"
+            (
+              commandState != .translate
+              && (
+                ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+                || (
+                  ["German", "Spanish", "Swedish"].contains(controllerLanguage)
+                  && disableAccentCharacters
+                )
               )
-              && disableAccentCharacters == true
-            )) {
+            ) || (
+              commandState == .translate
+              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+          )) {
           leftPadding = keyWidth / 4
           addPadding(to: stackView1, width: leftPadding, key: "a")
         }
         if DeviceType.isPad
           && key == "a"
           && !usingExpandedKeyboard
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || controllerLanguage == "Italian"
-            || commandState == .translate
-          ) {
+            (
+              commandState != .translate
+              && ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+          )) {
             leftPadding = keyWidth / 3
             addPadding(to: stackView1, width: leftPadding, key: "a")
         }
         if DeviceType.isPad
           && key == "@"
           && !usingExpandedKeyboard
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || controllerLanguage == "Italian"
-            || commandState == .translate) {
+            (
+              commandState != .translate
+              && ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+          )) {
           leftPadding = keyWidth / 3
           addPadding(to: stackView1, width: leftPadding, key: "@")
         }
         if DeviceType.isPad
           && key == "€"
           && !usingExpandedKeyboard
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || commandState == .translate) {
+            (
+              commandState != .translate
+              && ["English", "Portuguese"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["en", "pt"].contains(getControllerTranslateLangCode())
+          )) {
           leftPadding = keyWidth / 3
           addPadding(to: stackView1, width: leftPadding, key: "€")
         }
@@ -1847,27 +1864,35 @@ class KeyboardViewController: UIInputViewController {
         var rightPadding = CGFloat(0)
         if DeviceType.isPhone
           && key == "m"
-          && ["German", "Swedish"].contains(controllerLanguage)
-          && commandState != .translate
-          && disableAccentCharacters != true {
+          && (
+            (
+              commandState != .translate
+              && ["German", "Swedish"].contains(controllerLanguage)
+            ) || (
+              commandState == .translate
+              && ["de", "sv"].contains(getControllerTranslateLangCode())
+            )
+          )
+          && !disableAccentCharacters {
           rightPadding = keyWidth / 3
           addPadding(to: stackView2, width: rightPadding, key: "m")
         }
         if DeviceType.isPhone
           && key == "l"
           && (
-            controllerLanguage == "English"
-            || controllerLanguage == "Portuguese"
-            || controllerLanguage == "Italian"
-            || commandState == .translate
-            || (
-              (
-                controllerLanguage == "German"
-                || controllerLanguage == "Spanish"
-                || controllerLanguage == "Swedish"
+            (
+              commandState != .translate
+              && (
+                ["English", "Portuguese", "Italian"].contains(controllerLanguage)
+                || (
+                  ["German", "Spanish", "Swedish"].contains(controllerLanguage)
+                  && disableAccentCharacters
+                )
               )
-              && disableAccentCharacters == true
-            )) {
+            ) || (
+              commandState == .translate
+              && ["en", "pt", "it"].contains(getControllerTranslateLangCode())
+          )) {
           rightPadding = keyWidth / 4
           addPadding(to: stackView1, width: rightPadding, key: "l")
         }
@@ -2348,6 +2373,7 @@ class KeyboardViewController: UIInputViewController {
 
     case "Translate":
       if let selectedText = proxy.selectedText {
+        commandState = .translate
         queryWordToTranslate(queriedWordToTranslate: selectedText)
 
         if commandState == .invalid { // invalid state

Keyboards/KeyboardsBase/LanguageDBManager.swift

@@ -26,12 +26,12 @@ class LanguageDBManager {
   private var languageDB: DatabaseQueue?
 
   private init() {
-    languageDB = openDBQueue()
+    languageDB = openDBQueue(getControllerLanguageAbbr())
   }
 
   /// Makes a connection to the language database given the value for controllerLanguage.
-  private func openDBQueue() -> DatabaseQueue {
-    let dbName = "\(String(describing: get_iso_code(keyboardLanguage: controllerLanguage).uppercased()))LanguageData"
+  private func openDBQueue(_ langAbbr: String) -> DatabaseQueue {
+    let dbName = "\(String(describing: langAbbr.uppercased()))LanguageData"
     let dbResourcePath = Bundle.main.path(forResource: dbName, ofType: "sqlite")!
     let fileManager = FileManager.default
     do {
@@ -72,10 +72,18 @@ class LanguageDBManager {
   private func queryDBRow(query: String, outputCols: [String], args: StatementArguments) -> [String] {
     var outputValues = [String]()
     do {
-      try languageDB?.read { db in
-        if let row = try Row.fetchOne(db, sql: query, arguments: args) {
-          for col in outputCols {
-            outputValues.append(row[col])
+      if commandState == .translate {
+        try openDBQueue(getControllerTranslateLangCode()).read { db in
+          if let row = try Row.fetchOne(db, sql: query, arguments: args) {
+            outputValues.append(row[outputCols[0]])
+          }
+        }
+      } else {
+        try languageDB?.read { db in
+          if let row = try Row.fetchOne(db, sql: query, arguments: args) {
+            for col in outputCols {
+              outputValues.append(row[col])
+            }
           }
         }
       }
@@ -340,7 +348,7 @@ extension LanguageDBManager {
     WHERE
       word = ?
     """
-    let outputCols = ["translation"]
+    let outputCols = [getControllerLanguageAbbr()]
     let args = [word]
 
     return queryDBRow(query: query, outputCols: outputCols, args: StatementArguments(args))