1 files changed, 18 insertions, 87 deletions

diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 3df569b..43eaaae 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -118,113 +118,113 @@ void Ipkg :: runIpkg()
 #endif
 
 
     if ( option == "reinstall" )
         commands << "install";
     else
         commands << option;
     if ( package != "" )
         commands << package;
 
 
     if ( package != "" )
-        emit outputText( QString( "Dealing with package " ) + package );
+        emit outputText( tr( "Dealing with package %1" ).arg( package) );
 
     qApp->processEvents();
 
     // If we are removing, reinstalling or upgrading packages and make links option is selected
     // create the links
     if ( option == "remove" || option == "reinstall" || option == "upgrade" )
     {
         createLinks = false;
         if ( flags & MAKE_LINKS )
         {
-            emit outputText( QString( "Removing symbolic links...\n" ) );
+            emit outputText( tr( "Removing symbolic links...\n" ) );
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
             emit outputText( QString( " " ) );
         }
     }
     
     // Execute command
     dependantPackages = new QList<QString>;
     dependantPackages->setAutoDelete( true );
 
     executeIpkgCommand( commands, option );
 
 }
 
 void Ipkg :: createSymLinks()
 {
     if ( option == "install" || option == "reinstall" || option == "upgrade" )
     {
         // If we are not removing packages and make links option is selected
         // create the links
         createLinks = true;
         if ( flags & MAKE_LINKS )
         {
             emit outputText( " " );
-            emit outputText( QString( "Creating symbolic links for " )+ package );
+            emit outputText( tr( "Creating symbolic links for %1." ).arg( package) );
 
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
 
             // link dependant packages that were installed with this release
             QString *pkg;
             for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() )
             {
                 if ( *pkg == package )
                     continue;
                 emit outputText( " " );
-                emit outputText( QString( "Creating symbolic links for " )+ (*pkg) );
+                emit outputText( tr( "Creating symbolic links for %1" ).arg( *pkg ) );
                 linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
             }
         }
     }
 
     delete dependantPackages;
 
-    emit outputText( "Finished" );
+    emit outputText( tr("Finished") );
     emit outputText( "" );
 }
 
 void Ipkg :: removeStatusEntry()
 {
     QString statusFile = destDir;
     if ( statusFile.right( 1 ) != "/" )
         statusFile.append( "/" );
     statusFile.append( "usr/lib/ipkg/status" );
     QString outStatusFile = statusFile;
     outStatusFile.append( ".tmp" );
 
     emit outputText( "" );
-    emit outputText( "Removing status entry..." );
-    QString tempstr = "status file - ";
+    emit outputText( tr("Removing status entry...") );
+    QString tempstr = tr("status file - ");
     tempstr.append( statusFile );
     emit outputText( tempstr );
-    tempstr = "package - ";
+    tempstr = tr("package - ");
     tempstr.append( package );
     emit outputText( tempstr );
     
     ifstream in( statusFile );
     ofstream out( outStatusFile );
     if ( !in.is_open() )
     {
-        tempstr = "Couldn't open status file - ";
+        tempstr = tr("Couldn't open status file - ");
         tempstr.append( statusFile );
         emit outputText( tempstr );
         return;
     }
 
     if ( !out.is_open() )
     {
-        tempstr = "Couldn't create tempory status file - ";
+        tempstr = tr("Couldn't create tempory status file - ");
         tempstr.append( outStatusFile );
         emit outputText( tempstr );
         return;
     }
 
     char line[1001];
     char k[21];
     char v[1001];
     QString key;
     QString value;
     vector<QString> lines;
     int i = 0;
@@ -306,25 +306,25 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
     connect(proc, SIGNAL(receivedStderr(OProcess *, char *, int)),
             this, SLOT(commandStderr(OProcess *, char *, int)));
     
     for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
     {
          *proc << (*it).latin1();
     }
 
     // Start the process going
     finished = false;
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
     {
-        emit outputText( QString( "Couldn't start ipkg process" ) );
+        emit outputText( tr("Couldn't start ipkg process" ) );
     }
 }
 
 void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
         buflen --;
     lineStr = lineStr.left( buflen );
     emit outputText( lineStr );
 
     // check if we are installing dependant packages
@@ -377,90 +377,24 @@ void Ipkg::processFinished()
 }
 
 
 void Ipkg :: abort()
 {
     if ( proc )
     {
         proc->kill();
         aborted = true;
     }
 }
 
