Remove russian translations (#39)

metsma · web-flow · commit f571bf1e712b · 2026-05-29T11:12:02.000+03:00
IB-8815

Signed-off-by: Raul Metsma &lt;raul@metsma.ee&gt;
diff --git a/EstEIDToken/Localizable.xcstrings b/EstEIDToken/Localizable.xcstrings
@@ -8,12 +8,6 @@
             "state" : "translated",
             "value" : "Sisestati ebakorrektne PIN"
           }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Invalid PIN entered"
-          }
         }
       }
     },
@@ -24,12 +18,6 @@
             "state" : "translated",
             "value" : "Palun sisestada PIN kaardilugeja sõrmistikult"
           }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Пожалуйста, введите PIN-код на PinPAD"
-          }
         }
       }
     },
@@ -82,30 +70,6 @@
               }
             }
           }
-        },
-        "ru" : {
-          "variations" : {
-            "plural" : {
-              "one" : {
-                "stringUnit" : {
-                  "state" : "translated",
-                  "value" : "Неверный PIN.\nPIN будет заблокирован при следующей неудачной попытке"
-                }
-              },
-              "other" : {
-                "stringUnit" : {
-                  "state" : "translated",
-                  "value" : "Неправильный PIN.\nОсталось %d попыток"
-                }
-              },
-              "zero" : {
-                "stringUnit" : {
-                  "state" : "translated",
-                  "value" : "PIN заблокирован.\nРазблокируйте его для повторного использования PIN."
-                }
-              }
-            }
-          }
         }
       }
     }
diff --git a/EstEIDToken/Token.swift b/EstEIDToken/Token.swift
@@ -54,8 +54,8 @@ extension TKSmartCard {
     func sendCheck(ins: UInt8, p1: UInt8, p2: UInt8, data: Data? = nil, le: Int? = nil) throws -> Data {
         switch try? send(ins: ins, p1: p1, p2: p2, data: data, le: le) {
         case (0x9000, let data)?: return data
-        case (let sw, _)?:
-            NSLog("EstEIDToken sendCheck failed: \((data ?? Data()) as NSData) sw: \(String(format: "%04X", sw))")
+        case (let sw, let result)?:
+            NSLog("EstEIDToken sendCheck failed: \(result as NSData) sw: \(String(format: "%04X", sw))")
             throw TKError(.objectNotFound)
         default:
             NSLog("EstEIDToken sendCheck failed: \((data ?? Data()) as NSData)")
diff --git a/EstEIDToken/TokenSession.swift b/EstEIDToken/TokenSession.swift
@@ -50,23 +50,23 @@ class AuthOperation: TKTokenSmartCardPINAuthOperation {
     override func finish() throws {
         NSLog("AuthOperation finish")
 
-        guard pin != nil && smartCard != nil else {
+        guard let pin, let smartCard else {
             NSLog("AuthOperation finish invalid condition")
             throw TKError(.canceledByUser)
         }
 
-        if pin!.count < pinFormat.minPINLength ||
-           pin!.count > pinFormat.maxPINLength ||
-           !isAllDigits(pin!) {
-            NSLog("AuthOperation finish invalid PIN length: \(pin!.count) min: \(pinFormat.minPINLength) max: \(pinFormat.maxPINLength)")
+        if pin.count < pinFormat.minPINLength ||
+           pin.count > pinFormat.maxPINLength ||
+           !isAllDigits(pin) {
+            NSLog("AuthOperation finish invalid PIN length: \(pin.count) min: \(pinFormat.minPINLength) max: \(pinFormat.maxPINLength)")
             let msg = String(localized: "Invalid PIN entered")
             EstEIDTokenDriver.showNotification(msg)
             throw NSError(domain: TKErrorDomain, code: TKError.Code.authenticationFailed.rawValue, userInfo: [NSLocalizedDescriptionKey: msg])
         }
 
         var pinData = Data(repeating: session.fillChar, count: pinFormat.pinBlockByteLength)
-        pinData.replaceSubrange(0..<pin!.count, with: pin!.utf8)
-        switch try? smartCard!.send(ins: 0x20, p1: 0x00, p2: session.pinId, data: pinData) {
+        pinData.replaceSubrange(0..<pin.count, with: pin.utf8)
+        switch try? smartCard.send(ins: 0x20, p1: 0x00, p2: session.pinId, data: pinData) {
         case (0x9000, _)?:
             NSLog("AuthOperation finish success")
             return
diff --git a/EstEIDTokenApp.xcodeproj/project.pbxproj b/EstEIDTokenApp.xcodeproj/project.pbxproj
@@ -165,7 +165,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1520;
-				LastUpgradeCheck = 1630;
+				LastUpgradeCheck = 2640;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					2F3883971CF46C6E00F114A7 = {
@@ -188,7 +188,6 @@
 			knownRegions = (
 				en,
 				Base,
-				ru,
 				et,
 			);
 			mainGroup = 2F38838F1CF46C6E00F114A7;
@@ -334,9 +333,10 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.7.0;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -400,8 +400,9 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.6.0;
+				MARKETING_VERSION = 1.7.0;
 				SDKROOT = macosx;
+				STRING_CATALOG_GENERATE_SYMBOLS = YES;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
diff --git a/EstEIDTokenApp/Localizable.xcstrings b/EstEIDTokenApp/Localizable.xcstrings
@@ -8,12 +8,6 @@
             "state" : "translated",
             "value" : "ID-kaardiga seotud teavituste saamiseks luba EstEIDTokenApp teavitused."
           }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Для получения уведомлений, связанных с ID-картой, разрешите уведомления для приложения EstEIDTokenApp."
-          }
         }
       }
     },
@@ -24,12 +18,6 @@
             "state" : "translated",
             "value" : "ID-kaardiga seotud teavituse saatmine ebaõnnestus. Teavituste saamiseks\nlubage EstEIDTokenApp teavitused [System Settings](x-apple.systempreferences:com.apple.notifications) → Notifications seadetes."
           }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Для получения уведомлений разрешите уведомления EstEIDTokenApp\nв настройках: [Системные Настройки](x-apple.systempreferences:com.apple.notifications) → Уведомления."
-          }
         }
       }
     },
