diff --git a/qml/components/PollPreview.qml b/qml/components/PollPreview.qml index c10e10b..79d5689 100644 --- a/qml/components/PollPreview.qml +++ b/qml/components/PollPreview.qml @@ -178,7 +178,7 @@ Item { Label { id: optionVoterPercentage font.pixelSize: Theme.fontSizeTiny - text: qsTr("%Ln\%", "% of votes for option").arg(modelData.vote_percentage) + text: qsTr("%Ln\%", "% of votes for option", modelData.vote_percentage) horizontalAlignment: Text.AlignRight anchors { right: parent.right @@ -226,7 +226,7 @@ Item { id: totalVoterCount font.pixelSize: Theme.fontSizeTiny anchors.verticalCenter: parent.verticalCenter - text: qsTr("%Ln vote(s) total", "number of total votes", pollData.total_voter_count).arg(pollData.total_voter_count) + text: qsTr("%Ln vote(s) total", "number of total votes", pollData.total_voter_count) width: contentWidth height: contentHeight horizontalAlignment: Text.AlignRight diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml index f4dce0f..ae38046 100644 --- a/qml/pages/ChatPage.qml +++ b/qml/pages/ChatPage.qml @@ -67,7 +67,7 @@ Page { } PropertyChanges { target: chatStatusText - text: qsTr("%Ln messages selected", "number of messages selected", chatPage.selectedMessages.length).arg(chatPage.selectedMessages.length) + text: qsTr("%Ln messages selected", "number of messages selected", chatPage.selectedMessages.length) } PropertyChanges { target: selectedMessagesActions diff --git a/qml/pages/PollCreationPage.qml b/qml/pages/PollCreationPage.qml index 5a365d0..029ef34 100644 --- a/qml/pages/PollCreationPage.qml +++ b/qml/pages/PollCreationPage.qml @@ -193,7 +193,7 @@ Dialog { placeholderText: qsTr("Enter your question here") property int charactersLeft: 255 - text.length color: charactersLeft < 0 ? Theme.errorColor : Theme.highlightColor - label: qsTr("Question (%Ln characters left)", "", charactersLeft).arg(charactersLeft) + label: qsTr("Question (%Ln characters left)", "", charactersLeft) wrapMode: TextEdit.Wrap onFocusChanged: { validate(); @@ -253,7 +253,7 @@ Dialog { placeholderText: qsTr("Enter an answer here") property int charactersLeft: 100 - text.length color: charactersLeft < 0 ? Theme.errorColor : Theme.highlightColor - label: qsTr("Answer (%Ln characters left)", "", charactersLeft).arg(charactersLeft) + label: qsTr("Answer (%Ln characters left)", "", charactersLeft) property bool hasNextOption: index < pollCreationPage.options.count - 1 EnterKey.onClicked: { if(hasNextOption) { diff --git a/qml/pages/PollResultsPage.qml b/qml/pages/PollResultsPage.qml index 9ebd90a..c77231b 100644 --- a/qml/pages/PollResultsPage.qml +++ b/qml/pages/PollResultsPage.qml @@ -56,7 +56,7 @@ Page { PageHeader { id: pageHeader title: pollResultsPage.isQuiz ? qsTr("Quiz Results") : qsTr("Poll Results") - description: qsTr("%Ln vote(s) total", "number of total votes", pollData.total_voter_count).arg(pollData.total_voter_count) + description: qsTr("%Ln vote(s) total", "number of total votes", pollData.total_voter_count) leftMargin: headerPictureThumbnail.width + Theme.paddingLarge + Theme.horizontalPageMargin ProfileThumbnail { id: headerPictureThumbnail @@ -205,7 +205,7 @@ Page { Label { id: optionVoterCount font.pixelSize: Theme.fontSizeTiny - text: modelData.is_chosen ? qsTr("%Ln vote(s) including yours", "number of votes for option", modelData.voter_count).arg(modelData.voter_count) : qsTr("%Ln vote(s)", "number of votes for option", modelData.voter_count).arg(modelData.voter_count) + text: modelData.is_chosen ? qsTr("%Ln vote(s) including yours", "number of votes for option", modelData.voter_count) : qsTr("%Ln vote(s)", "number of votes for option", modelData.voter_count) anchors { left: parent.left right: parent.horizontalCenter @@ -216,7 +216,7 @@ Page { Label { id: optionVoterPercentage font.pixelSize: Theme.fontSizeTiny - text: qsTr("%Ln\%", "% of votes for option").arg(modelData.vote_percentage) + text: qsTr("%Ln\%", "% of votes for option", modelData.vote_percentage) horizontalAlignment: Text.AlignRight anchors { right: parent.right diff --git a/src/notificationmanager.cpp b/src/notificationmanager.cpp index b73feee..e499636 100644 --- a/src/notificationmanager.cpp +++ b/src/notificationmanager.cpp @@ -371,7 +371,7 @@ void NotificationManager::publishNotification(const NotificationGroup *notificat } else { // Either we have more than one notification or we have no content to display LOG("Group" << notificationGroup->notificationGroupId << "has" << notificationGroup->totalCount << "notifications"); - notificationBody = tr("%Ln unread messages", "", notificationGroup->totalCount).arg(notificationGroup->totalCount); + notificationBody = tr("%Ln unread messages", "", notificationGroup->totalCount); } nemoNotification->setBody(notificationBody);