summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (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,4 +1,4 @@
TEMPLATE = app
-CONFIG += qt warn_on console
+CONFIG += qt warn_on console thread
HEADERS = ../shared/metatranslator.h \
../shared/proparser.h \
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
@@ -17,6 +17,8 @@ OPIE* OPIE::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/");
@@ -32,4 +34,5 @@ QStringList OPIE::languageList( const QString& _opieDir )const {
return langs;
+#endif
}
QString OPIE::opieDir( const QString& _opieDir ) const{
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
@@ -136,4 +136,5 @@ QMap<QString, QString> proFileTagMap( const QString& text, const QString& opieDi
after = tagMap[invocation];
(*it).replace( i, len, after );
+ i += after.length();
}
}