From 7fb1cdf2cfbe21fb5d37dea13b4f9dc0bcff54b5 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Mon, 23 Sep 2019 10:26:38 +0200
Subject: [PATCH] Various fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 config/config.exs                 | 4 ++--
 js/src/views/Account/Register.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/config.exs b/config/config.exs
index 9d19f5b02..be2bc7cca 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -21,8 +21,8 @@ config :mobilizon, :instance,
   upload_limit: 16_000_000,
   avatar_upload_limit: 2_000_000,
   banner_upload_limit: 4_000_000,
-  email_from: "noreply@localhost",
-  email_reply_to: "noreply@localhost"
+  email_from: System.get_env("MOBILIZON_INSTANCE_EMAIL") || "noreply@localhost",
+  email_reply_to: System.get_env("MOBILIZON_INSTANCE_EMAIL") || "noreply@localhost"
 
 config :mime, :types, %{
   "application/activity+json" => ["activity-json"],
diff --git a/js/src/views/Account/Register.vue b/js/src/views/Account/Register.vue
index 48ed7e584..b11454078 100644
--- a/js/src/views/Account/Register.vue
+++ b/js/src/views/Account/Register.vue
@@ -13,7 +13,7 @@
           <div class="column">
             <form v-if="!validationSent">
               <b-field
-                :label="t('Username')"
+                :label="$t('Username')"
                 :type="errors.preferred_username ? 'is-danger' : null"
                 :message="errors.preferred_username"
               >