summaryrefslogtreecommitdiff
path: root/development
Side-by-side diff
Diffstat (limited to 'development') (more/less context) (ignore whitespace changes)
-rw-r--r--development/translation/opie-lupdate/opie-lupdate.pro2
-rw-r--r--development/translation/shared/opie.cpp5
-rw-r--r--development/translation/shared/proparser.cpp1
3 files changed, 6 insertions, 2 deletions
diff --git a/development/translation/opie-lupdate/opie-lupdate.pro b/development/translation/opie-lupdate/opie-lupdate.pro
index ea51c8b..8360f05 100644
--- a/development/translation/opie-lupdate/opie-lupdate.pro
+++ b/development/translation/opie-lupdate/opie-lupdate.pro
@@ -1,14 +1,14 @@
TEMPLATE = app
-CONFIG += qt warn_on console
+CONFIG += qt warn_on console thread
HEADERS = ../shared/metatranslator.h \
../shared/proparser.h \
../shared/opie.h
SOURCES = fetchtr.cpp \
main.cpp \
merge.cpp \
numberh.cpp \
sametexth.cpp \
../shared/metatranslator.cpp \
../shared/proparser.cpp \
../shared/opie.cpp
diff --git a/development/translation/shared/opie.cpp b/development/translation/shared/opie.cpp
index c5c72d1..c8cea42 100644
--- a/development/translation/shared/opie.cpp
+++ b/development/translation/shared/opie.cpp
@@ -7,34 +7,37 @@
OPIE* OPIE::m_self = 0;
OPIE::OPIE() {
}
OPIE::~OPIE() {
}
OPIE* OPIE::self() {
if (!m_self ) m_self = new OPIE;
return m_self;
}
QStringList OPIE::languageList( const QString& _opieDir )const {
+#if 0
+ return QStringList::split(':',QString(::getenv("OPIE_CREATE_LANGS")));
+#else
QString opieDi = opieDir( _opieDir );
-
QStringList langs;
QDir dir( opieDi + "/i18n/");
if (!dir.exists() ) return langs;
langs = dir.entryList( QDir::Dirs );
langs.remove("CVS"); // hey this no language
langs.remove("unmaintained"); // remove this one too
langs.remove(".");
langs.remove("..");
return langs;
+#endif
}
QString OPIE::opieDir( const QString& _opieDir ) const{
if (!_opieDir.isEmpty() ) return _opieDir;
char* dir = ::getenv("OPIEDIR");
if (!dir ) return QString::null;
return QString::fromLatin1(dir);
}
diff --git a/development/translation/shared/proparser.cpp b/development/translation/shared/proparser.cpp
index f616c5a..bb099bb 100644
--- a/development/translation/shared/proparser.cpp
+++ b/development/translation/shared/proparser.cpp
@@ -126,24 +126,25 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi
QString invocation = var.cap(1);
QString after;
if ( invocation == "system" ) {
// skip system(); it will be handled in the next pass
++i;
} else if ( invocation == "OPIEDIR") {
(*it).replace( i, len, opieDir );
}else {
if ( tagMap.contains(invocation) )
after = tagMap[invocation];
(*it).replace( i, len, after );
+ i += after.length();
}
}
}
/*
Execute system() calls.
*/
QRegExp callToSystem( "\\$\\$system\\s*\\(([^()]*)\\)" );
for ( it = tagMap.begin(); it != tagMap.end(); ++it ) {
int i = 0;
while ( (i = callToSystem.search((*it), i)) != -1 ) {
/*