[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/plugins/translator
From:       Francesco Rossi <redsh () email ! it>
Date:       2007-09-13 16:40:33
Message-ID: 1189701633.817341.12956.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 712114 by rossi:

Fixed kopete translator plugin.

 M  +19 -20    translatorlanguages.cpp  
 M  +8 -4      translatorplugin.cpp  


--- trunk/KDE/kdenetwork/kopete/plugins/translator/translatorlanguages.cpp #712113:712114
@@ -27,7 +27,7 @@
 {
 	m_lc = 0;
 	m_sc = 0;
-	m_services.insert("babelfish", "BabelFish");
+//	m_services.insert("babelfish", "BabelFish");
 	m_services.insert("google", "Google");
 
 	m_langs.insert("null", i18n("Unknown"));
@@ -43,29 +43,28 @@
 	m_langs.insert("es", i18n("Spanish"));
 
 	/* English to .. */
-	m_supported["babelfish"].append("en_zh");
-	m_supported["babelfish"].append("en_fr");
-	m_supported["babelfish"].append("en_de");
-	m_supported["babelfish"].append("en_it");
-	m_supported["babelfish"].append("en_ja");
-	m_supported["babelfish"].append("en_ko");
-	m_supported["babelfish"].append("en_pt");
-	m_supported["babelfish"].append("en_es");
+//	m_supported["babelfish"].append("en_zh");
+//	m_supported["babelfish"].append("en_fr");
+//	m_supported["babelfish"].append("en_de");
+//	m_supported["babelfish"].append("en_it");
+//	m_supported["babelfish"].append("en_ja");
+//	m_supported["babelfish"].append("en_ko");
+//	m_supported["babelfish"].append("en_pt");
+//	m_supported["babelfish"].append("en_es");
 	/* Chinese to .. */
-	m_supported["babelfish"].append("zh_en");
+//	m_supported["babelfish"].append("zh_en");
 	/* French to ... */
-	m_supported["babelfish"].append("fr_en");
-	m_supported["babelfish"].append("fr_de");
+//	m_supported["babelfish"].append("fr_en");
+//	m_supported["babelfish"].append("fr_de");
 	/* German to ... */
-	m_supported["babelfish"].append("de_en");
-	m_supported["babelfish"].append("de_fr");
+//	m_supported["babelfish"].append("de_en");
+//	m_supported["babelfish"].append("de_fr");
 
-	m_supported["babelfish"].append("it_en");
-	m_supported["babelfish"].append("ja_en");
-	m_supported["babelfish"].append("ko_en");
-	m_supported["babelfish"].append("pt_en");
-	m_supported["babelfish"].append("ru_en");
-	m_supported["babelfish"].append("es_en");
+//	m_supported["babelfish"].append("it_en");
+//	m_supported["babelfish"].append("ko_en");
+//	m_supported["babelfish"].append("pt_en");
+//	m_supported["babelfish"].append("ru_en");
+//	m_supported["babelfish"].append("es_en");
 
 	/* Google Service */
 	m_supported["google"].append("en_de");
--- trunk/KDE/kdenetwork/kopete/plugins/translator/translatorplugin.cpp #712113:712114
@@ -16,6 +16,8 @@
     * (at your option) any later version.                                   *
     *                                                                       *
     *************************************************************************
+    Patched by Francesco Rossi <redsh@email.it> in order to support new 
+    google translation page layout (13-sept-2007)
 */
 
 #include <qapplication.h>
@@ -292,7 +294,9 @@
 
 //	kDebug( 14308 ) << "Google response:"<< endl << data;
 
-	QRegExp re( "<textarea name=q rows=5 cols=45 wrap=PHYSICAL>(.*)</textarea>" );
+//	QRegExp re( "<textarea name=q rows=5 cols=45 wrap=PHYSICAL>(.*)</textarea>" );
+	QRegExp re( "<textarea name=utrans wrap=PHYSICAL dilr=ltr rows=5 id=suggestion>(.*)</textarea>");
+  
 	re.setMinimal( true );
 	re.indexIn( data );
 
@@ -327,7 +331,7 @@
 
 	//kDebug( 14308 ) << "Babelfish response: " << endl << data;
 
-	QRegExp re( "<Div style=padding:10px; lang=..>(.*)</div" );
+	QRegExp re( "<div style=padding:10px;>(.*)</div>" );
 	re.setMinimal( true );
 	re.indexIn( data );
 
@@ -366,9 +370,9 @@
 		break;
 	case ShowOriginal:
 		if ( msg.format() & Qt::PlainText )
-			msg.setPlainBody( i18n( "%2\nAuto Translated: %1", translated, msg.plainBody() ) );
+			msg.setPlainBody( i18n( "%2 \nAuto Translated: \n%1", translated, msg.plainBody() ) );
 		else 
-			msg.setHtmlBody( i18n( "%2\nAuto Translated: %1", translated, msg.plainBody() ) );
+			msg.setHtmlBody( i18n( "%2 \nAuto Translated: \n%1", translated, msg.plainBody() ) );
 		break;
 	case ShowDialog:
 	{
[prev in list] [next in list] [prev in thread] [next in thread]