fixed translation and added some german translations

RetroShare · Jul 29, 2014 · b2aa276 · b2aa276
1 parent a335b9d
commit b2aa276
Show file tree

Hide file tree

Showing 9 changed files with 705 additions and 44 deletions.
diff --git a/Lua4RS.pro b/Lua4RS.pro
@@ -63,9 +63,11 @@ FORMS += \
 TARGET = Lua4RS
 
 RESOURCES +=  \
-    Lua4RS_images.qrc
+    Lua4RS_images.qrc \
+    Lua4RS_lang.qrc
 
 TRANSLATIONS += \
-    lang/Lua4RS_en.ts
+    lang/Lua4RS_en.ts \
+    lang/Lua4RS_de.ts
 
 XUP.QT_VERSION = Qt System (4.8.1)
diff --git a/Lua4RSPlugin.cpp b/Lua4RSPlugin.cpp
@@ -74,14 +74,15 @@ void Lua4RSPlugin::setInterfaces(RsPlugInInterfaces &interfaces)
 
     // setup other stuff - pqi service is nor running yet -> don't use interface pointer
     LuaCore* lc = dynamic_cast<p3Lua4RS*>(rs_pqi_service())->getCore();
-    lc->setUi(dynamic_cast<Lua4RSWidget*>(qt_page()));
     _notify->registerNotifyClient(lc->notify());
 }
 
 MainPage* Lua4RSPlugin::qt_page() const
 {
-    if(_mainpage == NULL)
+    if(_mainpage == NULL) {
         _mainpage = new Lua4RSWidget();
+        L4R::L4RConfig->getCore()->setUi(dynamic_cast<Lua4RSWidget*>(_mainpage));
+    }
 
     return _mainpage ;
 }

diff --git a/Lua4RS_de.qm b/Lua4RS_de.qm
diff --git a/Lua4RS_en.qm b/Lua4RS_en.qm
diff --git a/Lua4RS_lang.qrc b/Lua4RS_lang.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>lang/Lua4RS_en.qm</file>
+        <file>lang/Lua4RS_de.qm</file>
+    </qresource>
+</RCC>
diff --git a/lang/Lua4RS_de.qm b/lang/Lua4RS_de.qm