[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/kmail-soc/kmail
From:       Thomas McGuire <Thomas.McGuire () gmx ! net>
Date:       2008-07-31 20:57:37
Message-ID: 1217537857.180847.9947.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 840304 by tmcguire:

Use correct plural forms when dragging folders.

 M  +21 -6     mainfolderview.cpp  


--- branches/kdepim/kmail-soc/kmail/mainfolderview.cpp #840303:840304
@@ -370,6 +370,7 @@
   }
 
   act->reference = static_cast<FolderViewItem *>( itemAt( e->pos() ) );
+  int draggedFolderCount = DraggedFolderList::get().count();
 
   bool bWasOutsideItem = false;
 
@@ -415,7 +416,9 @@
       act->status = MainFolderViewFoldersDropAction::Accept;
       act->doCopyOrMove = true;
       act->doPositionalInsert = false;
-      act->description = i18n( "Move or Copy Folders to %1", \
act->moveTarget->labelText() ); +      act->description = i18np( "Move or copy folder \
to %2", +                                "Move or copy %1 folders to %2", \
draggedFolderCount, +                                act->moveTarget->labelText() );
     } // else if we cannot move folders to the current item and sorting by dnd is \
disabled  // hence there is nothing more we can do here: ignore.
     return;
@@ -451,7 +454,9 @@
       act->moveTarget = act->reference;
       act->status = MainFolderViewFoldersDropAction::Accept;
       act->doCopyOrMove = true;
-      act->description = i18n( "Move or Copy Folders to %1", \
act->moveTarget->labelText() ); +      act->description = i18np( "Move or copy folder \
to %2", +                                "Move or copy %1 folders to %2",
+                                draggedFolderCount, act->moveTarget->labelText() );
     } // else if we cannot move folders to the current item thus ignore
 
     return;
@@ -490,9 +495,13 @@
     act->status = MainFolderViewFoldersDropAction::Accept;
     act->doCopyOrMove = false;
     if ( act->insertPosition == AboveReference )
-      act->description = i18n( "Move Folders Above %1", act->reference->labelText() \
); +      act->description = i18np( "Order folder above %2",
+                                "Order %1 folders above %2",
+                                draggedFolderCount, act->reference->labelText() );
     else
-      act->description = i18n( "Move Folders Below %1", act->reference->labelText() \
); +      act->description = i18np( "Order folder below %2",
+                                "Order %1 folders below %2",
+                                draggedFolderCount, act->reference->labelText() );
 
     viewport()->update();
     return;
@@ -517,9 +526,15 @@
   act->status = MainFolderViewFoldersDropAction::Accept;
   act->doCopyOrMove = true;
   if ( act->insertPosition == AboveReference )
-    act->description = i18n( "Move or Copy Folders to %1, Insert Above %2", \
act->moveTarget->labelText(), act->reference->labelText() ); +    act->description = \
i18np( "Move or copy folder to %2, order above %3", +                              \
"Move or copy %1 folders to %2, order above %3", +                              \
draggedFolderCount, +                              act->moveTarget->labelText(), \
act->reference->labelText() );  else
-    act->description = i18n( "Move or Copy Folders to %1, Insert Below %2", \
act->moveTarget->labelText(), act->reference->labelText() ); +    act->description = \
i18np( "Move or copy folder to %2, order below %3", +                              \
"Move or copy %1 folders to %2, order below %3", +                              \
draggedFolderCount, +                              act->moveTarget->labelText(), \
act->reference->labelText() );  }
 
 


[prev in list] [next in list] [prev in thread] [next in thread]