change in getTranslationFor in googlePlugin

diff --git a/trunk/src/plugins/google/src/GooglePlugin.cpp b/trunk/src/plugins/google/src/GooglePlugin.cpp
index c0a8277..d947107 100644 (file)
--- a/trunk/src/plugins/google/src/GooglePlugin.cpp
+++ b/trunk/src/plugins/google/src/GooglePlugin.cpp
@@ -149,11 +149,8 @@ void GooglePlugin::setSettings(Settings* settings) {
 }
 
 Translation* GooglePlugin::getTranslationFor(QString key) {
-    QList<Translation*> translations = searchWordList(key);
-    if(translations.size()>0)
-        return translations.at(0);
-    else
-        return new TranslationGoogle();
+    QList<Translation*> translations;
+    return translations<<(new TranslationGoogle(key,"",_infoNote,this));
 }
 
 QList<Translation*> GooglePlugin::searchWordList(QString word, int limit) {
@@ -253,10 +250,11 @@ QString GooglePlugin::jsonParse(QString result) {
     }
     result=translation;
     for(int i=0; i<words.size();i++) {
-        tesult+="<br/>";
+        result+="<br/>";
         result+="<pos>"+partOfSpeach.at(i)+"</pos>:";
         for(int j=0; j<words.at(i)->size();j++)
             result+=words.at(i)->at(j)+", ";
+        result.remove(result.size()-2,2);
     }
     return result;
 }

diff --git a/trunk/src/plugins/google/src/TranslationGoogle.cpp b/trunk/src/plugins/google/src/TranslationGoogle.cpp
index 2ee8a63..448f8fb 100644 (file)
--- a/trunk/src/plugins/google/src/TranslationGoogle.cpp
+++ b/trunk/src/plugins/google/src/TranslationGoogle.cpp
@@ -55,7 +55,10 @@ QString TranslationGoogle::toHtml() const {
         result+="bookmark=\"true\" >";
     else
         result+="bookmark=\"false\" >";
-    result+=_dictionaryInfo+ "</info>"+_trans +"</dict>";
+    if(_trans!="")
+        result+=_dictionaryInfo+ "</info>"+_trans +"</dict>";
+    return
+        result+=_dictionaryInfo+ "</info>"+googlePlugin->searchWordList(_key) +"</dict>";
 }
 
 void TranslationGoogle::setKey(QString) {