From a04795d723e695a23eb15c1abb7b7a5407d4686b Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 8 Nov 2018 16:12:05 +0100
Subject: Display OAuth login on login form button.

---
 src/i18n/de.json | 1 +
 src/i18n/en.json | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/i18n')

diff --git a/src/i18n/de.json b/src/i18n/de.json
index 4e742bad..2cbd3e51 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -12,6 +12,7 @@
   },
   "login": {
     "login": "Anmelden",
+    "login_token": "Mit OAuth anmelden",
     "logout": "Abmelden",
     "password": "Passwort",
     "placeholder": "z.B. lain",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 8963e479..d10fa620 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -21,6 +21,7 @@
   },
   "login": {
     "login": "Log in",
+    "login_token": "Log in with OAuth",
     "logout": "Log out",
     "password": "Password",
     "placeholder": "e.g. lain",
-- 
cgit v1.2.3-70-g09d2


From 1de382f0265c61b7747795783ffb5185270cd3b1 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 8 Nov 2018 19:27:19 +0100
Subject: Put oauth text into description.

---
 src/components/login_form/login_form.vue | 5 ++++-
 src/i18n/de.json                         | 2 +-
 src/i18n/en.json                         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/i18n')

diff --git a/src/components/login_form/login_form.vue b/src/components/login_form/login_form.vue
index 0c0dcdcd..12971882 100644
--- a/src/components/login_form/login_form.vue
+++ b/src/components/login_form/login_form.vue
@@ -23,10 +23,13 @@
       </form>
 
       <form v-if="loginMethod == 'token'" v-on:submit.prevent='oAuthLogin'  class="login-form">
+        <div class="form-group">
+          <p>{{$t('login.description')}}</p>
+        </div>
         <div class='form-group'>
           <div class='login-bottom'>
             <div><router-link :to="{name: 'registration'}" v-if='registrationOpen' class='register'>{{$t('login.register')}}</router-link></div>
-            <button :disabled="loggingIn" type='submit' class='btn btn-default'>{{$t('login.login_token')}}</button>
+            <button :disabled="loggingIn" type='submit' class='btn btn-default'>{{$t('login.login')}}</button>
           </div>
         </div>
       </form>
diff --git a/src/i18n/de.json b/src/i18n/de.json
index 2cbd3e51..49179423 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -12,7 +12,7 @@
   },
   "login": {
     "login": "Anmelden",
-    "login_token": "Mit OAuth anmelden",
+    "description": "Mit OAuth anmelden",
     "logout": "Abmelden",
     "password": "Passwort",
     "placeholder": "z.B. lain",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d10fa620..036231bf 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -21,7 +21,7 @@
   },
   "login": {
     "login": "Log in",
-    "login_token": "Log in with OAuth",
+    "description": "Log in with OAuth",
     "logout": "Log out",
     "password": "Password",
     "placeholder": "e.g. lain",
-- 
cgit v1.2.3-70-g09d2