Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
28f19d33
Commit
28f19d33
authored
4 years ago
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
i18n: adaptation for lrc chatview translation
Change-Id: I9fdb6a5646e487c974fe8884e36277985c48fa2a
parent
6f762a89
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/constant/JamiStrings.qml
+0
-31
0 additions, 31 deletions
src/constant/JamiStrings.qml
src/mainview/components/MessageWebView.qml
+1
-31
1 addition, 31 deletions
src/mainview/components/MessageWebView.qml
src/messagesadapter.h
+5
-0
5 additions, 0 deletions
src/messagesadapter.h
with
6 additions
and
62 deletions
src/constant/JamiStrings.qml
+
0
−
31
View file @
28f19d33
...
@@ -387,35 +387,4 @@ Item {
...
@@ -387,35 +387,4 @@ Item {
// Generic dialog options
// Generic dialog options
property
string
optionOk
:
qsTr
(
"
Ok
"
)
property
string
optionOk
:
qsTr
(
"
Ok
"
)
property
string
optionCancel
:
qsTr
(
"
Cancel
"
)
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
"
)
}
}
This diff is collapsed.
Click to expand it.
src/mainview/components/MessageWebView.qml
+
1
−
31
View file @
28f19d33
...
@@ -193,37 +193,7 @@ Rectangle {
...
@@ -193,37 +193,7 @@ Rectangle {
}
}
function
parseI18nData
()
{
function
parseI18nData
()
{
return
{
return
MessagesAdapter
.
chatviewTranslatedStrings
[
"
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
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
src/messagesadapter.h
+
5
−
0
View file @
28f19d33
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
#include
"lrcinstance.h"
#include
"lrcinstance.h"
#include
"qmladapterbase.h"
#include
"qmladapterbase.h"
#include
"api/chatview.h"
#include
<QObject>
#include
<QObject>
#include
<QString>
#include
<QString>
...
@@ -27,6 +28,8 @@
...
@@ -27,6 +28,8 @@
class
MessagesAdapter
final
:
public
QmlAdapterBase
class
MessagesAdapter
final
:
public
QmlAdapterBase
{
{
Q_OBJECT
Q_OBJECT
Q_PROPERTY
(
QVariantMap
chatviewTranslatedStrings
MEMBER
chatviewTranslatedStrings_
CONSTANT
)
public:
public:
explicit
MessagesAdapter
(
QObject
*
parent
=
0
);
explicit
MessagesAdapter
(
QObject
*
parent
=
0
);
~
MessagesAdapter
()
=
default
;
~
MessagesAdapter
()
=
default
;
...
@@ -106,6 +109,8 @@ private:
...
@@ -106,6 +109,8 @@ private:
QString
LastConvUid_
;
QString
LastConvUid_
;
QString
currentConvUid_
;
QString
currentConvUid_
;
const
QVariantMap
chatviewTranslatedStrings_
{
lrc
::
api
::
chatview
::
getTranslatedStrings
()};
/*
/*
* Interaction connections.
* Interaction connections.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment