diff --git a/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings b/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings
index 4ed72bc46e..0db18517da 100644
--- a/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings
+++ b/Kickstarter-iOS/Locales/ja.lproj/Localizable.strings
@@ -86,7 +86,7 @@
"Explore_creative_projects" = "クリエイティブなプロジェクトをさがす";
"Explore_projects" = "プロジェクトをさがす";
"Facebook_login_disclaimer" = "Facebook でログインすると、あなたの氏名とプロフィール写真がインポートされます。また、あなたが Kickstarter 上で Facebook 友達をフォローすることができるように、友達リストも Kickstarter によってアクセスされます。あなたの許可なしに Kickstarter が Facebook 上に投稿を行うことは決してありません。 ";
-"Facebook_login_disclaimer_update" = "By logging in with Facebook, we’ll import your name, profile photo and friend list.";
+"Facebook_login_disclaimer_update" = "Facebook を使ってログインすると、お名前とプロフィール写真、友達リストがインポートされます。";
"Failed_to_retrieve_live_stream_event_details" = "ライブ配信の詳細を取得できませんでした";
"Failed_to_update_subscription" = "定期購読の更新に失敗しました";
"Filter_by_all_projects" = "全てのプロジェクトに絞る";
@@ -234,8 +234,8 @@
"Popular_Projects" = "人気のプロジェクト";
"Privacy" = "プライバシー";
"Private_profile" = "プライベート設定のプロフィール";
-"Private_profile_more_info" = "Private profile more info";
-"Private_profile_more_info_content" = "Kickstarter profiles are private by default. To make your profile public and visible to the world, turn this off.";
+"Private_profile_more_info" = "プライベート設定のプロフィール詳細";
+"Private_profile_more_info_content" = "Kickstarter でのプロフィールはデフォルト設定ではプライベート (非公開) となっています。プロフィールを公開したい場合はこの設定をオフにしてください。";
"Project_Cancelled" = "プロジェクトが取り消されました。";
"Project_Suspended" = "中止プロジェクト";
"Project_cancelled" = "プロジェクトが取り消されました。";
diff --git a/Kickstarter-iOS/Views/Controllers/FacebookConfirmationViewController.swift b/Kickstarter-iOS/Views/Controllers/FacebookConfirmationViewController.swift
index 2f07126a84..12422297d5 100644
--- a/Kickstarter-iOS/Views/Controllers/FacebookConfirmationViewController.swift
+++ b/Kickstarter-iOS/Views/Controllers/FacebookConfirmationViewController.swift
@@ -13,7 +13,6 @@ internal final class FacebookConfirmationViewController: UIViewController,
@IBOutlet private weak var confirmationLabel: UILabel!
@IBOutlet private weak var createAccountButton: UIButton!
@IBOutlet private weak var emailLabel: UILabel!
- @IBOutlet private weak var disclaimerButton: UIButton!
@IBOutlet private weak var loginButton: UIButton!
@IBOutlet private weak var loginLabel: UILabel!
@IBOutlet private weak var newsletterLabel: UILabel!
@@ -44,7 +43,6 @@ internal final class FacebookConfirmationViewController: UIViewController,
self.newsletterSwitch.addTarget(self, action: #selector(newsletterSwitchChanged),
for: .valueChanged)
- self.disclaimerButton.addTarget(self, action: #selector(helpButtonPressed), for: .touchUpInside)
let tapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(newsletterLabelTapped))
self.newsletterLabel.addGestureRecognizer(tapGestureRecognizer)
@@ -61,7 +59,6 @@ internal final class FacebookConfirmationViewController: UIViewController,
_ = self.confirmationLabel |> fbConfirmationMessageLabelStyle
_ = self.createAccountButton |> createNewAccountButtonStyle
_ = self.emailLabel |> fbConfirmEmailLabelStyle
- _ = self.disclaimerButton |> disclaimerButtonStyle |> fbDisclaimerTextStyle
_ = self.loginButton |> loginWithEmailButtonStyle
_ = self.loginLabel |> fbWrongAccountLabelStyle
_ = self.navigationItem.title = Strings.signup_navbar_title()
@@ -181,10 +178,6 @@ internal final class FacebookConfirmationViewController: UIViewController,
self.viewModel.inputs.loginButtonPressed()
}
- @objc private func helpButtonPressed() {
- self.helpViewModel.inputs.showHelpSheetButtonTapped()
- }
-
@objc fileprivate func newsletterLabelTapped() {
self.helpViewModel.inputs.showHelpSheetButtonTapped()
}
diff --git a/Kickstarter-iOS/Views/Controllers/LoginToutViewController.swift b/Kickstarter-iOS/Views/Controllers/LoginToutViewController.swift
index d093599aa1..990142d2be 100644
--- a/Kickstarter-iOS/Views/Controllers/LoginToutViewController.swift
+++ b/Kickstarter-iOS/Views/Controllers/LoginToutViewController.swift
@@ -16,6 +16,7 @@ internal final class LoginToutViewController: UIViewController, MFMailComposeVie
@IBOutlet fileprivate weak var signupButton: UIButton!
@IBOutlet fileprivate weak var loginContextStackView: UIStackView!
@IBOutlet fileprivate weak var rootStackView: UIStackView!
+ @IBOutlet fileprivate weak var facebookDisclaimerLabel: UILabel!
fileprivate let helpViewModel = HelpViewModel()
private var sessionStartedObserver: Any?
@@ -77,6 +78,8 @@ internal final class LoginToutViewController: UIViewController, MFMailComposeVie
|> UIStackView.lens.spacing .~ Styles.grid(5)
_ = self.signupButton |> signupWithEmailButtonStyle
+ _ = self.facebookDisclaimerLabel |> fbDisclaimerTextStyle
+
_ = self.bringCreativeProjectsToLifeLabel
|> UILabel.lens.font %~~ { _, l in
l.traitCollection.isRegularRegular
diff --git a/Kickstarter-iOS/Views/Storyboards/Login.storyboard b/Kickstarter-iOS/Views/Storyboards/Login.storyboard
index 3f05a8c080..916554158a 100644
--- a/Kickstarter-iOS/Views/Storyboards/Login.storyboard
+++ b/Kickstarter-iOS/Views/Storyboards/Login.storyboard
@@ -26,30 +26,37 @@
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -140,6 +158,7 @@
+
@@ -684,10 +703,10 @@
-
+
-
+
-
+