Mastodon/mastodon-app-ufficiale-iphone-ios
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon-ios.git synced 2025-02-02 18:36:44 +01:00
Code Issues Projects Releases Wiki Activity

Update onboarding privacy text to render Markdown

Browse Source
This commit is contained in:
Marcus Kida 2024-05-16 17:13:55 +02:00
parent 14393a26df
commit 41c34d4e82
No known key found for this signature in database
GPG Key ID: 19FF64E08013CA40
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Localization/app.json
View File

@ -363,8 +363,8 @@
"no_server_selected_hint": "We’ll pick a server based on your language if you continue without making a selection."
},
"privacy": {
"title": "Privacy",
"description": "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.",
"title": "Your Privacy",
"description": "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy.\n\nIf you disagree with the policy for **%s**, you can go back and pick a different server.",
"policy": {
"ios": "Privacy Policy - Mastodon for iOS",
"server": "Privacy Policy - %s"

8
Mastodon/Scene/Onboarding/Privacy/PrivacyTableViewController.swift
View File

@ -139,10 +139,16 @@ extension PrivacyTableViewController: UITableViewDelegate {
let label = UILabel()
label.translatesAutoresizingMaskIntoConstraints = false
label.numberOfLines = 0
label.text = L10n.Scene.Privacy.description
label.textColor = Asset.Colors.Label.primary.color
wrapper.addSubview(label)
let text = L10n.Scene.Privacy.description(viewModel.domain)
if let data = text.data(using: .utf8), let attributedString = try? NSAttributedString(markdown: data) {
label.attributedText = attributedString
} else {
label.text = text
}
NSLayoutConstraint.activate([
label.topAnchor.constraint(equalTo: wrapper.topAnchor, constant: 16),
label.leadingAnchor.constraint(equalTo: wrapper.leadingAnchor),

12
MastodonSDK/Sources/MastodonLocalization/Generated/Strings.swift
View File

@ -939,10 +939,14 @@ public enum L10n {
}
}
public enum Privacy {
/// Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.
public static let description = L10n.tr("Localizable", "Scene.Privacy.Description", fallback: "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.")
/// Privacy
public static let title = L10n.tr("Localizable", "Scene.Privacy.Title", fallback: "Privacy")
/// Although the Mastodon app does not collect any data, the server you sign up through may have a different policy.
///
/// If you disagree with the policy for **%@**, you can go back and pick a different server.
public static func description(_ p1: Any) -> String {
return L10n.tr("Localizable", "Scene.Privacy.Description", String(describing: p1), fallback: "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy.\n\nIf you disagree with the policy for **%@**, you can go back and pick a different server.")
}
/// Your Privacy
public static let title = L10n.tr("Localizable", "Scene.Privacy.Title", fallback: "Your Privacy")
public enum Button {
/// I Agree
public static let confirm = L10n.tr("Localizable", "Scene.Privacy.Button.Confirm", fallback: "I Agree")

4
MastodonSDK/Sources/MastodonLocalization/Resources/Base.lproj/Localizable.strings
View File

@ -335,10 +335,10 @@ uploaded to Mastodon.";
"Scene.Preview.Keyboard.ShowNext" = "Show Next";
"Scene.Preview.Keyboard.ShowPrevious" = "Show Previous";
"Scene.Privacy.Button.Confirm" = "I Agree";
"Scene.Privacy.Description" = "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.";
"Scene.Privacy.Description" = "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy.\n\nIf you disagree with the policy for **%@**, you can go back and pick a different server.";
"Scene.Privacy.Policy.Ios" = "Privacy Policy - Mastodon for iOS";
"Scene.Privacy.Policy.Server" = "Privacy Policy - %@";
"Scene.Privacy.Title" = "Privacy";
"Scene.Privacy.Title" = "Your Privacy";
"Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Double tap to open the list";
"Scene.Profile.Accessibility.EditAvatarImage" = "Edit avatar image";
"Scene.Profile.Accessibility.ShowAvatarImage" = "Show avatar image";

4
MastodonSDK/Sources/MastodonLocalization/Resources/en.lproj/Localizable.strings
View File

@ -325,10 +325,10 @@ uploaded to Mastodon.";
"Scene.Preview.Keyboard.ShowNext" = "Show Next";
"Scene.Preview.Keyboard.ShowPrevious" = "Show Previous";
"Scene.Privacy.Button.Confirm" = "I Agree";
"Scene.Privacy.Description" = "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy. Take a minute to review and agree to the Mastodon app privacy policy and your server’s privacy policy.";
"Scene.Privacy.Description" = "Although the Mastodon app does not collect any data, the server you sign up through may have a different policy.\n\nIf you disagree with the policy for **%@**, you can go back and pick a different server.";
"Scene.Privacy.Policy.Ios" = "Privacy Policy - Mastodon for iOS";
"Scene.Privacy.Policy.Server" = "Privacy Policy - %@";
"Scene.Privacy.Title" = "Privacy";
"Scene.Privacy.Title" = "Your Privacy";
"Scene.Profile.Accessibility.DoubleTapToOpenTheList" = "Double tap to open the list";
"Scene.Profile.Accessibility.EditAvatarImage" = "Edit avatar image";
"Scene.Profile.Accessibility.ShowAvatarImage" = "Show avatar image";