From b9119d67788cc91f5b408f32c489c0dc3ea8c08a Mon Sep 17 00:00:00 2001 From: Tenzin Passang Date: Wed, 3 Nov 2021 20:58:45 +0200 Subject: [PATCH 1/2] Button added to create room page from login --- src/assets/translations/bo.json | 4 +++- src/assets/translations/en.json | 4 +++- src/assets/translations/es.json | 4 +++- src/assets/translations/nb_NO.json | 4 +++- src/assets/translations/pt_BR.json | 4 +++- src/assets/translations/ro.json | 4 +++- src/assets/translations/ug.json | 4 +++- src/assets/translations/zh_Hans.json | 4 +++- src/components/Login.vue | 14 +++++++++++++- 9 files changed, 37 insertions(+), 9 deletions(-) diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json index 10f8284..8860079 100644 --- a/src/assets/translations/bo.json +++ b/src/assets/translations/bo.json @@ -41,7 +41,9 @@ "username": "སྤྱོད་མིང། (དཔེར་ན། marta ལྟ་བུ།)", "title": "ནང་འཛུལ།", "password_required": "གསང་ཚིག་དགོས་ཀྱི་ཡོད།", - "username_required": "སྤྱོད་མིང་དགོས་ཀྱི་ཡོད།" + "username_required": "སྤྱོད་མིང་དགོས་ཀྱི་ཡོད།", + "create_room": "Register & Create Room", + "or": "OR" }, "new_room": { "next": "རྗེས་མ།", diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json index b3b2c35..24a7bec 100644 --- a/src/assets/translations/en.json +++ b/src/assets/translations/en.json @@ -108,7 +108,9 @@ "password": "Enter Password", "username_required": "Username is required", "password_required": "Password is required", - "login": "Login" + "login": "Login", + "create_room": "Register & Create Room", + "or": "OR" }, "profile": { "title": "My Profile", diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json index 6e75c2c..539b900 100644 --- a/src/assets/translations/es.json +++ b/src/assets/translations/es.json @@ -70,7 +70,9 @@ "username_required": "Nombre de usuario es necesario", "password": "Contraseña", "username": "Nombre de Usuario", - "title": "Iniciar sesión" + "title": "Iniciar sesión", + "create_room": "Register & Create Room", + "or": "OR" }, "device_list": { "not_verified": "No ha sido Verificado", diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json index c98fbc1..baece30 100644 --- a/src/assets/translations/nb_NO.json +++ b/src/assets/translations/nb_NO.json @@ -92,7 +92,9 @@ "password_required": "Passord kreves", "username_required": "Brukernavn kreves", "password": "Passord", - "username": "Brukernavn" + "username": "Brukernavn", + "create_room": "Register & Create Room", + "or": "OR" }, "new_room": { "add_people": "Legg til folk", diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json index c47270d..7e4532b 100644 --- a/src/assets/translations/pt_BR.json +++ b/src/assets/translations/pt_BR.json @@ -121,7 +121,9 @@ "password": "Digite a senha", "username_required": "É obrigatório um nome de usuário", "password_required": "A senha é obrigatória", - "login": "Entrar" + "login": "Entrar", + "create_room": "Register & Create Room", + "or": "OR" }, "profile": { "title": "Meu perfil", diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json index b220aff..409ba6b 100644 --- a/src/assets/translations/ro.json +++ b/src/assets/translations/ro.json @@ -124,7 +124,9 @@ "username_required": "Numele de utilizator este necesar", "password": "Introduceți Parola", "username": "Nume utilizator (ex: marta)", - "title": "Autentificare" + "title": "Autentificare", + "create_room": "Register & Create Room", + "or": "OR" }, "device_list": { "not_verified": "Nu a fost verificat", diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json index 16066e1..27907b8 100644 --- a/src/assets/translations/ug.json +++ b/src/assets/translations/ug.json @@ -210,7 +210,9 @@ "username_required": "قوللانغۇچى ئىسمى تەلەپ قىلىنىدۇ", "password": "پارول كىرگۈزۈڭ", "username": "قوللانغۇچى ئىسمى (مەسىلەن: marta)", - "title": "كىرىش" + "title": "كىرىش", + "create_room": "Register & Create Room", + "or": "OR" }, "device_list": { "not_verified": "دەلىللەنمىدى", diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json index 8718bad..ab1dae7 100644 --- a/src/assets/translations/zh_Hans.json +++ b/src/assets/translations/zh_Hans.json @@ -44,7 +44,9 @@ "title": "登录", "password_required": "需要密码", "username_required": "需要用户名", - "username": "用户名 (如: marta)" + "username": "用户名 (如: marta)", + "create_room": "Register & Create Room", + "or": "OR" }, "device_list": { "title": "设备", diff --git a/src/components/Login.vue b/src/components/Login.vue index b9b9c8d..7389fec 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -71,9 +71,18 @@ block @click.stop="handleLogin" :loading="loading" - class="filled-button mt-8" + class="filled-button mt-4" >{{ $t("login.login") }} +
{{ $t("login.or") }}
+ {{ $t("login.create_room") }} @@ -185,6 +194,9 @@ export default { ); } }, + handleCreateRoom() { + this.$navigation.push({ name: "CreateRoom" }); + }, }, }; From 2b496ffa86d709a38baa4a9a9ebf28ec804973c5 Mon Sep 17 00:00:00 2001 From: Tenzin Passang Date: Thu, 4 Nov 2021 21:18:55 +0200 Subject: [PATCH 2/2] Empty string for untranslated word --- src/assets/translations/bo.json | 4 ++-- src/assets/translations/es.json | 4 ++-- src/assets/translations/nb_NO.json | 4 ++-- src/assets/translations/pt_BR.json | 4 ++-- src/assets/translations/ro.json | 4 ++-- src/assets/translations/ug.json | 4 ++-- src/assets/translations/zh_Hans.json | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/assets/translations/bo.json b/src/assets/translations/bo.json index 8860079..f7f85ea 100644 --- a/src/assets/translations/bo.json +++ b/src/assets/translations/bo.json @@ -42,8 +42,8 @@ "title": "ནང་འཛུལ།", "password_required": "གསང་ཚིག་དགོས་ཀྱི་ཡོད།", "username_required": "སྤྱོད་མིང་དགོས་ཀྱི་ཡོད།", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "new_room": { "next": "རྗེས་མ།", diff --git a/src/assets/translations/es.json b/src/assets/translations/es.json index 539b900..a0091f0 100644 --- a/src/assets/translations/es.json +++ b/src/assets/translations/es.json @@ -71,8 +71,8 @@ "password": "Contraseña", "username": "Nombre de Usuario", "title": "Iniciar sesión", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "device_list": { "not_verified": "No ha sido Verificado", diff --git a/src/assets/translations/nb_NO.json b/src/assets/translations/nb_NO.json index baece30..17d35d1 100644 --- a/src/assets/translations/nb_NO.json +++ b/src/assets/translations/nb_NO.json @@ -93,8 +93,8 @@ "username_required": "Brukernavn kreves", "password": "Passord", "username": "Brukernavn", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "new_room": { "add_people": "Legg til folk", diff --git a/src/assets/translations/pt_BR.json b/src/assets/translations/pt_BR.json index 7e4532b..8d7fa86 100644 --- a/src/assets/translations/pt_BR.json +++ b/src/assets/translations/pt_BR.json @@ -122,8 +122,8 @@ "username_required": "É obrigatório um nome de usuário", "password_required": "A senha é obrigatória", "login": "Entrar", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "profile": { "title": "Meu perfil", diff --git a/src/assets/translations/ro.json b/src/assets/translations/ro.json index 409ba6b..f315819 100644 --- a/src/assets/translations/ro.json +++ b/src/assets/translations/ro.json @@ -125,8 +125,8 @@ "password": "Introduceți Parola", "username": "Nume utilizator (ex: marta)", "title": "Autentificare", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "device_list": { "not_verified": "Nu a fost verificat", diff --git a/src/assets/translations/ug.json b/src/assets/translations/ug.json index 27907b8..359f159 100644 --- a/src/assets/translations/ug.json +++ b/src/assets/translations/ug.json @@ -211,8 +211,8 @@ "password": "پارول كىرگۈزۈڭ", "username": "قوللانغۇچى ئىسمى (مەسىلەن: marta)", "title": "كىرىش", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "device_list": { "not_verified": "دەلىللەنمىدى", diff --git a/src/assets/translations/zh_Hans.json b/src/assets/translations/zh_Hans.json index ab1dae7..1e1ae4d 100644 --- a/src/assets/translations/zh_Hans.json +++ b/src/assets/translations/zh_Hans.json @@ -45,8 +45,8 @@ "password_required": "需要密码", "username_required": "需要用户名", "username": "用户名 (如: marta)", - "create_room": "Register & Create Room", - "or": "OR" + "create_room": "", + "or": "" }, "device_list": { "title": "设备",