Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '14-update-legal-pages-urls-copyright-tac-t-c' into 'rebranding'

Browse source 
Resolve "Update legal pages URLs (copyright, TAC, T&C)"

See merge request new-vector/element/element-ios!9
This commit is contained in:
Ismail Gulek 2020-07-03 14:05:06 +00:00
commit 9c824c07fc
5 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Riot/Assets/Riot-Defaults.plist
View file

@ -86,5 +86,11 @@
<key>matrix.org</key>
<string></string>
</dict>
<key>settingsCopyrightUrl</key>
<string>https://riot.im/copyright</string>
<key>settingsPrivacyPolicyUrl</key>
<string>https://riot.im/privacy</string>
<key>settingsTermsConditionsUrl</key>
<string>https://riot.im/tac_apple</string>
</dict>
</plist>

3
Riot/Assets/en.lproj/Vector.strings
View file

@ -489,11 +489,8 @@
"settings_version" = "Version %@";
"settings_olm_version" = "Olm Version %@";
"settings_copyright" = "Copyright";
"settings_copyright_url" = "https://riot.im/copyright";
"settings_term_conditions" = "Terms & Conditions";
"settings_term_conditions_url" = "https://riot.im/tac_apple";
"settings_privacy_policy" = "Privacy Policy";
"settings_privacy_policy_url" = "https://riot.im/privacy";
"settings_third_party_notices" = "Third-party Notices";
"settings_send_crash_report" = "Send anon crash & usage data";
"settings_enable_rageshake" = "Rage shake to report bug";

3
Riot/Generated/RiotDefaults.swift
View file

@ -37,6 +37,9 @@ internal enum RiotDefaults {
internal static let pusherAppIdDev: String = _document["pusherAppIdDev"]
internal static let pusherAppIdProd: String = _document["pusherAppIdProd"]
internal static let roomDirectoryServers: [String: Any] = _document["roomDirectoryServers"]
internal static let settingsCopyrightUrl: String = _document["settingsCopyrightUrl"]
internal static let settingsPrivacyPolicyUrl: String = _document["settingsPrivacyPolicyUrl"]
internal static let settingsTermsConditionsUrl: String = _document["settingsTermsConditionsUrl"]
internal static let showAllEventsInRoomHistory: Bool = _document["showAllEventsInRoomHistory"]
internal static let showLeftMembersInRoomMemberList: Bool = _document["showLeftMembersInRoomMemberList"]
internal static let showRedactionsInRoomHistory: Bool = _document["showRedactionsInRoomHistory"]

12
Riot/Generated/Strings.swift
View file

@ -3354,10 +3354,6 @@ internal enum VectorL10n {
internal static var settingsCopyright: String {
return VectorL10n.tr("Vector", "settings_copyright")
}
/// https://riot.im/copyright
internal static var settingsCopyrightUrl: String {
return VectorL10n.tr("Vector", "settings_copyright_url")
}
/// Encrypt to verified sessions only
internal static var settingsCryptoBlacklistUnverifiedDevices: String {
return VectorL10n.tr("Vector", "settings_crypto_blacklist_unverified_devices")
@ -3706,10 +3702,6 @@ internal enum VectorL10n {
internal static var settingsPrivacyPolicy: String {
return VectorL10n.tr("Vector", "settings_privacy_policy")
}
/// https://riot.im/privacy
internal static var settingsPrivacyPolicyUrl: String {
return VectorL10n.tr("Vector", "settings_privacy_policy_url")
}
/// Profile Picture
internal static var settingsProfilePicture: String {
return VectorL10n.tr("Vector", "settings_profile_picture")
@ -3762,10 +3754,6 @@ internal enum VectorL10n {
internal static var settingsTermConditions: String {
return VectorL10n.tr("Vector", "settings_term_conditions")
}
/// https://riot.im/tac_apple
internal static var settingsTermConditionsUrl: String {
return VectorL10n.tr("Vector", "settings_term_conditions_url")
}
/// Third-party Notices
internal static var settingsThirdPartyNotices: String {
return VectorL10n.tr("Vector", "settings_third_party_notices")

9
Riot/Modules/Settings/SettingsViewController.m
View file

@ -2556,7 +2556,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
{
if (row == OTHER_COPYRIGHT_INDEX)
{
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_copyright_url", @"Vector", nil)];
NSString *copyrightUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsCopyrightUrl"];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:copyrightUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_copyright", @"Vector", nil);
@ -2564,7 +2565,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
}
else if (row == OTHER_TERM_CONDITIONS_INDEX)
{
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_term_conditions_url", @"Vector", nil)];
NSString *termsConditionsUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsTermsConditionsUrl"];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:termsConditionsUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_term_conditions", @"Vector", nil);
@ -2572,7 +2574,8 @@ SettingsIdentityServerCoordinatorBridgePresenterDelegate>
}
else if (row == OTHER_PRIVACY_INDEX)
{
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:NSLocalizedStringFromTable(@"settings_privacy_policy_url", @"Vector", nil)];
NSString *privacyPolicyUrlString = [[NSUserDefaults standardUserDefaults] objectForKey:@"settingsPrivacyPolicyUrl"];
WebViewViewController *webViewViewController = [[WebViewViewController alloc] initWithURL:privacyPolicyUrlString];
webViewViewController.title = NSLocalizedStringFromTable(@"settings_privacy_policy", @"Vector", nil);