Actually save the settings

(cherry picked from commit 75d3b346ac)

imports/NeoChat/Page/SettingsPage.qml

@@ -22,29 +22,44 @@ Kirigami.ScrollablePage {
             Kirigami.FormData.label: i18n("Notifications and events:")
             text: i18n("Show notifications")
             checked: Config.showNotifications
-            onToggled: Config.showNotifications = checked
+            onToggled: {
+                Config.showNotifications = checked
+                Config.save()
+            }
         }
         QQC2.CheckBox {
             text: i18n("Show leave and join events")
             checked: Config.showLeaveJoinEvent
-            onToggled: Config.showLeaveJoinEvent = checked
+            onToggled: {
+                Config.showLeaveJoinEvent = checked
+                Config.save()
+            }
         }
         QQC2.RadioButton {
             Kirigami.FormData.label: i18n("Rooms and private chats:")
             text: i18n("Separated")
             checked: !Config.mergeRoomList
-            onToggled: Config.mergeRoomList = false
+            onToggled: {
+                Config.mergeRoomList = false
+                Config.save()
+            }
         }
         QQC2.RadioButton {
             text: i18n("Intermixed")
             checked: Config.mergeRoomList
-            onToggled: Config.mergeRoomList = true
+            onToggled: {
+                Config.mergeRoomList = true
+                Config.save()
+            }
         }
         QQC2.CheckBox {
             Kirigami.FormData.label: i18n("Timeline:")
             text: i18n("Show User Avatar")
             checked: Config.showAvatarInTimeline
-            onToggled: Config.showAvatarInTimeline = checked
+            onToggled: {
+                Config.showAvatarInTimeline = checked
+                Config.save()
+            }
         }
     }
 }

neochat.notifyrc

@@ -22,6 +22,7 @@ Name[sl]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 DesktopEntry=org.kde.neochat
 Comment=IM client for the Matrix protocol
 Comment[ca]=Client de MI per al protocol Matrix
@@ -44,6 +45,7 @@ Comment[sl]=Odjemalec neposrednega sporočanja po protokolu Matrix
 Comment[sv]=Direktmeddelandeklient för protokollet Matrix
 Comment[uk]=Клієнт служби миттєвого обміну повідомленнями для протоколу Matrix
 Comment[x-test]=xxIM client for the Matrix protocolxx
+Comment[zh_CN]=为 Matrix 协议打造的 IM 客户端
 
 [Event/message]
 Name=New message
@@ -67,6 +69,7 @@ Name[sl]=Novo sporočilo
 Name[sv]=Nytt meddelande
 Name[uk]=Нове повідомлення
 Name[x-test]=xxNew messagexx
+Name[zh_CN]=新消息
 Comment=There is a new message
 Comment[ca]=Hi ha un missatge nou
 Comment[ca@valencia]=Hi ha un missatge nou
@@ -88,4 +91,5 @@ Comment[sl]=Prišlo je novo sporočilo
 Comment[sv]=Det finns ett nytt meddelande
 Comment[uk]=Надійшло нове повідомлення
 Comment[x-test]=xxThere is a new messagexx
+Comment[zh_CN]=有新消息
 Action=Popup

org.kde.neochat.appdata.xml

@@ -15,6 +15,7 @@
   <name xml:lang="fi">Neochat</name>
   <name xml:lang="fr">Neochat</name>
   <name xml:lang="hu">Neochat</name>
+  <name xml:lang="id">Neochat</name>
   <name xml:lang="it">Neochat</name>
   <name xml:lang="nl">Neochat</name>
   <name xml:lang="nn">Neochat</name>
@@ -36,6 +37,7 @@
   <summary xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle</summary>
   <summary xml:lang="fr">Un client pour « Matrix », le protocole décentralisé de communications.</summary>
   <summary xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz</summary>
+  <summary xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi</summary>
   <summary xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato</summary>
   <summary xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol</summary>
   <summary xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen</summary>
