medvedych/harbour-fernschreiber
2
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

remove unnecessary .arg (+warnings)

Browse source
This commit is contained in:
John Gibbon 2020-11-19 09:32:05 +01:00
parent b48ca728d2
commit 8181e17fa2
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qml/components/PollPreview.qml
View file

@ -178,7 +178,7 @@ Item {
Label { Label {
id: optionVoterPercentage id: optionVoterPercentage
font.pixelSize: Theme.fontSizeTiny 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 horizontalAlignment: Text.AlignRight
anchors { anchors {
right: parent.right right: parent.right
@ -226,7 +226,7 @@ Item {
id: totalVoterCount id: totalVoterCount
font.pixelSize: Theme.fontSizeTiny font.pixelSize: Theme.fontSizeTiny
anchors.verticalCenter: parent.verticalCenter 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 width: contentWidth
height: contentHeight height: contentHeight
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight

2
qml/pages/ChatPage.qml
View file

@ -67,7 +67,7 @@ Page {
} }
PropertyChanges { PropertyChanges {
target: chatStatusText 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 { PropertyChanges {
target: selectedMessagesActions target: selectedMessagesActions

4
qml/pages/PollCreationPage.qml
View file

@ -193,7 +193,7 @@ Dialog {
placeholderText: qsTr("Enter your question here") placeholderText: qsTr("Enter your question here")
property int charactersLeft: 255 - text.length property int charactersLeft: 255 - text.length
color: charactersLeft < 0 ? Theme.errorColor : Theme.highlightColor 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 wrapMode: TextEdit.Wrap
onFocusChanged: { onFocusChanged: {
validate(); validate();
@ -253,7 +253,7 @@ Dialog {
placeholderText: qsTr("Enter an answer here") placeholderText: qsTr("Enter an answer here")
property int charactersLeft: 100 - text.length property int charactersLeft: 100 - text.length
color: charactersLeft < 0 ? Theme.errorColor : Theme.highlightColor 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 property bool hasNextOption: index < pollCreationPage.options.count - 1
EnterKey.onClicked: { EnterKey.onClicked: {
if(hasNextOption) { if(hasNextOption) {

6
qml/pages/PollResultsPage.qml
View file

@ -56,7 +56,7 @@ Page {
PageHeader { PageHeader {
id: pageHeader id: pageHeader
title: pollResultsPage.isQuiz ? qsTr("Quiz Results") : qsTr("Poll Results") 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 leftMargin: headerPictureThumbnail.width + Theme.paddingLarge + Theme.horizontalPageMargin
ProfileThumbnail { ProfileThumbnail {
id: headerPictureThumbnail id: headerPictureThumbnail
@ -205,7 +205,7 @@ Page {
Label { Label {
id: optionVoterCount id: optionVoterCount
font.pixelSize: Theme.fontSizeTiny 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 { anchors {
left: parent.left left: parent.left
right: parent.horizontalCenter right: parent.horizontalCenter
@ -216,7 +216,7 @@ Page {
Label { Label {
id: optionVoterPercentage id: optionVoterPercentage
font.pixelSize: Theme.fontSizeTiny 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 horizontalAlignment: Text.AlignRight
anchors { anchors {
right: parent.right right: parent.right

2
src/notificationmanager.cpp
View file

@ -371,7 +371,7 @@ void NotificationManager::publishNotification(const NotificationGroup *notificat
} else { } else {
// Either we have more than one notification or we have no content to display // Either we have more than one notification or we have no content to display
LOG("Group" << notificationGroup->notificationGroupId << "has" << notificationGroup->totalCount << "notifications"); 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); nemoNotification->setBody(notificationBody);