author | christophe <christophe> | 2003-10-18 19:53:17 (UTC) |
---|---|---|
committer | christophe <christophe> | 2003-10-18 19:53:17 (UTC) |
commit | 38d72acc2225b88b2f561fa59565d4c66261f1c3 (patch) (side-by-side diff) | |
tree | e4e11af47e75a5147a0028195c861b4af82fa38f | |
parent | 1f128cbf0741b2e4baf1ab5051a7a293fef7e22c (diff) | |
download | opie-38d72acc2225b88b2f561fa59565d4c66261f1c3.zip opie-38d72acc2225b88b2f561fa59565d4c66261f1c3.tar.gz opie-38d72acc2225b88b2f561fa59565d4c66261f1c3.tar.bz2 |
Little bug fix on -opie option handling.
-rw-r--r-- | development/translation/opie-lrelease/main.cpp | 69 |
1 files changed, 50 insertions, 19 deletions
diff --git a/development/translation/opie-lrelease/main.cpp b/development/translation/opie-lrelease/main.cpp index e5c1a0c..4c7352f 100644 --- a/development/translation/opie-lrelease/main.cpp +++ b/development/translation/opie-lrelease/main.cpp @@ -62,92 +62,123 @@ static void releaseQmFile( const QString& tsFileName, bool verbose ) } else { fprintf( stderr, "lrelease warning: For some reason, I cannot load '%s'\n", tsFileName.latin1() ); } } + static void metaQmFile( const QString &opiedir, const QStringList& lang, const QString& basename, bool isLib, bool verb ) { QString target = basename + ".ts"; + if ( isLib ) target.prepend("lib"); - for ( QStringList::ConstIterator it = lang.begin(); it != lang.end(); - ++it ) { +for ( QStringList::ConstIterator it = lang.begin(); it != lang.end(); ++it ) +{ QString fileName = opiedir + "/i18n/" + (*it) + "/" + target; qWarning("Target is %s", fileName.latin1() ); releaseQmFile( fileName, verb ); } } + int main( int argc, char **argv ) { bool verbose = FALSE; - bool metTranslations = FALSE; +// bool metTranslations = FALSE; int numFiles = 0; QString opiedir; QStringList languageList = OPIE::self()->languageList( opiedir ); - for ( int i = 1; i < argc; i++ ) { - if ( qstrcmp(argv[i], "-help") == 0 ) { +for ( int i = 1; i < argc; i++ ) +{ + if ( qstrcmp(argv[i], "-help") == 0 ) + { printUsage(); return 0; - } else if ( qstrcmp(argv[i], "-verbose") == 0 ) { + } + else if ( qstrcmp(argv[i], "-verbose") == 0 ) + { verbose = TRUE; continue; - } else if ( qstrcmp(argv[i], "-version") == 0 ) { + } + else if ( qstrcmp(argv[i], "-version") == 0 ) + { fprintf( stderr, "lrelease version %s\n", QT_VERSION_STR ); return 0; - } else if ( qstrcmp(argv[i], "-opie") == 0 ) { - if ( i+1 < argc ) { - opiedir = argv[i+1]; + } + else if ( qstrcmp(argv[i], "-opie") == 0 ) + { + i++; + if ( i < argc ) + { + opiedir = argv[i]; languageList = OPIE::self()->languageList(opiedir); + continue; } +// else +// { + fprintf( stderr, "lrelease error: -opie option need a parameter\n" ); + printUsage(); + return 1; +// } } numFiles++; QFile f( argv[i] ); - if ( !f.open(IO_ReadOnly) ) { + if ( !f.open(IO_ReadOnly) ) + { fprintf( stderr, - "lrelease error: Cannot open file '%s': %s\n", argv[i], + "lrelease error: Cannot open file '%s': %s\n", + argv[i], strerror(errno) ); return 1; } QTextStream t( &f ); QString fullText = t.read(); f.close(); - if ( fullText.find(QString("<!DOCTYPE TS>")) >= 0 ) { + if ( fullText.find(QString("<!DOCTYPE TS>")) >= 0 ) + { releaseQmFile( argv[i], verbose ); - } else { + } + else + { QString target; bool isLib = FALSE; QMap<QString, QString> tagMap = proFileTagMap( fullText ); QMap<QString, QString>::Iterator it; - for ( it = tagMap.begin(); it != tagMap.end(); ++it ) { + for ( it = tagMap.begin(); it != tagMap.end(); ++it ) + { QStringList toks = QStringList::split( ' ', it.data() ); QStringList::Iterator t; - for ( t = toks.begin(); t != toks.end(); ++t ) { - if ( it.key() == "TARGET" ) { + for ( t = toks.begin(); t != toks.end(); ++t ) + { + if ( it.key() == "TARGET" ) + { target = *t; qWarning("%s %s", it.key().latin1(), (*t).latin1() ); - }else if ( it.key() == "TEMPLATE" ) { + } + else if ( it.key() == "TEMPLATE" ) + { if ( (*t).stripWhiteSpace().lower() == "lib" ) isLib = TRUE; } } } qWarning("%s", target.latin1() ); metaQmFile( OPIE::self()->opieDir(opiedir), languageList, target, isLib, verbose ); } } - if ( numFiles == 0 ) { +if ( numFiles == 0 ) +{ printUsage(); return 1; } return 0; } |