From 5d9a36917d0ee8fb039672792aad0af94fc39356 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 17 Nov 2020 10:57:04 +0100
Subject: [PATCH] Fix register sentense string

See https://framacolibri.org/t/sinscrire-sur-mobilizon-affiche-au-lieu-du-nom-de-linstance/9838

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/i18n/en_US.json            |  1 -
 js/src/i18n/fr_FR.json            |  1 -
 js/src/mixins/identityEdition.ts  |  4 ++--
 js/src/views/Account/Register.vue | 14 ++++++++++++--
 js/src/views/User/Register.vue    | 13 ++++++++++++-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/js/src/i18n/en_US.json b/js/src/i18n/en_US.json
index 67a625d7e..bfe0ce95f 100644
--- a/js/src/i18n/en_US.json
+++ b/js/src/i18n/en_US.json
@@ -277,7 +277,6 @@
   "Published events with <b>{comments}</b> comments and <b>{participations}</b> confirmed participations": "Published events with <b>{comments}</b> comments and <b>{participations}</b> confirmed participations",
   "RSS/Atom Feed": "RSS/Atom Feed",
   "Region": "Region",
-  "Register an account on Mobilizon!": "Register an account on Mobilizon!",
   "Registration is allowed, anyone can register.": "Registration is allowed, anyone can register.",
   "Registration is closed.": "Registration is closed.",
   "Registration is currently closed.": "Registration is currently closed.",
diff --git a/js/src/i18n/fr_FR.json b/js/src/i18n/fr_FR.json
index a38dadceb..5dda93cf1 100644
--- a/js/src/i18n/fr_FR.json
+++ b/js/src/i18n/fr_FR.json
@@ -563,7 +563,6 @@
   "Refresh profile": "Rafraîchir le profil",
   "Region": "Région",
   "Register": "S'inscrire",
-  "Register an account on Mobilizon!": "S'inscrire sur Mobilizon !",
   "Register an account on {instanceName}!": "S'inscrire sur {instanceName} !",
   "Register for an event by choosing one of your identities": "S'inscrire à un évènement en choisissant une de vos identités",
   "Register on this instance": "S'inscrire sur cette instance",
diff --git a/js/src/mixins/identityEdition.ts b/js/src/mixins/identityEdition.ts
index e3ecd5f04..0669e99a1 100644
--- a/js/src/mixins/identityEdition.ts
+++ b/js/src/mixins/identityEdition.ts
@@ -8,7 +8,7 @@ export default class IdentityEditionMixin extends Mixins(Vue) {
 
   oldDisplayName: string | null = null;
 
-  autoUpdateUsername(newDisplayName: string | null) {
+  autoUpdateUsername(newDisplayName: string | null): void {
     const oldUsername = IdentityEditionMixin.convertToUsername(this.oldDisplayName);
 
     if (this.identity.preferredUsername === oldUsername) {
@@ -30,7 +30,7 @@ export default class IdentityEditionMixin extends Mixins(Vue) {
       .replace(/[^a-z0-9_]/g, "");
   }
 
-  validateUsername() {
+  validateUsername(): boolean {
     return (
       this.identity.preferredUsername ===
       IdentityEditionMixin.convertToUsername(this.identity.preferredUsername)
diff --git a/js/src/views/Account/Register.vue b/js/src/views/Account/Register.vue
index 926b190d0..fcb1fd319 100644
--- a/js/src/views/Account/Register.vue
+++ b/js/src/views/Account/Register.vue
@@ -5,7 +5,9 @@
         <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>
+        <h1 class="title" v-else>
+          {{ $t("Register an account on {instanceName}!", { instanceName: config.name }) }}
+        </h1>
         <p class="content" v-if="userAlreadyActivated">
           {{ $t("Now, create your first profile:") }}
         </p>
@@ -92,6 +94,8 @@
 <script lang="ts">
 import { Component, Prop } from "vue-property-decorator";
 import { mixins } from "vue-class-component";
+import { CONFIG } from "@/graphql/config";
+import { IConfig } from "@/types/config.model";
 import { IPerson } from "../../types/actor";
 import { IDENTITIES, REGISTER_PERSON } from "../../graphql/actor";
 import { MOBILIZON_INSTANCE_HOST } from "../../api/_entrypoint";
@@ -99,13 +103,19 @@ import RouteName from "../../router/name";
 import { changeIdentity } from "../../utils/auth";
 import identityEditionMixin from "../../mixins/identityEdition";
 
-@Component
+@Component({
+  apollo: {
+    config: CONFIG,
+  },
+})
 export default class Register extends mixins(identityEditionMixin) {
   @Prop({ type: String, required: true }) email!: string;
 
   @Prop({ type: Boolean, required: false, default: false })
   userAlreadyActivated!: boolean;
 
+  config!: IConfig;
+
   host?: string = MOBILIZON_INSTANCE_HOST;
 
   errors: Record<string, unknown> = {};
diff --git a/js/src/views/User/Register.vue b/js/src/views/User/Register.vue
index 07be3dcb0..63da0155d 100644
--- a/js/src/views/User/Register.vue
+++ b/js/src/views/User/Register.vue
@@ -156,7 +156,9 @@ import AuthProviders from "../../components/User/AuthProviders.vue";
   metaInfo() {
     return {
       // if no subcomponents specify a metaInfo.title, this title will be used
-      title: this.$t("Register an account on Mobilizon!") as string,
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      title: this.title,
       // all titles will be injected into this template
       titleTemplate: "%s | Mobilizon",
     };
@@ -184,6 +186,15 @@ export default class Register extends Vue {
 
   config!: IConfig;
 
+  get title(): string {
+    if (this.config) {
+      return this.$t("Register an account on {instanceName}!", {
+        instanceName: this.config.name,
+      }) as string;
+    }
+    return "";
+  }
+
   async submit(): Promise<void> {
     this.sendingForm = true;
     this.credentials.locale = this.$i18n.locale;