From bbe35aaa813992103571dd0f99bcdd33bbe3222a Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Wed, 9 Mar 2022 09:25:18 +0900 Subject: [PATCH 1/2] =?UTF-8?q?#35=20=E3=82=AF=E3=83=A9=E3=82=A4=E3=82=A2?= =?UTF-8?q?=E3=83=B3=E3=83=88=E8=A8=BC=E6=98=8E=E6=9B=B8=E3=82=A4=E3=83=B3?= =?UTF-8?q?=E3=83=9D=E3=83=BC=E3=83=88=E7=94=BB=E9=9D=A2=E5=A4=9A=E8=A8=80?= =?UTF-8?q?=E8=AA=9E=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AgileWorks/AgileWorks.xcodeproj/project.pbxproj | 4 ---- .../Strings/Chinese-Simplified.strings | 3 +++ .../Strings/Chinese-Traditional.strings | 3 +++ AgileWorks/AgileWorks/Strings/English.strings | 3 +++ AgileWorks/AgileWorks/Strings/Japanese.strings | 3 +++ .../Strings/en.lproj/Localizable.strings | 3 +++ .../Strings/ja.lproj/Localizable.strings | 3 +++ .../Strings/zh-Hans.lproj/Localizable.strings | 3 +++ .../Strings/zh-Hant.lproj/Localizable.strings | 3 +++ AgileWorks/ShareExtension/Info.plist | 11 ++++++++++- .../View/Base.lproj/MainInterface.storyboard | 10 +++++++--- .../View/ShareViewController.swift | 16 +++++++++++++++- 12 files changed, 56 insertions(+), 9 deletions(-) diff --git a/AgileWorks/AgileWorks.xcodeproj/project.pbxproj b/AgileWorks/AgileWorks.xcodeproj/project.pbxproj index c8c12fd..08573d3 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 5011988..1da8252 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 e4b120e..8624f69 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 4c2d206..b753356 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 4c527e3..f5150d9 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 5b149c5..8b0a4b2 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 c65287e..e50e467 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 5dace38..3555dc7 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 5a3ebd3..dc745d4 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/Info.plist b/AgileWorks/ShareExtension/Info.plist index 5cf7a1c..6295e57 100644 --- a/AgileWorks/ShareExtension/Info.plist +++ b/AgileWorks/ShareExtension/Info.plist @@ -2,6 +2,15 @@ + AppIdentifierPrefix + $(AppIdentifierPrefix) + AppConfig + + OAUTH_CLIENTID + $(OAUTH_CLIENTID) + AGILE_WORKS_SHARE_BUNDLE_IDENTIFIER + $(AGILE_WORKS_SHARE_BUNDLE_IDENTIFIER) + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName @@ -31,7 +40,7 @@ SUBQUERY ( $extensionItem.attachments, $attachment, - ( ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.rsa.pkcs-12" ) + ( ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.rsa.pkcs-12" ) ).@count == 1 ).@count == 1 diff --git a/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard b/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard index 40e415a..f14373f 100644 --- a/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard +++ b/AgileWorks/ShareExtension/View/Base.lproj/MainInterface.storyboard @@ -1,9 +1,9 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -70,7 +70,11 @@ + + + + diff --git a/AgileWorks/ShareExtension/View/ShareViewController.swift b/AgileWorks/ShareExtension/View/ShareViewController.swift index b9dfaae..55636e3 100644 --- a/AgileWorks/ShareExtension/View/ShareViewController.swift +++ b/AgileWorks/ShareExtension/View/ShareViewController.swift @@ -16,12 +16,26 @@ 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: "") + + } + @IBAction func onCancelButtonTapped(_ sender: UIBarButtonItem) { extensionContext?.cancelRequest(withError: ShareExtensionError.cancelled) } -- GitLab From 68d179ff92d4a28ce5dc8cb4bf992ee10d2c9b2b Mon Sep 17 00:00:00 2001 From: Azuma Kasumi Date: Wed, 9 Mar 2022 10:48:32 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= =?UTF-8?q?=E6=96=87=E5=AD=97=E3=81=AE=E5=A4=9A=E8=A8=80=E8=AA=9E=E5=AF=BE?= =?UTF-8?q?=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings | 6 +++--- AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings | 6 +++--- AgileWorks/AgileWorks/Strings/English.strings | 6 +++--- AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings | 6 +++--- .../AgileWorks/Strings/zh-Hans.lproj/Localizable.strings | 6 +++--- .../AgileWorks/Strings/zh-Hant.lproj/Localizable.strings | 6 +++--- AgileWorks/ShareExtension/View/ShareViewController.swift | 4 ++++ 7 files changed, 22 insertions(+), 18 deletions(-) diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings index 1da8252..586c5c7 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Simplified.strings @@ -151,9 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension -"CertificateTitle" = "簡クライアント証明書"; -"Import" = "簡インポート"; -"Passphrase" = "簡パスフレーズ"; +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings index 8624f69..2bf4484 100644 --- a/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings +++ b/AgileWorks/AgileWorks/Strings/Chinese-Traditional.strings @@ -151,9 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension -"CertificateTitle" = "繁クライアント証明書"; -"Import" = "繁インポート"; -"Passphrase" = "繁パスフレーズ"; +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/AgileWorks/Strings/English.strings b/AgileWorks/AgileWorks/Strings/English.strings index b753356..d7bdfbb 100644 --- a/AgileWorks/AgileWorks/Strings/English.strings +++ b/AgileWorks/AgileWorks/Strings/English.strings @@ -151,9 +151,9 @@ "WfSuspend" = "Suspend"; // ShareExtension -"CertificateTitle" = "英クライアント証明書"; -"Import" = "英インポート"; -"Passphrase" = "英パスフレーズ"; +"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 8b0a4b2..43c5413 100644 --- a/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/en.lproj/Localizable.strings @@ -151,9 +151,9 @@ "WfSuspend" = "Suspend"; // ShareExtension -"CertificateTitle" = "英クライアント証明書"; -"Import" = "英インポート"; -"Passphrase" = "英パスフレーズ"; +"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 3555dc7..a0b1993 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hans.lproj/Localizable.strings @@ -151,9 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension -"CertificateTitle" = "簡クライアント証明書"; -"Import" = "簡インポート"; -"Passphrase" = "簡パスフレーズ"; +"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 dc745d4..ec46638 100644 --- a/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings +++ b/AgileWorks/AgileWorks/Strings/zh-Hant.lproj/Localizable.strings @@ -151,9 +151,9 @@ "WfSuspend" = "保留"; // ShareExtension -"CertificateTitle" = "繁クライアント証明書"; -"Import" = "繁インポート"; -"Passphrase" = "繁パスフレーズ"; +"CertificateTitle" = "クライアント証明書"; +"Import" = "インポート"; +"Passphrase" = "パスフレーズ"; "CertificateImportSuccess" = "クライアント証明書をインポートしました。"; "IncorrectPassphrase" = "パスフレーズが違います。"; "CertificateImportError" = "証明書のインポート中にエラーが発生しました。"; diff --git a/AgileWorks/ShareExtension/View/ShareViewController.swift b/AgileWorks/ShareExtension/View/ShareViewController.swift index 55636e3..5b63e98 100644 --- a/AgileWorks/ShareExtension/View/ShareViewController.swift +++ b/AgileWorks/ShareExtension/View/ShareViewController.swift @@ -36,6 +36,10 @@ class ShareViewController: UITableViewController { } + override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? { + return localizadString(key: "CertificateTitle", comment: "") + } + @IBAction func onCancelButtonTapped(_ sender: UIBarButtonItem) { extensionContext?.cancelRequest(withError: ShareExtensionError.cancelled) } -- GitLab