-/*
-int Ipkg :: executeIpkgCommand( QString &cmd, const QString option )
-{
-    FILE *fp = NULL;
-    char line[130];
-    QString lineStr, lineStrOld;
-    int ret = false;
-
-    fp = popen( (const char *) cmd, "r");
-    if ( fp == NULL )
-    {
-        QString text;
-        text.sprintf( "Couldn't execute %s! See stdout for error code", (const char *)cmd );
-        emit outputText( text );
-    }
-    else
-    {
-        while ( fgets( line, sizeof line, fp) != NULL )
-        {
-            lineStr = line;
-            lineStr=lineStr.left( lineStr.length()-1 );
-
-            if ( lineStr != lineStrOld )
-            {
-                //See if we're finished
-                if ( option == "install" || option == "reinstall" )
-                {
-                    // Need to keep track of any dependant packages that get installed
-                    // so that we can create links to them as necessary
-                    if ( lineStr.startsWith( "Installing " ) )
-                    {
-                        int start = lineStr.find( " " ) + 1;
-                        int end = lineStr.find( " ", start );
-                        QString *package = new QString( lineStr.mid( start, end-start ) );
-                        dependantPackages->append( package );
-                    }
-                }
-
-                if ( option == "update" )
-                {
-                    if (lineStr.contains("Updated list"))
-                        ret = true;
-                }
-                else if ( option == "download" )
-                {
-                    if (lineStr.contains("Downloaded"))
-                        ret = true;
-                }
-                else
-                {
-                    if (lineStr.contains("Done"))
-                        ret = true;
-                }
-
-                emit outputText( lineStr );
-            }
-            lineStrOld = lineStr;
-            qApp->processEvents();
-        }
-        pclose(fp);
-    }
-
-    return ret;
-}
-*/
-
 void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
 {
     if ( dest == "root" || dest == "/" )
         return;
         
     qApp->processEvents();
     QStringList *fileList = getList( packFileName, destDir );
     qApp->processEvents();
     processFileList( fileList, destDir );
     delete fileList;
 }
 
@@ -474,25 +408,25 @@ QStringList* Ipkg :: getList( const QString &packageFilename, const QString &des
 
     if ( !f.open(IO_ReadOnly) )
     {
         // Couldn't open from dest, try from /
         f.close();
         
         packageFileDir = "/usr/lib/ipkg/info/";
         packageFileDir.append( packageFilename );
         packageFileDir.append( ".list" );
         f.setName( packageFileDir );
         if ( ! f.open(IO_ReadOnly) )
         {
-            QString tempstr = "Could not open :";
+            QString tempstr = tr("Could not open :");
             tempstr.append( packageFileDir );
             emit outputText( tempstr );
             return (QStringList*)0;
         }
     }
     QStringList *fileList = new QStringList();
     QTextStream t( &f );
     while ( !t.eof() )
         *fileList += t.readLine();
 
     f.close();
     return fileList;
@@ -539,60 +473,57 @@ void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const
         linkFile.append( file );
     }
     QString text;
     if ( createLinks )
     {
         // If this file is a directory (ends with a /) and it doesn't exist,
         // we need to create it
         if ( file.right(1) == "/" )
         {
             QFileInfo f( linkFile );
             if ( !f.exists() )
             {
-                QString tempstr = "Creating directory ";
+                QString tempstr = tr("Creating directory ");
                 tempstr.append( linkFile );
                 emit outputText( tempstr );
                 QDir d;
                 d.mkdir( linkFile, true );
             }
 //            else
 //                emit outputText( QString( "Directory " ) + linkFile + " already exists" );
             
         }
         else
         {
             int rc = symlink( sourceFile, linkFile );
-            text = (rc == 0 ? "Linked " : "Failed to link ");
-            text.append( sourceFile );
-            text.append( " to " );
-            text.append( linkFile );
+            text = ( rc == 0 ? tr( "Linked %1 to %2" ) : tr( "Failed to link %1 to %2" ) ).
+                    arg( sourceFile ).
+                    arg( linkFile );
             emit outputText( text );
         }
     }
     else
     {
         QFileInfo f( linkFile );
         if ( f.exists() )
         {
             if ( f.isFile() )
             {
                 QFile f( linkFile );
                 bool rc = f.remove();
 
-                text = (rc ? "Removed " : "Failed to remove ");
-                text.append( linkFile );
+                text = ( rc ? tr( "Removed %1" ) : tr( "Failed to remove %1" ) ).arg( linkFile );
                 emit outputText( text );
             }
             else if ( f.isDir() )
             {
                 QDir d;
                 bool rc = d.rmdir( linkFile, true );
                 if ( rc )
                 {
-                    text = (rc ? "Removed " : "Failed to remove ");
-                    text.append( linkFile );
+                    text = ( rc ? tr( "Removed " ) : tr( "Failed to remove " ) ).arg( linkFile );
                     emit outputText( text );
                 }
             }
         }
     }
 }