AlphaX/qortal-ui
1
0
Fork 0
forked from Qortal/qortal-ui
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #109 from JustinWesleyFerrari/feature/show-reaction-names

Browse Source 
Fixed translations for message reactions
This commit is contained in:
AlphaX-Projects 2023-01-28 08:40:44 +01:00 committed by GitHub
commit d6f7e71b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qortal-ui-core/language/us.json
View File

@ -574,7 +574,11 @@
"cchange65": "Please enter a recipient", "cchange65": "Please enter a recipient",
"cchange66": "Cannot fetch replied-to message. Message is too old.", "cchange66": "Cannot fetch replied-to message. Message is too old.",
"cchange68": "edited", "cchange68": "edited",
"cchange69": "Auto-show images" "cchange69": "Auto-show images",
"cchange71": "and",
"cchange72": "other",
"cchange73": "s",
"cchange74": "reacted with"
}, },
"welcomepage": { "welcomepage": {
"wcchange1": "Welcome to Q-Chat", "wcchange1": "Welcome to Q-Chat",
@ -882,4 +886,4 @@
"inf15": "Active Auto Buy Orders", "inf15": "Active Auto Buy Orders",
"inf16": "Auto Buy" "inf16": "Auto Buy"
} }
} }

12
qortal-ui-plugins/plugins/core/components/ChatScroller.js
View File

@ -720,7 +720,7 @@ class MessageTemplate extends LitElement {
${reaction.users[2].name ${reaction.users[2].name
? reaction.users[2].name ? reaction.users[2].name
: cropAddress(reaction.users[2].address)} : cropAddress(reaction.users[2].address)}
and ${reaction.users.length - 3} other${(reaction.users.length - 3) > 1 ? "s" : ""} reacted with ${reaction.type}` ${get("chatpage.cchange71")} ${reaction.users.length - 3} ${get("chatpage.cchange72")}${(reaction.users.length - 3) > 1 ? html`${get("chatpage.cchange73")}` : ""} ${get("chatpage.cchange74")} ${reaction.type}`
) : reaction.users.length === 3 ? ) : reaction.users.length === 3 ?
( (
`${reaction.users[0].name `${reaction.users[0].name
@ -729,24 +729,24 @@ class MessageTemplate extends LitElement {
${reaction.users[1].name ${reaction.users[1].name
? reaction.users[1].name ? reaction.users[1].name
: cropAddress(reaction.users[1].address)} : cropAddress(reaction.users[1].address)}
and ${get("chatpage.cchange71")}
${reaction.users[2].name ${reaction.users[2].name
? reaction.users[2].name ? reaction.users[2].name
: cropAddress(reaction.users[2].address)} reacted with ${reaction.type}` : cropAddress(reaction.users[2].address)} ${get("chatpage.cchange74")} ${reaction.type}`
) : reaction.users.length === 2 ? ) : reaction.users.length === 2 ?
( (
`${reaction.users[0].name `${reaction.users[0].name
? reaction.users[0].name ? reaction.users[0].name
: cropAddress(reaction.users[0].address)} : cropAddress(reaction.users[0].address)}
and ${get("chatpage.cchange71")}
${reaction.users[1].name ${reaction.users[1].name
? reaction.users[1].name ? reaction.users[1].name
: cropAddress(reaction.users[1].address)} reacted with ${reaction.type}` : cropAddress(reaction.users[1].address)} ${get("chatpage.cchange74")} ${reaction.type}`
) : reaction.users.length === 1 ? ) : reaction.users.length === 1 ?
( (
`${reaction.users[0].name `${reaction.users[0].name
? reaction.users[0].name ? reaction.users[0].name
: cropAddress(reaction.users[0].address)} reacted with ${reaction.type}` : cropAddress(reaction.users[0].address)} ${get("chatpage.cchange74")} ${reaction.type}`
) )
: "" }> : "" }>
</vaadin-tooltip> </vaadin-tooltip>