now plugins should be translatable too

2 files changed, 24 insertions, 5 deletions

diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index 48f204e..3c1e97a 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -39,17 +39,17 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
 
     Config config( "qpe" );
     config.setGroup( "Time" );
     // if 24 h format
     ampm = config.readBoolEntry( "AMPM", TRUE );
 
     msg += "<B>" + (ev).description() + "</B>";
     if ( (ev).event().hasAlarm() ) {
-        msg += " <b>[with alarm]</b>";
+        msg += " <b>" + tr("[with alarm]") +"</b>";
     }
 
     // include location or not
     if ( show_location ) {
         msg += "<BR><i>" + (ev).location() + "</i>";
     }
 
     if ( ( TimeString::timeString( QTime( (ev).event().start().time() ) ) == "00:00" )
@@ -62,17 +62,17 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev,
                + ampmTime( QTime( (ev).event().start().time() ) )
                // end time of event
                + "<b> - </b>" + ampmTime( QTime( (ev).event().end().time() ) )
                + differDate( tempDate );
     }
 
     // include possible note or not
     if ( show_notes ) {
-        msg += "<br> <i>note</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
+        msg += "<br> <i>" + tr("note") + "</i>:" +( (ev).notes() ).mid( 0, maxCharClip );
     }
     setText( msg );
     connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) );
 }
 
 DateBookEvent::~DateBookEvent()  {
 }
 
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index 2f6907d..2497ee1 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -10,16 +10,19 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
+
+#define QTOPIA_INTERNAL_LANGLIST
+
 #include "today.h"
 #include <opie/todayconfigwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
@@ -31,17 +34,17 @@
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <opie/otabwidget.h>
 #include <qdialog.h>
 #include <qwhatsthis.h>
-
+#include <qtranslator.h>
 
 struct TodayPlugin {
     TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {}
     QLibrary *library;
     QInterfacePtr<TodayPluginInterface> iface;
     TodayPluginObject *guiPart;
     QWidget *guiBox;
     QString name;
@@ -156,18 +159,18 @@ void Today::init() {
 void Today::loadPlugins() {
 
     init();
     QValueList<TodayPlugin>::Iterator tit;
     if ( !pluginList.isEmpty() ) {
         for ( tit = pluginList.begin(); tit != pluginList.end(); ++tit ) {
             (*tit).guiBox->hide();
             (*tit).guiBox->reparent( 0, QPoint( 0, 0 ) );
-            (*tit).library->unload();
             delete (*tit).guiBox;
+            (*tit).library->unload();
             delete (*tit).library;
         }
         pluginList.clear();
     }
 
     QString path = QPEApplication::qpeDir() + "/plugins/today";
     QDir dir( path, "lib*.so" );
 
@@ -185,16 +188,30 @@ void Today::loadPlugins() {
 	    qDebug( "accepted: %s", QString( path + "/" + *it ).latin1() );
             qDebug( QString(*it) );
 
             TodayPlugin plugin;
             plugin.library = lib;
             plugin.iface = iface;
             plugin.name = QString(*it);
 
+            QString type = (*it).left( (*it).find(".") );
+            QStringList langs = Global::languageList();
+            for (QStringList::ConstIterator lit = langs.begin(); lit!=langs.end(); ++lit) {
+                QString lang = *lit;
+                qDebug( "Languages: " + lang );
+                QTranslator * trans = new QTranslator( qApp );
+                QString tfn = QPEApplication::qpeDir()+"/i18n/" + lang + "/" + type + ".qm";
+                if ( trans->load( tfn ) )  {
+                    qApp->installTranslator( trans );
+                }  else {
+                    delete trans;
+                }
+            }
+
             // find out if plugins should be shown
             if ( m_excludeApplets.grep( *it ).isEmpty() ) {
                 plugin.active = true;
             } else {
                 plugin.active = false;
             }
 
             plugin.guiPart = plugin.iface->guiPart();
@@ -298,16 +315,17 @@ void Today::draw() {
 
 /**
  * The method for the configuration dialog.
  */
 void Today::startConfig() {
 
     // disconnect timer to prevent problems while being on config dialog
     disconnect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
+    m_refreshTimer->stop( );
 
     TodayConfig conf( this, "dialog", true );
 
     TodayPlugin plugin;
     QList<TodayConfigWidget> configWidgetList;
 
     for ( int i = pluginList.count() - 1  ; i >= 0; i-- ) {
         plugin = pluginList[i];
@@ -329,17 +347,18 @@ void Today::startConfig() {
         TodayConfigWidget *confWidget;
         for ( confWidget = configWidgetList.first(); confWidget != 0;
               confWidget = configWidgetList.next() ) {
             confWidget->writeConfig();
         }
         loadPlugins();
     } else {
         // since refresh is not called in that case , reconnect the signal
-        connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
+      m_refreshTimer->start( 15000 ); // get the config value in here later
+      connect( m_refreshTimer, SIGNAL( timeout() ), this, SLOT( refresh() ) );
     }
 }
 
 
 /**
  * Refresh for the view. Reload all applets
  *
  */