From 28f19d33a0a108a5b244d1d4f3ac8dae10a2a082 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 14 Oct 2020 15:41:03 -0400
Subject: [PATCH] i18n: adaptation for lrc chatview translation
Change-Id: I9fdb6a5646e487c974fe8884e36277985c48fa2a
---
src/constant/JamiStrings.qml | 31 ---------------------
src/mainview/components/MessageWebView.qml | 32 +---------------------
src/messagesadapter.h | 5 ++++
3 files changed, 6 insertions(+), 62 deletions(-)
diff --git a/src/constant/JamiStrings.qml b/src/constant/JamiStrings.qml
index 21ef1fd77..02b028da7 100644
--- a/src/constant/JamiStrings.qml
+++ b/src/constant/JamiStrings.qml
@@ -387,35 +387,4 @@ Item {
// Generic dialog options
property string optionOk: qsTr("Ok")
property string optionCancel: qsTr("Cancel")
-
- // ChatView
- property string backButtonTitle: qsTr("Hide chat view")
- property string placeCallButtonTitle: qsTr("Place video call")
- property string placeAudioCallButtonTitle: qsTr("Place audio call")
- property string addToConversationsButtonTitle: qsTr("Add to conversations")
- property string unbanButtonTitle: qsTr("Unban contact")
- property string sendButtonTitle: qsTr("Send")
- property string optionsButtonTitle: qsTr("Options")
- property string backToBottomBtnInnerHTML: qsTr("Jump to latest")
- property string sendFileButtonTitle: qsTr("Send file")
- property string videoRecordButtonTitle: qsTr("Leave video message")
- property string audioRecordButtonTitle: qsTr("Leave audio message")
- property string acceptButtonTitle: qsTr("Accept")
- property string refuseButtonTitle: qsTr("Refuse")
- property string blockButtonTitle: qsTr("Block")
- property string messageBarInputPlaceholder: qsTr("Type a message")
- property string placeHolderTemporaryContact: qsTr("Note: an interaction will create a new contact.")
- property string isNotInYourContacts: qsTr("is not in your contacts")
- property string automaticallyAcceptInvitation: qsTr("Note: you can automatically accept this invitation by sending a message.")
- property string daysAgo: qsTr("{0} days ago")
- property string oneDayAgo: qsTr("one day ago")
- property string hoursAgo: qsTr("{0} hours ago")
- property string oneHourAgo: qsTr("one hour ago")
- property string minutesAgo: qsTr("{0} minutes ago")
- property string justNow: qsTr("just now")
- property string failureString: qsTr("Failure")
- property string acceptString: qsTr("Accept")
- property string refuseString: qsTr("Refuse")
- property string deleteString: qsTr("Delete")
- property string retryString: qsTr("Retry")
}
diff --git a/src/mainview/components/MessageWebView.qml b/src/mainview/components/MessageWebView.qml
index ec563819b..0a35109fe 100644
--- a/src/mainview/components/MessageWebView.qml
+++ b/src/mainview/components/MessageWebView.qml
@@ -193,37 +193,7 @@ Rectangle {
}
function parseI18nData() {
- return {
- ["backButtonTitle"] : JamiStrings.backButtonTitle,
- ["placeCallButtonTitle"] : JamiStrings.placeCallButtonTitle,
- ["placeAudioCallButtonTitle"] : JamiStrings.placeAudioCallButtonTitle,
- ["addToConversationsButtonTitle"] : JamiStrings.addToConversationsButtonTitle,
- ["unbanButtonTitle"] : JamiStrings.unbanButtonTitle,
- ["sendButtonTitle"] : JamiStrings.sendButtonTitle,
- ["optionsButtonTitle"] : JamiStrings.optionsButtonTitle,
- ["backToBottomBtnInnerHTML"] : JamiStrings.backToBottomBtnInnerHTML,
- ["sendFileButtonTitle"] : JamiStrings.sendFileButtonTitle,
- ["videoRecordButtonTitle"] : JamiStrings.videoRecordButtonTitle,
- ["audioRecordButtonTitle"] : JamiStrings.audioRecordButtonTitle,
- ["acceptButtonTitle"] : JamiStrings.acceptButtonTitle,
- ["refuseButtonTitle"] : JamiStrings.refuseButtonTitle,
- ["blockButtonTitle"] : JamiStrings.blockButtonTitle,
- ["messageBarInputPlaceholder"] : JamiStrings.messageBarInputPlaceholder,
- ["placeHolderTemporaryContact"] : JamiStrings.placeHolderTemporaryContact,
- ["isNotInYourContacts"] : JamiStrings.isNotInYourContacts,
- ["automaticallyAcceptInvitation"] : JamiStrings.automaticallyAcceptInvitation,
- ["daysAgo"] : JamiStrings.daysAgo,
- ["oneDayAgo"] : JamiStrings.oneDayAgo,
- ["hoursAgo"] : JamiStrings.hoursAgo,
- ["oneHourAgo"] : JamiStrings.oneHourAgo,
- ["minutesAgo"] : JamiStrings.minutesAgo,
- ["justNow"] : JamiStrings.justNow,
- ["failureString"] : JamiStrings.failureString,
- ["acceptString"] : JamiStrings.acceptString,
- ["refuseString"] : JamiStrings.refuseString,
- ["deleteString"] : JamiStrings.deleteString,
- ["retryString"] : JamiStrings.retryString
- }
+ return MessagesAdapter.chatviewTranslatedStrings
}
}
diff --git a/src/messagesadapter.h b/src/messagesadapter.h
index 05b2611d3..39842346b 100644
--- a/src/messagesadapter.h
+++ b/src/messagesadapter.h
@@ -20,6 +20,7 @@
#include "lrcinstance.h"
#include "qmladapterbase.h"
+#include "api/chatview.h"
#include <QObject>
#include <QString>
@@ -27,6 +28,8 @@
class MessagesAdapter final : public QmlAdapterBase
{
Q_OBJECT
+ Q_PROPERTY(QVariantMap chatviewTranslatedStrings MEMBER chatviewTranslatedStrings_ CONSTANT)
+
public:
explicit MessagesAdapter(QObject* parent = 0);
~MessagesAdapter() = default;
@@ -106,6 +109,8 @@ private:
QString LastConvUid_;
QString currentConvUid_;
+ const QVariantMap chatviewTranslatedStrings_ {lrc::api::chatview::getTranslatedStrings()};
+
/*
* Interaction connections.
*/
--
GitLab