diff --git a/AgileWorks/AgileWorks.xcodeproj/project.pbxproj b/AgileWorks/AgileWorks.xcodeproj/project.pbxproj index c8c12fdce6f891c1996ddec7e5fcf4ca9ff59ded..08573d34da6453b09f34b88486570a9becb6cb1f 100644 --- a/AgileWorks/AgileWorks.xcodeproj/project.pbxproj +++ b/AgileWorks/AgileWorks.xcodeproj/project.pbxproj @@ -216,11 +216,9 @@ 3AF4A84824A06AD0006C0C0A /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; }; 75917F8F27BD315A0051E201 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = ""; }; 75917F9027BD315A0051E201 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MainInterface.strings"; sourceTree = ""; }; - 75917F9127BD315A0051E201 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/MainInterface.strings"; sourceTree = ""; }; 75917F9227BD315A0051E201 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; 75917F9327BD317D0051E201 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/LaunchScreen.strings"; sourceTree = ""; }; 75917F9427BD317D0051E201 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/MainInterface.strings"; sourceTree = ""; }; - 75917F9527BD317D0051E201 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/MainInterface.strings"; sourceTree = ""; }; 75917F9627BD317E0051E201 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Localizable.strings"; sourceTree = ""; }; 75917F9B27BDF0F10051E201 /* Japanese.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = Japanese.strings; sourceTree = ""; }; 75917F9D27BDF1C30051E201 /* English.strings */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; path = English.strings; sourceTree = ""; }; @@ -1368,8 +1366,6 @@ isa = PBXVariantGroup; children = ( 7672AD6E257EFF500063884A /* Base */, - 75917F9127BD315A0051E201 /* zh-Hans */, - 75917F9527BD317D0051E201 /* zh-Hant */, ); name = MainInterface.storyboard; sourceTree = ""; diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings index 50119884c404cddd063b4e3cb67b81570e5a33c6..586c5c769b1ba4a19521dd107a6a3c73798c92af 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings @@ -151,6 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings index e4b120eb2688b8faf1e193958c6c288a9c759e65..2bf44849e4d71051991b7122d65632591da6f537 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings @@ -151,6 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/English.strings b/AgileWorks/AgileWorks/Strings/English.strings index 4c2d2066426d296242b90019bf42536b2dcfd9b1..d7bdfbb669d62a85ef99fdc68172adc81d9cddc5 100644 --- a/AgileWorks/AgileWorks/Strings/English.strings +++ b/AgileWorks/AgileWorks/Strings/English.strings @@ -151,6 +151,9 @@ "WfSuspend" = "Suspend"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/Japanese.strings b/AgileWorks/AgileWorks/Strings/Japanese.strings index 4c527e34a8566c706a0c9cc98a6833f76c62372e..f5150d9f6af9fb63b0787b4053cb279ff4daaa3d 100644 --- a/AgileWorks/AgileWorks/Strings/Japanese.strings +++ b/AgileWorks/AgileWorks/Strings/Japanese.strings @@ -151,6 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings index 5b149c57d73ba34878aa7d8479105a9b7ca08fea..43c5413ab063e505729696dbb347d780d898569d 100644 --- a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings @@ -151,6 +151,9 @@ "WfSuspend" = "Suspend"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings index c65287e5ae4ef66e20f59f0a52679d179a7b47c3..e50e467e78e928e1dc333364a3ce225281ece980 100644 --- a/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/ja.lproj/Localizable.strings @@ -151,6 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings index 5dace384040344153dde12a8c25f9e1f2e069dea..a0b19935da293dd9dab2b079f94912016b91ed67 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings @@ -151,6 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings index 5a3ebd322ac0f85390285afdb3ffff930fa14f18..ec466385e198fb74bd68236bdf125c74140f1767 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings @@ -151,6 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard b/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard index 0f85699cb488b20855cb10226b8cd2d223329957..f14373f3f1fb8632d2a4e1158e1dc2dbf13a413a 100644 --- a/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard +++ b/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard @@ -70,7 +70,11 @@ + + + + diff --git a/AgileWorks/ShareExtension/View/ShareViewController.swift b/AgileWorks/ShareExtension/View/ShareViewController.swift index b9dfaaeacbd378595ad9f516eac2fde058e22f70..5b63e98cb2d1375545483367efff4fae2da5e216 100644 --- a/AgileWorks/ShareExtension/View/ShareViewController.swift +++ b/AgileWorks/ShareExtension/View/ShareViewController.swift @@ -16,12 +16,30 @@ class ShareViewController: UITableViewController { @IBOutlet private var passphraseTextField: UITextField! @IBOutlet private var contentView: UIView! - + @IBOutlet weak var clientCertificateTitle: UINavigationItem! + @IBOutlet weak var cancelButton: UIBarButtonItem! + @IBOutlet weak var importButton: UIBarButtonItem! + @IBOutlet weak var passphraseLabel: UILabel! + override func viewDidLoad() { super.viewDidLoad() + shareViewTranslation() tableView.backgroundColor = UIColor(white: 0.9, alpha: 1.0) } + //固定文言の表示 + private func shareViewTranslation() { + clientCertificateTitle.title = localizadString(key: "CertificateTitle", comment: "") + cancelButton.title = localizadString(key: "Cansell", comment: "") + importButton.title = localizadString(key: "Import", comment: "") + passphraseLabel.text = localizadString(key: "Passphrase", comment: "") + + } + + override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + return localizadString(key: "CertificateTitle", comment: "") + } + @IBAction func onCancelButtonTapped(_ sender: UIBarButtonItem) { extensionContext?.cancelRequest(withError: ShareExtensionError.cancelled) }