summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2022-01-29 17:30:56 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2022-01-29 17:30:56 +0100
commita0a35c8786847c123bc3fbb514077c49c34d841e (patch)
tree78f6247fbd319514d64461a13f59efa6907e6516
parentFix secrets not loading after registration (diff)
downloadnheko-a0a35c8786847c123bc3fbb514077c49c34d841e.tar.xz
keep the RegisterPage name
So we don't have to retranslate.
-rw-r--r--resources/qml/Root.qml2
-rw-r--r--resources/qml/pages/RegisterPage.qml (renamed from resources/qml/pages/RegistrationPage.qml)0
-rw-r--r--resources/qml/pages/WelcomePage.qml4
-rw-r--r--resources/res.qrc2
4 files changed, 6 insertions, 2 deletions
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml

index 1969c613..e3be440d 100644 --- a/resources/qml/Root.qml +++ b/resources/qml/Root.qml
@@ -398,7 +398,7 @@ Pane { Component { id: registerPage - RegistrationPage { + RegisterPage { } } diff --git a/resources/qml/pages/RegistrationPage.qml b/resources/qml/pages/RegisterPage.qml
index 44836ccb..44836ccb 100644 --- a/resources/qml/pages/RegistrationPage.qml +++ b/resources/qml/pages/RegisterPage.qml
diff --git a/resources/qml/pages/WelcomePage.qml b/resources/qml/pages/WelcomePage.qml
index 627d8b1c..e1ecc31d 100644 --- a/resources/qml/pages/WelcomePage.qml +++ b/resources/qml/pages/WelcomePage.qml
@@ -1,3 +1,7 @@ +// SPDX-FileCopyrightText: 2022 Nheko Contributors +// +// SPDX-License-Identifier: GPL-3.0-or-later + import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.2 diff --git a/resources/res.qrc b/resources/res.qrc
index f7f2a796..5b49d596 100644 --- a/resources/res.qrc +++ b/resources/res.qrc
@@ -112,7 +112,7 @@ <file>qml/pages/UserSettingsPage.qml</file> <file>qml/pages/WelcomePage.qml</file> <file>qml/pages/LoginPage.qml</file> - <file>qml/pages/RegistrationPage.qml</file> + <file>qml/pages/RegisterPage.qml</file> <file>qml/components/AdaptiveLayout.qml</file> <file>qml/components/AdaptiveLayoutElement.qml</file> <file>qml/components/AvatarListTile.qml</file>