@@ -58,6 +60,7 @@
     <p xml:lang="fi">Asiakas Matrixille, hajautetulle viestintäyhteyskäytännölle.</p>
     <p xml:lang="fr">Un client « Matrix », le protocole décentralisé de communications.</p>
     <p xml:lang="hu">Kliens a matrixhoz, a decentralizált kommunikációs protokollhoz.</p>
+    <p xml:lang="id">Klien untuk matrix, protokol komunikasi terdesentralisasi.</p>
     <p xml:lang="it">Un client per matrix, il protocollo di comunicazione decentralizzato.</p>
     <p xml:lang="nl">Een client voor matrix, het gedecentraliseerde communicatieprotocol.</p>
     <p xml:lang="nn">Ein klient for Matrix, den desentraliserte lynmeldings­protokollen.</p>
@@ -85,6 +88,7 @@
   <developer_name xml:lang="fi">KDE-yhteisö</developer_name>
   <developer_name xml:lang="fr">La communauté de KDE</developer_name>
   <developer_name xml:lang="hu">A KDE Közösség</developer_name>
+  <developer_name xml:lang="id">Komunitas KDE</developer_name>
   <developer_name xml:lang="it">La comunità KDE</developer_name>
   <developer_name xml:lang="nl">De KDE gemeenschap</developer_name>
   <developer_name xml:lang="nn">KDE-fellesskapet</developer_name>

org.kde.neochat.desktop

@@ -21,6 +21,7 @@ Name[sl]=Neochat
 Name[sv]=Neochat
 Name[uk]=Neochat
 Name[x-test]=xxNeochatxx
+Name[zh_CN]=Neochat
 GenericName=Matrix Client
 GenericName[ca]=Client del Matrix
 GenericName[ca@valencia]=Client del Matrix
@@ -42,6 +43,7 @@ GenericName[sl]=Odjemalec Matrix
 GenericName[sv]=Matrix-klient
 GenericName[uk]=Клієнт Matrix
 GenericName[x-test]=xxMatrix Clientxx
+GenericName[zh_CN]=Matrix 客户端
 Comment=Client for the Matrix protocol
 Comment[ca]=Client per al protocol Matrix
 Comment[ca@valencia]=Client per al protocol Matrix
@@ -63,6 +65,7 @@ Comment[sl]=Odjemalec za protokol Matrix
 Comment[sv]=Klient för protokollet Matrix
 Comment[uk]=Клієнт протоколу Matrix
 Comment[x-test]=xxClient for the Matrix protocolxx
+Comment[zh_CN]=为 Matrix 协议打造的客户端
 Exec=neochat
 Terminal=false
 Icon=org.kde.neochat

src/controller.cpp

@@ -105,7 +105,7 @@ void Controller::loginWithCredentials(const QString &serverAddr, const QString &
     }
 
     auto conn = new Connection(this);
-    const QUrl serverUrl = QUrl(serverAddr);
+    const QUrl serverUrl = QUrl::fromUserInput(serverAddr);
     // we are using a fake mixd since resolveServer just set the homeserver url :sigh:
     conn->resolveServer("@username:" + serverUrl.host() + ":" + QString::number(serverUrl.port(443)));
 

src/messageeventmodel.cpp

@@ -90,6 +90,9 @@ void MessageEventModel::setRoom(NeoChatRoom *room)
     m_currentRoom = room;
     if (room) {
         room->setDisplayed();
+        if (m_currentRoom->timelineSize() < 10) {
+            room->getPreviousContent(50);
+        }
         lastReadEventId = room->readMarkerEventId();
 
         using namespace Quotient;

src/neochatroom.cpp

@@ -161,7 +161,7 @@ const RoomMessageEvent *NeoChatRoom::lastEvent(bool ignoreStateEvent) const
 QString NeoChatRoom::lastEventToString() const
 {
     if (auto event = lastEvent()) {
-        return user(event->senderId())->displayname() + (event->isStateEvent() ? " " : ": ") + eventToString(*event);
+        return user(event->senderId())->displayname(this) + (event->isStateEvent() ? " " : ": ") + eventToString(*event);
     }
     return QLatin1String("");
 }