IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3780 from Human-Connection/feat-3657-redesign-data-privacy-warning-box

Browse Source 
feat: 🍰 Redesign Data Privacy Warning Box
This commit is contained in:
Wolfgang Huß 2020-08-06 11:28:18 +02:00 committed by GitHub
commit f0b29d9808
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
webapp/components/Embed/EmbedComponent.vue
View File

@ -24,12 +24,12 @@
<h3>{{ $t('editor.embed.data_privacy_warning') }}</h3> <h3>{{ $t('editor.embed.data_privacy_warning') }}</h3>
<ds-text>{{ $t('editor.embed.data_privacy_info') }} {{ embedPublisher }}</ds-text> <ds-text>{{ $t('editor.embed.data_privacy_info') }} {{ embedPublisher }}</ds-text>
<div class="buttons"> <div class="buttons">
<base-button primary @click="allowEmbed()" data-test="play-now-button"> <base-button @click="closeOverlay()" data-test="cancel-button" danger>
{{ $t('editor.embed.play_now') }}
</base-button>
<base-button @click="closeOverlay()" data-test="cancel-button">
{{ $t('actions.cancel') }} {{ $t('actions.cancel') }}
</base-button> </base-button>
<base-button @click="allowEmbed()" data-test="play-now-button" filled>
{{ $t('editor.embed.play_now') }}
</base-button>
</div> </div>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" v-model="checkedAlwaysAllowEmbeds" /> <input type="checkbox" v-model="checkedAlwaysAllowEmbeds" />

2
webapp/locales/de.json
View File

@ -306,7 +306,7 @@
"editor": { "editor": {
"embed": { "embed": {
"always_allow": "Einzubettende Inhalte von Drittanbietern immer erlauben (diese Einstellung ist jederzeit änderbar)", "always_allow": "Einzubettende Inhalte von Drittanbietern immer erlauben (diese Einstellung ist jederzeit änderbar)",
"data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn Du dieses Video jetzt abspielst, registriert der folgende Anbieter wahrscheinlich Deine Nutzerdaten:", "data_privacy_info": "Deine Daten wurden noch nicht an Drittanbieter weitergegeben. Wenn Du diesen Inhalt jetzt abspielst, registriert der folgende Anbieter wahrscheinlich Deine Nutzerdaten:",
"data_privacy_warning": "Achte auf Deine Daten!", "data_privacy_warning": "Achte auf Deine Daten!",
"play_now": "Jetzt ansehen" "play_now": "Jetzt ansehen"
}, },

4
webapp/locales/en.json
View File

@ -306,9 +306,9 @@
"editor": { "editor": {
"embed": { "embed": {
"always_allow": "Always allow embedded content by third party providers (this setting can be changed any time)", "always_allow": "Always allow embedded content by third party providers (this setting can be changed any time)",
"data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to watch this video the following provider will likely collect user data:", "data_privacy_info": "Your data has not yet been shared with any third party providers. If you proceed to play this content the following provider will likely collect user data:",
"data_privacy_warning": "Data Privacy Warning!", "data_privacy_warning": "Data Privacy Warning!",
"play_now": "Watch now" "play_now": "Continue"
}, },
"hashtag": { "hashtag": {
"addHashtag": "New hashtag", "addHashtag": "New hashtag",