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

List:       kde-commits
Subject:    extragear/graphics/digikam
From:       Marcel Wiesweg <marcel.wiesweg () gmx ! de>
Date:       2007-06-30 19:26:44
Message-ID: 1183231604.365269.16187.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 681911 by mwiesweg:

Fix i18n calls. Calls with ".arg" appended do not work anymore, they need to be \
ported.


 M  +1 -3      showfoto/showfoto.cpp  
 M  +17 -18    utilities/imageeditor/editor/editorwindow.cpp  


--- trunk/extragear/graphics/digikam/showfoto/showfoto.cpp #681910:681911
@@ -811,9 +811,7 @@
         }
 
         text = d->currentItem->url().fileName() +
-                   i18n(" (%2 of %3)")
-                   .arg(QString::number(index))
-                   .arg(QString::number(d->itemsNb));
+                   i18nc("(<Image number> of <Images in album>", " (%1 of %2)", \
index, d->itemsNb);  
         setCaption(d->currentItem->url().directory());
     }
--- trunk/extragear/graphics/digikam/utilities/imageeditor/editor/editorwindow.cpp \
#681910:681911 @@ -1149,8 +1149,8 @@
 
         int result = KMessageBox::warningYesNoCancel(this,
                                   i18n("The image '%1' has been modified.\n"
-                                       "Do you want to save it?")
-                                       .arg(url.fileName()),
+                                       "Do you want to save it?",
+                                       url.fileName()),
                                   QString(),
                                   KStandardGuiItem::save(),
                                   KStandardGuiItem::discard());
@@ -1314,7 +1314,7 @@
     if (!success && filename != QString())
     {
         QFileInfo fi(filename);
-        QString message = i18n("Failed to load image \"%1\"").arg(fi.fileName());
+        QString message = i18n("Failed to load image \"%1\"",fi.fileName());
         KMessageBox::error(this, message);
         DWarning() << "Failed to load image " << fi.fileName() << endl;
     }
@@ -1362,9 +1362,9 @@
         {
             if (!m_savingContext->abortingSaving)
             {
-                KMessageBox::error(this, i18n("Failed to save \
                file\n\"%1\"\nto\n\"%2\".")
-                                .arg(m_savingContext->destinationURL.fileName())
-                                .arg(m_savingContext->destinationURL.path()));
+                KMessageBox::error(this, i18n("Failed to save \
file\n\"%1\"\nto\n\"%2\".", +                                              \
m_savingContext->destinationURL.fileName(), +                                         \
m_savingContext->destinationURL.path()));  }
             finishSaving(false);
             return;
@@ -1403,9 +1403,9 @@
         {
             if (!m_savingContext->abortingSaving)
             {
-                KMessageBox::error(this, i18n("Failed to save \
                file\n\"%1\"\nto\n\"%2\".")
-                                .arg(m_savingContext->destinationURL.fileName())
-                                .arg(m_savingContext->destinationURL.path()));
+                KMessageBox::error(this, i18n("Failed to save \
file\n\"%1\"\nto\n\"%2\".", +                                              \
m_savingContext->destinationURL.fileName(), +                                         \
m_savingContext->destinationURL.path()));  }
             finishSaving(false);
             return;
@@ -1570,8 +1570,7 @@
 
             if ( !imgExtPattern.contains( m_savingContext->format.toUpper() ) )
             {
-                KMessageBox::error(this, i18n("Target image file format \"%1\" \
                unsupported.")
-                        .arg(m_savingContext->format));
+                KMessageBox::error(this, i18n("Target image file format \"%1\" \
                unsupported.", m_savingContext->format));
                 DWarning() << k_funcinfo << "target image file format " << \
m_savingContext->format << " unsupported!" << endl;  return false;
             }
@@ -1580,9 +1579,9 @@
 
     if (!newURL.isValid())
     {
-        KMessageBox::error(this, i18n("Failed to save file\n\"%1\" to\n\"%2\".")
-                           .arg(newURL.fileName())
-                           .arg(newURL.path().section('/', -2, -2)));
+        KMessageBox::error(this, i18n("Failed to save file\n\"%1\" to\n\"%2\".",
+                                      newURL.fileName(),
+                                      newURL.path().section('/', -2, -2)));
         DWarning() << k_funcinfo << "target URL is not valid !" << endl;
         return false;
     }
@@ -1609,8 +1608,8 @@
 
             KMessageBox::warningYesNo( this, i18n("A file named \"%1\" already "
                                                   "exists. Are you sure you want "
-                                                  "to overwrite it?")
-                                       .arg(newURL.fileName()),
+                                                  "to overwrite it?",
+                                                  newURL.fileName()),
                                        i18n("Overwrite File?"),
                                        KStandardGuiItem::overwrite(),
                                        KStandardGuiItem::cancel() );
@@ -1658,8 +1657,8 @@
             KMessageBox::warningYesNo( this, i18n("You do not have write permissions \
                "
                                                   "for the file named \"%1\". "
                                                   "Are you sure you want "
-                                                  "to overwrite it?")
-                                       .arg(url.fileName()),
+                                                  "to overwrite it?",
+                                                  url.fileName()),
                                        i18n("Overwrite File?"),
                                        KStandardGuiItem::overwrite(),
                                        KStandardGuiItem::cancel() );


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