Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: cherrypick terms of use copy (WPB-8846) #3154

Merged
merged 3 commits into from
Jul 3, 2024
Merged

fix: cherrypick terms of use copy (WPB-8846) #3154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e4ab67
chore: correct translation and label
yamilmedina Jul 2, 2024
57baf6f
chore: correct translation and label
yamilmedina Jul 2, 2024
7cf0a60
Merge branch 'release/cycle-4.6' into chore/cherry-pick-legal-change
yamilmedina Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/navigation/OtherDestinations.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ object PrivacyPolicyScreenDestination : ExternalUriStringResDirection {

object TermsOfUseScreenDestination : ExternalUriStringResDirection {
override val uriStringRes: Int
get() = R.string.url_terms_of_use
get() = R.string.url_terms_of_use_legal
}

object GiveFeedbackDestination : IntentDirection {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@
<string name="settings_your_account_label">Kontodetails</string>
<string name="settings_app_settings_label">App-Einstellungen</string>
<string name="settings_privacy_policy_label">Datenschutzerklärung</string>
<string name="settings_terms_of_use_label">Nutzungsbedingungen</string>
<string name="settings_terms_of_use_label">Datenschutz und AGB</string>
<string name="settings_network_settings_label">Netzwerkeinstellungen</string>
<string name="settings_manage_devices_label">Geräte verwalten</string>
<string name="settings_keep_connection_to_websocket">Verbindung zu Websocket behalten</string>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<string name="url_android_release_notes_feed" translatable="false">https://medium.com/feed/wire-news/tagged/android</string>
<string name="url_maps_location_coordinates_fallback" translatable="false">http://maps.google.com/maps?z=%1d&amp;q=loc:%2f+%2f</string>
<string name="url_privacy_policy" translatable="false">https://wire.com/privacy-policy#:~:text=We%20process%20individual%20data%20about,%C2%A7%201%20a)%20GDPR).</string>
<string name="url_terms_of_use" translatable="false">https://wire.com/legal#:~:text=Wire%20is%20used%20for%20private,disable%20your%20access%20to%20Wire.</string>
<string name="url_terms_of_use_legal" translatable="false">https://wire.com/legal</string>
<!-- Navigation -->
<string name="vault_screen_title">Vault</string>
<string name="archive_screen_title">Archive</string>
Expand All @@ -200,7 +200,7 @@
<string name="report_bug_screen_title">Report Bug</string>
<string name="about_app_screen_title">About This App</string>
<string name="settings_privacy_policy_label">Privacy Policy</string>
<string name="settings_terms_of_use_label">Terms of Use</string>
<string name="settings_terms_of_use_label">Legal</string>
<string name="label_copyright">Copyright</string>
<string translatable="false" name="label_copyright_value">© Wire Swiss GmbH</string>
<string name="debug_settings_screen_title">Debug Settings</string>
Expand Down
Loading