Commit 0e222e16 authored by Luigi Toscano's avatar Luigi Toscano
Browse files

google resource: fix singular/plural order in i18ncp

According the i18ncp signature, the singular form comes first
after the context, followed by the plural form.
Fix the order in a few i18ncp calls.
parent 39fd7d3c
...@@ -248,7 +248,7 @@ void CalendarHandler::itemChanged(const Item &item, const QSet< QByteArray > & / ...@@ -248,7 +248,7 @@ void CalendarHandler::itemChanged(const Item &item, const QSet< QByteArray > & /
void CalendarHandler::itemsRemoved(const Item::List &items) void CalendarHandler::itemsRemoved(const Item::List &items)
{ {
m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Removing %1 events", "Removing %1 event", items.count())); m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Removing %1 event", "Removing %1 events", items.count()));
QStringList eventIds; QStringList eventIds;
eventIds.reserve(items.count()); eventIds.reserve(items.count());
std::transform(items.cbegin(), items.cend(), std::back_inserter(eventIds), std::transform(items.cbegin(), items.cend(), std::back_inserter(eventIds),
...@@ -263,8 +263,8 @@ void CalendarHandler::itemsRemoved(const Item::List &items) ...@@ -263,8 +263,8 @@ void CalendarHandler::itemsRemoved(const Item::List &items)
void CalendarHandler::itemsMoved(const Item::List &items, const Collection &collectionSource, const Collection &collectionDestination) void CalendarHandler::itemsMoved(const Item::List &items, const Collection &collectionSource, const Collection &collectionDestination)
{ {
m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Moving %1 events from calendar '%2' to calendar '%3'", m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Moving %1 event from calendar '%2' to calendar '%3'",
"Moving %1 event from calendar '%2' to calendar '%3'", "Moving %1 events from calendar '%2' to calendar '%3'",
items.count(), collectionSource.displayName(), collectionDestination.displayName())); items.count(), collectionSource.displayName(), collectionDestination.displayName()));
QStringList eventIds; QStringList eventIds;
eventIds.reserve(items.count()); eventIds.reserve(items.count());
......
...@@ -262,8 +262,8 @@ void ContactHandler::retrieveContactsPhotos(const QVariant &argument) ...@@ -262,8 +262,8 @@ void ContactHandler::retrieveContactsPhotos(const QVariant &argument)
const auto map = argument.value<QVariantMap>(); const auto map = argument.value<QVariantMap>();
const auto collection = map[QStringLiteral("collection")].value<Collection>(); const auto collection = map[QStringLiteral("collection")].value<Collection>();
const auto changedPhotos = map[QStringLiteral("modified")].toStringList(); const auto changedPhotos = map[QStringLiteral("modified")].toStringList();
m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Retrieving %1 contacts photos for group '%2'", m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Retrieving %1 contact photo for group '%2'",
"Retrieving %1 contact photo for group '%2'", "Retrieving %1 contact photos for group '%2'",
changedPhotos.count(), collection.displayName())); changedPhotos.count(), collection.displayName()));
Item::List items; Item::List items;
...@@ -356,7 +356,7 @@ void ContactHandler::itemChanged(const Item &item, const QSet< QByteArray > & /* ...@@ -356,7 +356,7 @@ void ContactHandler::itemChanged(const Item &item, const QSet< QByteArray > & /*
void ContactHandler::itemsRemoved(const Item::List &items) void ContactHandler::itemsRemoved(const Item::List &items)
{ {
m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Removing %1 contacts", "Removing %1 contact", items.count())); m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Removing %1 contact", "Removing %1 contacts", items.count()));
QStringList contactIds; QStringList contactIds;
contactIds.reserve(items.count()); contactIds.reserve(items.count());
std::transform(items.cbegin(), items.cend(), std::back_inserter(contactIds), std::transform(items.cbegin(), items.cend(), std::back_inserter(contactIds),
...@@ -377,8 +377,8 @@ void ContactHandler::itemsMoved(const Item::List &items, const Collection &colle ...@@ -377,8 +377,8 @@ void ContactHandler::itemsMoved(const Item::List &items, const Collection &colle
m_iface->cancelTask(i18n("Invalid source or destination collection")); m_iface->cancelTask(i18n("Invalid source or destination collection"));
} }
m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Moving %1 contacts from group '%2' to '%3'", m_iface->emitStatus(AgentBase::Running, i18ncp("@info:status", "Moving %1 contact from group '%2' to '%3'",
"Moving %1 contact from group '%2' to '%3'", "Moving %1 contacts from group '%2' to '%3'",
items.count(), collectionSource.remoteId(), collectionDestination.remoteId())); items.count(), collectionSource.remoteId(), collectionDestination.remoteId()));
ContactsList contacts; ContactsList contacts;
contacts.reserve(items.count()); contacts.reserve(items.count());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment