[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: [kdepimlibs] akonadi: use ki18n() instead of i18n() in a bunch of
From: Allen Winter <winter () kde ! org>
Date: 2011-11-22 17:26:04
Message-ID: 20111122172604.134D0A60B9 () git ! kde ! org
[Download RAW message or body]
Git commit 7317f408fe2cbf3362b6339ee468a4709173a720 by Allen Winter.
Committed on 22/11/2011 at 18:23.
Pushed by winterz into branch 'master'.
use ki18n() instead of i18n() in a bunch of places that needed it.
CCMAIL: kde-i18n-doc@kde.org
MERGE: none. I don't think this warrants a backport to 4.7, but I will
backport if the translators tell me to.
M +7 -1 akonadi/agentactionmanager.cpp
M +8 -8 akonadi/calendar/standardcalendaractionmanager.cpp
M +2 -1 akonadi/contact/emailaddressselectionproxymodel.cpp
M +6 -6 akonadi/contact/standardcontactactionmanager.cpp
M +9 -9 akonadi/kmime/standardmailactionmanager.cpp
M +12 -12 akonadi/standardactionmanager.cpp
http://commits.kde.org/kdepimlibs/7317f408fe2cbf3362b6339ee468a4709173a720
diff --git a/akonadi/agentactionmanager.cpp b/akonadi/agentactionmanager.cpp
index 06fa189..53845fb 100644
--- a/akonadi/agentactionmanager.cpp
+++ b/akonadi/agentactionmanager.cpp
@@ -71,7 +71,7 @@ class AgentActionManager::Private
setContextText( AgentActionManager::CreateAgentInstance, \
AgentActionManager::DialogTitle, i18nc( "@title:window", "New Agent Instance" ) );
setContextText( AgentActionManager::CreateAgentInstance, \
AgentActionManager::ErrorMessageText,
- i18n( "Could not create agent instance: %1" ) );
+ ki18n( "Could not create agent instance: %1" ) );
setContextText( AgentActionManager::CreateAgentInstance, \
AgentActionManager::ErrorMessageTitle, i18n( "Agent instance creation failed" ) );
@@ -195,6 +195,12 @@ class AgentActionManager::Private
mContextTexts[ type ].insert( context, data );
}
+ void setContextText( AgentActionManager::Type type, \
AgentActionManager::TextContext context, const KLocalizedString &data ) + {
+
+ mContextTexts[ type ].insert( context, data.toString() );
+ }
+
QString contextText( AgentActionManager::Type type, \
AgentActionManager::TextContext context ) const {
return mContextTexts[ type ].value( context );
diff --git a/akonadi/calendar/standardcalendaractionmanager.cpp \
b/akonadi/calendar/standardcalendaractionmanager.cpp index 5e01a8f..4ee8a3d 100644
--- a/akonadi/calendar/standardcalendaractionmanager.cpp
+++ b/akonadi/calendar/standardcalendaractionmanager.cpp
@@ -90,8 +90,8 @@ class StandardCalendarActionManager::Private
mGenericManager->action( Akonadi::StandardActionManager::DeleteItems \
)->setWhatsThis( i18n( "Delete the selected events from the calendar." ) );
- mGenericManager->setActionText( Akonadi::StandardActionManager::CutItems, \
ki18np(
- "Cut Event", "Cut %1 Events" ) );
+ mGenericManager->setActionText( Akonadi::StandardActionManager::CutItems,
+ ki18np( "Cut Event", "Cut %1 Events" ) );
mGenericManager->action( Akonadi::StandardActionManager::CutItems \
)->setWhatsThis( i18n( "Cut the selected events from the calendar." ) );
@@ -136,7 +136,7 @@ class StandardCalendarActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create calendar folder: %1" ) );
+ ki18n( "Could not create calendar folder: %1" ) );
mGenericManager->setContextText(
StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageTitle, @@ -153,7 +153,7 @@ class \
StandardCalendarActionManager::Private
mGenericManager->setContextText(
StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not delete calendar folder: %1" ) );
+ ki18n( "Could not delete calendar folder: %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageTitle, @@ -161,7 +161,7 @@ class \
StandardCalendarActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CollectionProperties, \
StandardActionManager::DialogTitle,
- i18nc( "@title:window", "Properties of Calendar Folder %1" ) );
+ ki18nc( "@title:window", "Properties of Calendar Folder %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteItems, StandardActionManager::MessageBoxText,
@@ -174,7 +174,7 @@ class StandardCalendarActionManager::Private
mGenericManager->setContextText(
StandardActionManager::DeleteItems, StandardActionManager::ErrorMessageText,
- i18n( "Could not delete event: %1" ) );
+ ki18n( "Could not delete event: %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteItems, \
StandardActionManager::ErrorMessageTitle, @@ -186,7 +186,7 @@ class \
StandardCalendarActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create calendar: %1" ) );
+ ki18n( "Could not create calendar: %1" ) );
mGenericManager->setContextText(
StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageTitle, @@ -203,7 +203,7 @@ class \
StandardCalendarActionManager::Private
mGenericManager->setContextText(
StandardActionManager::Paste, StandardActionManager::ErrorMessageText,
- i18n( "Could not paste event: %1" ) );
+ ki18n( "Could not paste event: %1" ) );
mGenericManager->setContextText(
StandardActionManager::Paste, StandardActionManager::ErrorMessageTitle,
diff --git a/akonadi/contact/emailaddressselectionproxymodel.cpp \
b/akonadi/contact/emailaddressselectionproxymodel.cpp index 913e8fd..d5e90e6 100644
--- a/akonadi/contact/emailaddressselectionproxymodel.cpp
+++ b/akonadi/contact/emailaddressselectionproxymodel.cpp
@@ -141,7 +141,8 @@ QVariant EmailAddressSelectionProxyModel::leafData( const \
QModelIndex &index, in } else if ( item.hasPayload<KABC::ContactGroup>() ) {
const KABC::ContactGroup group = item.payload<KABC::ContactGroup>();
if ( row >= 0 && row < (int)group.dataCount() )
- return i18nc( "Name and email address of a contact", "%1 <%2>", group.data( \
row ).name(), group.data( row ).email() ); //krazy:exclude=i18ncheckarg + \
return i18nc( "Name and email address of a contact", "%1 <%2>", + \
group.data( row ).name(), group.data( row ).email() ); }
} else if ( role == NameRole ) {
const Akonadi::Item item = index.data( ContactsTreeModel::ItemRole \
).value<Akonadi::Item>();
diff --git a/akonadi/contact/standardcontactactionmanager.cpp \
b/akonadi/contact/standardcontactactionmanager.cpp index 1120747..a6a830e 100644
--- a/akonadi/contact/standardcontactactionmanager.cpp
+++ b/akonadi/contact/standardcontactactionmanager.cpp
@@ -132,7 +132,7 @@ class StandardContactActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create address book folder: %1" ) );
+ ki18n( "Could not create address book folder: %1" ) );
mGenericManager->setContextText(
StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageTitle, @@ -148,7 +148,7 @@ class \
StandardContactActionManager::Private
mGenericManager->setContextText(
StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not delete address book folder: %1" ) );
+ ki18n( "Could not delete address book folder: %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageTitle, @@ -156,7 +156,7 @@ class \
StandardContactActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CollectionProperties, \
StandardActionManager::DialogTitle,
- i18nc( "@title:window", "Properties of Address Book Folder %1" ) );
+ ki18nc( "@title:window", "Properties of Address Book Folder %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteItems, StandardActionManager::MessageBoxText,
@@ -169,7 +169,7 @@ class StandardContactActionManager::Private
mGenericManager->setContextText(
StandardActionManager::DeleteItems, StandardActionManager::ErrorMessageText,
- i18n( "Could not delete contact: %1" ) );
+ ki18n( "Could not delete contact: %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteItems, \
StandardActionManager::ErrorMessageTitle, @@ -181,7 +181,7 @@ class \
StandardContactActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create address book: %1" ) );
+ ki18n( "Could not create address book: %1" ) );
mGenericManager->setContextText(
StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageTitle, @@ -198,7 +198,7 @@ class \
StandardContactActionManager::Private
mGenericManager->setContextText(
StandardActionManager::Paste, StandardActionManager::ErrorMessageText,
- i18n( "Could not paste contact: %1" ) );
+ ki18n( "Could not paste contact: %1" ) );
mGenericManager->setContextText(
StandardActionManager::Paste, StandardActionManager::ErrorMessageTitle,
diff --git a/akonadi/kmime/standardmailactionmanager.cpp \
b/akonadi/kmime/standardmailactionmanager.cpp index 5fb3241..1cc1fd3 100644
--- a/akonadi/kmime/standardmailactionmanager.cpp
+++ b/akonadi/kmime/standardmailactionmanager.cpp
@@ -88,7 +88,7 @@ class StandardMailActionManager::Private
mGenericManager->action( \
Akonadi::StandardActionManager::SynchronizeCollections )->setWhatsThis( i18n( \
"Update the content of the selected folders." ) );
-
+
mGenericManager->setActionText( \
Akonadi::StandardActionManager::CutCollections,
ki18np( "Cut Folder", "Cut %1 Folders" ) );
mGenericManager->action( Akonadi::StandardActionManager::CutCollections \
)->setWhatsThis( @@ -150,7 +150,7 @@ class StandardMailActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create folder: %1" ) );
+ ki18n( "Could not create folder: %1" ) );
mGenericManager->setContextText(
StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageTitle, @@ -167,7 +167,7 @@ class \
StandardMailActionManager::Private
mGenericManager->setContextText(
StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not delete folder: %1" ) );
+ ki18n( "Could not delete folder: %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageTitle, @@ -175,7 +175,7 @@ class \
StandardMailActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CollectionProperties, \
StandardActionManager::DialogTitle,
- i18nc( "@title:window", "Properties of Folder %1" ) );
+ ki18nc( "@title:window", "Properties of Folder %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteItems, StandardActionManager::MessageBoxText,
@@ -188,7 +188,7 @@ class StandardMailActionManager::Private
mGenericManager->setContextText(
StandardActionManager::DeleteItems, StandardActionManager::ErrorMessageText,
- i18n( "Could not delete email: %1" ) );
+ ki18n( "Could not delete email: %1" ) );
mGenericManager->setContextText(
StandardActionManager::DeleteItems, \
StandardActionManager::ErrorMessageTitle, @@ -200,7 +200,7 @@ class \
StandardMailActionManager::Private
mGenericManager->setContextText(
StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create account: %1" ) );
+ ki18n( "Could not create account: %1" ) );
mGenericManager->setContextText(
StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageTitle, @@ -217,7 +217,7 @@ class \
StandardMailActionManager::Private
mGenericManager->setContextText(
StandardActionManager::Paste, StandardActionManager::ErrorMessageText,
- i18n( "Could not paste email: %1" ) );
+ ki18n( "Could not paste email: %1" ) );
mGenericManager->setContextText(
StandardActionManager::Paste, StandardActionManager::ErrorMessageTitle,
@@ -304,7 +304,7 @@ class StandardMailActionManager::Private
bool canDeleteItem = true;
bool isSystemFolder = false;
if ( collectionIsSelected ) {
- foreach( const Collection collection, selectedCollections )
+ foreach( const Collection &collection, selectedCollections )
{
if ( collection.isValid() ) {
const Akonadi::CollectionStatistics stats = collection.statistics();
@@ -333,7 +333,7 @@ class StandardMailActionManager::Private
mGenericManager->action( StandardActionManager::DeleteCollections \
)->setEnabled( false ); }
}
-
+
if ( mActions.contains( Akonadi::StandardMailActionManager::MoveToTrash ) )
mActions.value( Akonadi::StandardMailActionManager::MoveToTrash \
)->setEnabled( itemIsSelected && canDeleteItem );
if ( mActions.contains( Akonadi::StandardMailActionManager::RemoveDuplicates ) \
)
diff --git a/akonadi/standardactionmanager.cpp b/akonadi/standardactionmanager.cpp
index 877a0c2..8f976dd 100644
--- a/akonadi/standardactionmanager.cpp
+++ b/akonadi/standardactionmanager.cpp
@@ -218,7 +218,7 @@ class StandardActionManager::Private
setContextText( StandardActionManager::CreateCollection, \
StandardActionManager::DialogText,
i18nc( "@label:textbox name of a thing", "Name" ) );
setContextText( StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create folder: %1" ) );
+ ki18n( "Could not create folder: %1" ) );
setContextText( StandardActionManager::CreateCollection, \
StandardActionManager::ErrorMessageTitle, i18n( "Folder creation failed" ) );
@@ -228,12 +228,12 @@ class StandardActionManager::Private
setContextText( StandardActionManager::DeleteCollections, \
StandardActionManager::MessageBoxTitle,
ki18ncp( "@title:window", "Delete folder?", "Delete folders?" \
) );
setContextText( StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not delete folder: %1" ) );
+ ki18n( "Could not delete folder: %1" ) );
setContextText( StandardActionManager::DeleteCollections, \
StandardActionManager::ErrorMessageTitle, i18n( "Folder deletion failed" ) );
setContextText( StandardActionManager::CollectionProperties, \
StandardActionManager::DialogTitle,
- i18nc( "@title:window", "Properties of Folder %1" ) );
+ ki18nc( "@title:window", "Properties of Folder %1" ) );
setContextText( StandardActionManager::DeleteItems, \
StandardActionManager::MessageBoxText,
ki18np( "Do you really want to delete the selected item?",
@@ -241,7 +241,7 @@ class StandardActionManager::Private
setContextText( StandardActionManager::DeleteItems, \
StandardActionManager::MessageBoxTitle,
ki18ncp( "@title:window", "Delete item?", "Delete items?" ) );
setContextText( StandardActionManager::DeleteItems, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not delete item: %1" ) );
+ ki18n( "Could not delete item: %1" ) );
setContextText( StandardActionManager::DeleteItems, \
StandardActionManager::ErrorMessageTitle, i18n( "Item deletion failed" ) );
@@ -253,7 +253,7 @@ class StandardActionManager::Private
setContextText( StandardActionManager::CreateResource, \
StandardActionManager::DialogTitle, i18nc( "@title:window", "New Resource" ) );
setContextText( StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not create resource: %1" ) );
+ ki18n( "Could not create resource: %1" ) );
setContextText( StandardActionManager::CreateResource, \
StandardActionManager::ErrorMessageTitle, i18n( "Resource creation failed" ) );
@@ -264,7 +264,7 @@ class StandardActionManager::Private
ki18ncp( "@title:window", "Delete Resource?", "Delete \
Resources?" ) );
setContextText( StandardActionManager::Paste, \
StandardActionManager::ErrorMessageText,
- i18n( "Could not paste data: %1" ) );
+ ki18n( "Could not paste data: %1" ) );
setContextText( StandardActionManager::Paste, \
StandardActionManager::ErrorMessageTitle, i18n( "Paste failed" ) );
@@ -299,7 +299,7 @@ class StandardActionManager::Private
actionMenu->setMenu( menu );
}
}
-
+
void aboutToShowMenu()
{
QMenu *menu = qobject_cast<QMenu*>( q->sender() );
@@ -313,7 +313,7 @@ class StandardActionManager::Private
QPointer<RecentCollectionAction> recentCollection = new \
RecentCollectionAction( collectionSelectionModel->model(), menu ); \
mRecentCollectionsMenu.insert( type, recentCollection ); const QSet<QString> \
mimeTypes = mimeTypesOfSelection( type );
- fillFoldersMenu( mimeTypes,
+ fillFoldersMenu( mimeTypes,
type,
menu,
collectionSelectionModel->model(),
@@ -330,7 +330,7 @@ class StandardActionManager::Private
QPointer<RecentCollectionAction> recentCollection = new \
RecentCollectionAction( collectionSelectionModel->model(), menu ); const \
QSet<QString> mimeTypes = mimeTypesOfSelection( type );
- fillFoldersMenu( mimeTypes,
+ fillFoldersMenu( mimeTypes,
type,
menu,
collectionSelectionModel->model(),
@@ -338,7 +338,7 @@ class StandardActionManager::Private
}
}
-
+
void updateAlternatingAction( int type )
{
updateAlternatingAction( static_cast<StandardActionManager::Type>( type ) );
@@ -1105,7 +1105,7 @@ class StandardActionManager::Private
item.value()->addRecentCollection( id );
}
}
-
+
void collectionCreationResult( KJob *job )
{
if ( job->error() ) {
@@ -1612,7 +1612,7 @@ void StandardActionManager::createActionFolderMenu(QMenu *menu, \
Type type) {
d->createActionFolderMenu( menu, type );
}
-
+
#include "standardactionmanager.moc"
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic