Add utils.commaAndJoin() for "a, b and c" strings

2021-01-17 11:46:19 -04:00
parent 661ca47430
commit 6184f1cfa5
2 changed files with 11 additions and 4 deletions
--- a/src/gui/Pages/Chat/TypingMembersBar.qml
+++ b/src/gui/Pages/Chat/TypingMembersBar.qml
@@ -13,11 +13,8 @@ InfoBar {
    label.textFormat: Text.StyledText
    label.text: {
        const tm = typingMembers
-
        if (tm.length === 0) return ""
        if (tm.length === 1) return qsTr("%1 is typing...").arg(tm[0])
-
-        return qsTr("%1 and %2 are typing...")
-               .arg(tm.slice(0, -1).join(", ")).arg(tm.slice(-1)[0])
+        return qsTr("%1 are typing...").arg(utils.commaAndJoin(tm))
    }
 }