Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Sign in / Register
Toggle navigation
liberty-chat-ios
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
9
Issues
9
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liberty
chat
liberty-chat-ios
Commits
3c8626c6
Commit
3c8626c6
authored
Sep 24, 2019
by
Thomas Markiewicz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated with support, policy, and stay safe links
parent
8378c815
Pipeline
#35350
passed with stage
in 15 minutes and 16 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
6 deletions
+36
-6
Vector.strings
Riot/Assets/en.lproj/Vector.strings
+5
-3
Strings.swift
Riot/Generated/Strings.swift
+11
-3
SettingsViewController.m
Riot/Modules/Settings/SettingsViewController.m
+20
-0
No files found.
Riot/Assets/en.lproj/Vector.strings
View file @
3c8626c6
...
...
@@ -443,10 +443,12 @@
"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://librem.one/
policy
";
"settings_privacy_policy" = "P
rivacy P
olicy";
"settings_term_conditions" = "
Support
";
"settings_term_conditions_url" = "https://librem.one/
support
";
"settings_privacy_policy" = "Policy";
"settings_privacy_policy_url" = "https://librem.one/policy";
"settings_stay_safe" = "Stay safe";
"settings_stay_safe_url" = "https://librem.one/stay-safe";
"settings_third_party_notices" = "Third-party Notices";
"settings_send_crash_report" = "Send anon crash & usage data";
"settings_enable_rageshake" = "Rage shake to report bug";
...
...
Riot/Generated/Strings.swift
View file @
3c8626c6
...
...
@@ -2718,7 +2718,7 @@ internal enum VectorL10n {
internal
static
var
settingsPinRoomsWithUnread
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_pin_rooms_with_unread"
)
}
/// P
rivacy P
olicy
/// Policy
internal
static
var
settingsPrivacyPolicy
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_privacy_policy"
)
}
...
...
@@ -2766,15 +2766,23 @@ internal enum VectorL10n {
internal
static
var
settingsSignOutE2eWarn
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_sign_out_e2e_warn"
)
}
/// Stay safe
internal
static
var
settingsStaySafe
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_stay_safe"
)
}
/// https://librem.one/stay-safe
internal
static
var
settingsStaySafeUrl
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_stay_safe_url"
)
}
/// Surname
internal
static
var
settingsSurname
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_surname"
)
}
///
Terms & Conditions
///
Support
internal
static
var
settingsTermConditions
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_term_conditions"
)
}
/// https://librem.one/
policy
/// https://librem.one/
support
internal
static
var
settingsTermConditionsUrl
:
String
{
return
VectorL10n
.
tr
(
"Vector"
,
"settings_term_conditions_url"
)
}
...
...
Riot/Modules/Settings/SettingsViewController.m
View file @
3c8626c6
...
...
@@ -108,6 +108,7 @@ enum
#endif
OTHER_TERM_CONDITIONS_INDEX
,
OTHER_PRIVACY_INDEX
,
OTHER_STAY_SAFE_INDEX
,
OTHER_THIRD_PARTY_INDEX
,
OTHER_MARK_ALL_AS_READ_INDEX
,
OTHER_CLEAR_CACHE_INDEX
,
...
...
@@ -2016,6 +2017,16 @@ SingleImagePickerPresenterDelegate>
cell
=
privacyPolicyCell
;
}
else
if
(
row
==
OTHER_STAY_SAFE_INDEX
)
{
MXKTableViewCell
*
staySafeCell
=
[
self
getDefaultTableViewCell
:
tableView
];
staySafeCell
.
textLabel
.
text
=
NSLocalizedStringFromTable
(
@"settings_stay_safe"
,
@"Vector"
,
nil
);
staySafeCell
.
accessoryType
=
UITableViewCellAccessoryDisclosureIndicator
;
cell
=
staySafeCell
;
}
else
if
(
row
==
OTHER_THIRD_PARTY_INDEX
)
{
MXKTableViewCell
*
thirdPartyCell
=
[
self
getDefaultTableViewCell
:
tableView
];
...
...
@@ -2624,6 +2635,7 @@ SingleImagePickerPresenterDelegate>
}
else
#endif
// tom: here
if
(
row
==
OTHER_TERM_CONDITIONS_INDEX
)
{
WebViewViewController
*
webViewViewController
=
[[
WebViewViewController
alloc
]
initWithURL
:
NSLocalizedStringFromTable
(
@"settings_term_conditions_url"
,
@"Vector"
,
nil
)];
...
...
@@ -2640,6 +2652,14 @@ SingleImagePickerPresenterDelegate>
[
self
pushViewController
:
webViewViewController
];
}
else
if
(
row
==
OTHER_STAY_SAFE_INDEX
)
{
WebViewViewController
*
webViewViewController
=
[[
WebViewViewController
alloc
]
initWithURL
:
NSLocalizedStringFromTable
(
@"settings_stay_safe_url"
,
@"Vector"
,
nil
)];
webViewViewController
.
title
=
NSLocalizedStringFromTable
(
@"settings_stay_safe"
,
@"Vector"
,
nil
);
[
self
pushViewController
:
webViewViewController
];
}
else
if
(
row
==
OTHER_THIRD_PARTY_INDEX
)
{
NSString
*
htmlFile
=
[[
NSBundle
mainBundle
]
pathForResource
:
@"third_party_licenses"
ofType
:
@"html"
inDirectory
:
nil
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment