Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
26
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'add-help-on-login-page-user-may-have-been-deleted' into 'master'

Browse Source 
Warn on login that everything is deleted regularily

See merge request framasoft/mobilizon!285
This commit is contained in:
Thomas Citharel 2019-10-17 15:22:48 +02:00
commit 89b2ee1087
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/i18n/en_US.json
View File

@ -273,6 +273,7 @@
"Upcoming": "Upcoming",
"Update event {name}": "Update event {name}",
"Update my event": "Update my event",
"User accounts and every other data is currently deleted every 48 hours, so you may want to register again.": "User accounts and every other data is currently deleted every 48 hours, so you may want to register again.",
"Username": "Username",
"Users": "Users",
"View event page": "View event page",

5
js/src/i18n/fr_FR.json
View File

@ -273,6 +273,7 @@
"Upcoming": "À venir",
"Update event {name}": "Éditer l'événement {name}",
"Update my event": "Éditer mon événement",
"User accounts and every other data is currently deleted every 48 hours, so you may want to register again.": "Les comptes utilisateurs et toutes les autres données sont actuellement supprimées toutes les 48 heures, donc vous voulez peut-être vous inscrire à nouveau.",
"Username": "Pseudo",
"Users": "Utilisateurs",
"View event page": "Voir la page de l'événement",
@ -285,10 +286,10 @@
"We want to develop a <b>digital common</b>, that everyone can make their own, which respects <b>privacy and activism by design</b>.": "Nous voulons développer un <b>commun numérique</b>, que tout le monde pourra s’approprier, conçu dans <b>le respect de la vie privée et de l’action militante</b>.",
"We won’t change the world from Facebook. The tool we dream of, surveillance capitalism corporations won’t develop it, as they couldn’t profit from it. This is an opportunity to build something better, by taking another approach.": "On ne changera pas le monde depuis Facebook. L’outil dont nous rêvons, les entreprises du capitalisme de surveillance sont incapables de le produire, car elles ne sauraient pas en tirer profit. C’est l’occasion de faire mieux qu’elles, en faisant autrement.",
"Website / URL": "Site web / URL",
"Welcome back {username}!": "Bon retour {username} !",
"Welcome back {username}!": "Bon retour {username} !",
"Welcome back!": "Bon retour !",
"Welcome on your administration panel": "Bienvenue sur votre espace d'administration",
"Welcome to Mobilizon, {username}!": "Bienvenue sur Mobilizon, {username} !",
"Welcome to Mobilizon, {username}!": "Bienvenue sur Mobilizon, {username} !",
"Who can view this event and participate": "Qui peut voir cet événement et y participer",
"World map": "Carte mondiale",
"You and one other person are going to this event": "Vous êtes le ou la seule à vous rendre à cet événement | Vous et une autre personne vous rendez à cet événement | Vous et {approved} autres personnes vous rendez à cet événement.",

4
js/src/views/User/Login.vue
View File

@ -23,6 +23,10 @@
<span v-if="error === LoginError.USER_DOES_NOT_EXIST">
{{ $t('No user account with this email was found. Maybe you made a typo?') }}
</span>
<!-- Warning that we delete everything every now and then -->
<span v-if="error === LoginError.USER_DOES_NOT_EXIST">
{{ $t('User accounts and every other data is currently deleted every 48 hours, so you may want to register again.') }}
</span>
</b-message>
<form @submit="loginAction">
<b-field :label="$t('Email')">