Replace MobilePayments placeholder texts by translations

tutao · May 27, 2024 · c415126 · c415126
1 parent f7722f5
commit c415126
Show file tree

Hide file tree

Showing 16 changed files with 794 additions and 636 deletions.
diff --git a/app-ios/tutanota/Sources/Sharing/SharingStorage.swift b/app-ios/tutanota/Sources/Sharing/SharingStorage.swift
@@ -213,5 +213,5 @@ private func codingToVCard(_ ident: String, _ coding: NSSecureCoding) -> SharedI
 		return nil
 	}
 
-	return .contact(ident: ident, content: String(data: vcardText, encoding: .utf8)!)
+	return .contact(ident: ident, content: String(decoding: vcardText, as: UTF8.self))
 }
diff --git a/app-ios/tutanota/Sources/ViewController.swift b/app-ios/tutanota/Sources/ViewController.swift
@@ -184,7 +184,7 @@ class ViewController: UIViewController, WKNavigationDelegate, UIScrollViewDelega
 		webView.load(URLRequest(url: url))
 	}
 
-	private func dictToJson(dictionary: [String: String]) -> String { try! String(data: JSONEncoder().encode(dictionary), encoding: .utf8)! }
+	private func dictToJson(dictionary: [String: String]) -> String { try! String(decoding: JSONEncoder().encode(dictionary), as: UTF8.self) }
 
 	private func appUrl() -> URL {
 		// this var is stored in Info.plist and possibly manipulated by the build schemes:

diff --git a/buildSrc/DomainConfigs.js b/buildSrc/DomainConfigs.js
@@ -109,21 +109,6 @@ export const domainConfigs = {
 		referralBaseUrl: "http://localhost:9000/signup",
 		websiteBaseUrl: "https://tuta.com",
 	},
-	"172.16.2.192": {
-		firstPartyDomain: true,
-		partneredDomainTransitionUrl: "http://172.16.2.192:9000",
-		apiUrl: "http://172.16.2.192:9000",
-		paymentUrl: "http://172.16.2.192:9000/braintree.html",
-		webauthnUrl: "http://172.16.2.192:9000/webauthn",
-		legacyWebauthnUrl: "http://172.16.2.192:9000/webauthn",
-		webauthnMobileUrl: "http://172.16.2.192:9000/webauthnmobile",
-		legacyWebauthnMobileUrl: "http://172.16.2.192:9000/webauthnmobile",
-		webauthnRpId: "172.16.2.192",
-		u2fAppId: "http://172.16.2.192:9000/u2f-appid.json",
-		giftCardBaseUrl: "http://172.16.2.192:9000/giftcard",
-		referralBaseUrl: "http://172.16.2.192:9000/signup",
-		websiteBaseUrl: "https://tuta.com",
-	},
 	"{hostname}": {
 		firstPartyDomain: false,
 		partneredDomainTransitionUrl: "{protocol}//{hostname}",