From d5ca5bf9f6fc8d47c2786af80342b13036f14d36 Mon Sep 17 00:00:00 2001 From: harlekin Date: Wed, 12 Feb 2003 11:40:53 +0000 Subject: now plugins should be translatable too --- (limited to 'core/pim') 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 @@ -44,7 +44,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, msg += "" + (ev).description() + ""; if ( (ev).event().hasAlarm() ) { - msg += " [with alarm]"; + msg += " " + tr("[with alarm]") +""; } // include location or not @@ -67,7 +67,7 @@ DateBookEvent::DateBookEvent(const EffectiveEvent &ev, // include possible note or not if ( show_notes ) { - msg += "
note:" +( (ev).notes() ).mid( 0, maxCharClip ); + msg += "
" + tr("note") + ":" +( (ev).notes() ).mid( 0, maxCharClip ); } setText( msg ); connect( this, SIGNAL( clicked() ), this, SLOT( editMe() ) ); 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 @@ -15,6 +15,9 @@ ***************************************************************************/ + +#define QTOPIA_INTERNAL_LANGLIST + #include "today.h" #include @@ -36,7 +39,7 @@ #include #include #include - +#include struct TodayPlugin { TodayPlugin() : library( 0 ), iface( 0 ), guiPart( 0 ), guiBox( 0 ) {} @@ -161,8 +164,8 @@ void Today::loadPlugins() { 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(); @@ -190,6 +193,20 @@ void Today::loadPlugins() { 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; @@ -303,6 +320,7 @@ 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 ); @@ -334,7 +352,8 @@ void Today::startConfig() { 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() ) ); } } -- cgit v0.9.0.2