@@ -40,12 +28,6 @@
             "state" : "translated",
             "value" : "Küsimuste korral pöörduge https://www.id.ee"
           }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Если у вас возникнут вопросы, пожалуйста, обратитесь на https://www.id.ee"
-          }
         }
       }
     },
@@ -56,12 +38,6 @@
             "state" : "translated",
             "value" : "Versioon: %@.%@"
           }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Версия: %@.%@"
-          }
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,6 @@`
`8`	`8`	`"state" : "translated",`
`9`	`9`	`"value" : "Sisestati ebakorrektne PIN"`
`10`	`10`	`}`
`11`		`- },`
`12`		`- "ru" : {`
`13`		`- "stringUnit" : {`
`14`		`- "state" : "translated",`
`15`		`- "value" : "Invalid PIN entered"`
`16`		`- }`
`17`	`11`	`}`
`18`	`12`	`}`
`19`	`13`	`},`
`@@ -24,12 +18,6 @@`
`24`	`18`	`"state" : "translated",`
`25`	`19`	`"value" : "Palun sisestada PIN kaardilugeja sõrmistikult"`
`26`	`20`	`}`
`27`		`- },`
`28`		`- "ru" : {`
`29`		`- "stringUnit" : {`
`30`		`- "state" : "translated",`
`31`		`- "value" : "Пожалуйста, введите PIN-код на PinPAD"`
`32`		`- }`
`33`	`21`	`}`
`34`	`22`	`}`
`35`	`23`	`},`
`@@ -82,30 +70,6 @@`
`82`	`70`	`}`
`83`	`71`	`}`
`84`	`72`	`}`
`85`		`- },`
`86`		`- "ru" : {`
`87`		`- "variations" : {`
`88`		`- "plural" : {`
`89`		`- "one" : {`
`90`		`- "stringUnit" : {`
`91`		`- "state" : "translated",`
`92`		`- "value" : "Неверный PIN.\nPIN будет заблокирован при следующей неудачной попытке"`
`93`		`- }`
`94`		`- },`
`95`		`- "other" : {`
`96`		`- "stringUnit" : {`
`97`		`- "state" : "translated",`
`98`		`- "value" : "Неправильный PIN.\nОсталось %d попыток"`
`99`		`- }`
`100`		`- },`
`101`		`- "zero" : {`
`102`		`- "stringUnit" : {`
`103`		`- "state" : "translated",`
`104`		`- "value" : "PIN заблокирован.\nРазблокируйте его для повторного использования PIN."`
`105`		`- }`
`106`		`- }`
`107`		`- }`
`108`		`- }`
`109`	`73`	`}`
`110`	`74`	`}`
`111`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,12 +8,6 @@`
`8`	`8`	`"state" : "translated",`
`9`	`9`	`"value" : "ID-kaardiga seotud teavituste saamiseks luba EstEIDTokenApp teavitused."`
`10`	`10`	`}`
`11`		`- },`
`12`		`- "ru" : {`
`13`		`- "stringUnit" : {`
`14`		`- "state" : "translated",`
`15`		`- "value" : "Для получения уведомлений, связанных с ID-картой, разрешите уведомления для приложения EstEIDTokenApp."`
`16`		`- }`
`17`	`11`	`}`
`18`	`12`	`}`
`19`	`13`	`},`
`@@ -24,12 +18,6 @@`
`24`	`18`	`"state" : "translated",`
`25`	`19`	`"value" : "ID-kaardiga seotud teavituse saatmine ebaõnnestus. Teavituste saamiseks\nlubage EstEIDTokenApp teavitused [System Settings](x-apple.systempreferences:com.apple.notifications) → Notifications seadetes."`
`26`	`20`	`}`
`27`		`- },`
`28`		`- "ru" : {`
`29`		`- "stringUnit" : {`
`30`		`- "state" : "translated",`
`31`		`- "value" : "Для получения уведомлений разрешите уведомления EstEIDTokenApp\nв настройках: [Системные Настройки](x-apple.systempreferences:com.apple.notifications) → Уведомления."`
`32`		`- }`
`33`	`21`	`}`
`34`	`22`	`}`
`35`	`23`	`},`
`@@ -40,12 +28,6 @@`
`40`	`28`	`"state" : "translated",`
`41`	`29`	`"value" : "Küsimuste korral pöörduge https://www.id.ee"`
`42`	`30`	`}`
`43`		`- },`
`44`		`- "ru" : {`
`45`		`- "stringUnit" : {`
`46`		`- "state" : "translated",`
`47`		`- "value" : "Если у вас возникнут вопросы, пожалуйста, обратитесь на https://www.id.ee"`
`48`		`- }`
`49`	`31`	`}`
`50`	`32`	`}`
`51`	`33`	`},`
`@@ -56,12 +38,6 @@`
`56`	`38`	`"state" : "translated",`
`57`	`39`	`"value" : "Versioon: %@.%@"`
`58`	`40`	`}`
`59`		`- },`
`60`		`- "ru" : {`
`61`		`- "stringUnit" : {`
`62`		`- "state" : "translated",`
`63`		`- "value" : "Версия: %@.%@"`
`64`		`- }`
`65`	`41`	`}`
`66`	`42`	`}`
`67`	`43`	`}`