Merge branch 'improve-profile-registration' into 'master'

Improve profile registration

See merge request framasoft/mobilizon!581

js/src/i18n/en_US.json

@@ -358,7 +358,6 @@
   "This is a demonstration site to test the beta version of Mobilizon.": "This is a demonstration site to test the beta version of Mobilizon.",
   "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.": "This will delete / anonymize all content (events, comments, messages, participations…) created from this identity.",
   "Title": "Title",
-  "To achieve your registration, please create a first identity profile.": "To achieve your registration, please create a first identity profile.",
   "To change the world, change the software": "To change the world, change the software",
   "To confirm, type your event title \"{eventTitle}\"": "To confirm, type your event title \"{eventTitle}\"",
   "To confirm, type your identity username \"{preferredUsername}\"": "To confirm, type your identity username \"{preferredUsername}\"",
@@ -743,8 +742,6 @@
   "{group}'s events": "{group}'s events",
   "When someone from the group creates an event and attributes it to the group, it will show up here.": "When someone from the group creates an event and attributes it to the group, it will show up here.",
   "View all": "View all",
-  "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.": "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it.",
-  "Bio": "Bio",
   "+ Start a discussion": "+ Start a discussion",
   "+ Add a resource": "+ Add a resource",
   "+ Create an event": "+ Create an event",
@@ -785,5 +782,10 @@
   "Created by {name}": "Created by {name}",
   "View all posts": "View all posts",
   "Didn't receive the instructions?": "Didn't receive the instructions?",
-  "Allow all comments from users with accounts": "Allow all comments from logged-in users"
+  "Allow all comments from users with accounts": "Allow all comments from logged-in users",
+  "This identifier is unique to your profile. It allows others to find you.": "This identifier is unique to your profile. It allows others to find you.",
+  "Displayed nickname": "Displayed nickname",
+  "Short bio": "Short bio",
+  "Congratulations, your account is now created!": "Congratulations, your account is now created!",
+  "Now, create your first profile:": "Now, create your first profile:"
 }

js/src/i18n/fr_FR.json

@@ -691,7 +691,7 @@
   "Updated": "Mis à jour",
   "Use my location": "Utiliser ma position",
   "User": "Utilisateur·ice",
-  "Username": "Pseudo",
+  "Username": "Identifiant",
   "Users": "Utilisateur⋅ice⋅s",
   "View a reply": "Aucune réponse | Voir une réponse | Voir {totalReplies} réponses",
   "View all": "Voir tous",
@@ -824,5 +824,10 @@
   "{profile} (by default)": "{profile} (par défault)",
   "{title} ({count} todos)": "{title} ({count} todos)",
   "© The OpenStreetMap Contributors": "© Les Contributeur⋅ices OpenStreetMap",
-  "Allow all comments from users with accounts": "Autoriser tous les commentaires d'utilisateur·ices avec des comptes"
+  "Allow all comments from users with accounts": "Autoriser tous les commentaires d'utilisateur·ices avec des comptes",
+  "This identifier is unique to your profile. It allows others to find you.": "Cet identifiant est unique à votre profil. Il permet à d'autres personnes de vous trouver.",
+  "Displayed nickname": "Pseudonyme affiché",
+  "Short bio": "Courte biographie",
+  "Congratulations, your account is now created!": "Bravo, votre compte est dorénavant créé !",
+  "Now, create your first profile:": "Maintenant, créez votre premier profil :"
 }

js/src/views/Account/Register.vue

@@ -2,12 +2,15 @@
   <section class="section container">
     <div class="columns is-mobile is-centered">
       <div class="column is-half-desktop">
-        <h1 class="title">{{ $t("Register an account on Mobilizon!") }}</h1>
-        <b-message v-if="userAlreadyActivated">{{
-          $t("To achieve your registration, please create a first identity profile.")
-        }}</b-message>
+        <h1 class="title" v-if="userAlreadyActivated">
+          {{ $t("Congratulations, your account is now created!") }}
+        </h1>
+        <h1 class="title" v-else>{{ $t("Register an account on Mobilizon!") }}</h1>
+        <p class="content" v-if="userAlreadyActivated">
+          {{ $t("Now, create your first profile:") }}
+        </p>
         <form v-if="!validationSent" @submit.prevent="submit">
-          <b-field :label="$t('Display name')">
+          <b-field :label="$t('Displayed nickname')">
             <b-input
               aria-required="true"
               required
@@ -34,14 +37,10 @@
             </b-field>
           </b-field>
           <p class="description">
-            {{
-              $t(
-                "The username is a unique identifier of your account on this and all the other instances. It's as unique as an email address, which makes it easy for other people to interact with it."
-              )
-            }}
+            {{ $t("This identifier is unique to your profile. It allows others to find you.") }}
           </p>
 
-          <b-field :label="$t('Bio')">
+          <b-field :label="$t('Short bio')">
             <b-input type="textarea" maxlength="100" rows="2" v-model="identity.summary" />
           </b-field>
 
@@ -161,6 +160,7 @@ export default class Register extends mixins(identityEditionMixin) {
 </script>
 
 <style lang="scss" scoped>
+@import "../../variables.scss";
 .avatar-enter-active {
   transition: opacity 1s ease;
 }
@@ -180,6 +180,11 @@ export default class Register extends mixins(identityEditionMixin) {
 
 p.description {
   font-size: 0.9rem;
-  margin-bottom: 10px;
+  margin-bottom: 15px;
+  margin-top: -10px;
+}
+
+section.section {
+  background: $white;
 }
 </style>