1 files changed, 13 insertions, 7 deletions

diff --git a/libopie2/opiecore/opluginloader.cpp b/libopie2/opiecore/opluginloader.cpp
index b8b6b79..ec19fa0 100644
--- a/libopie2/opiecore/opluginloader.cpp
+++ b/libopie2/opiecore/opluginloader.cpp
@@ -313,457 +313,463 @@ void OGenericPluginLoader::setAutoDelete( bool t ) {
 /**
  * \brief See if autoDelete is enabled.
  */
 bool OGenericPluginLoader::autoDelete()const{
     return m_autoDelete;
 }
 
 /**
  * \brief unload all loaded Plugins
  *
  * This will unload all returned QUnknownInterfaces by load. Unload
  * will be called.
  */
 void OGenericPluginLoader::clear() {
     QPtrDictIterator<QLibrary> it( m_library );
     for ( ;it.current(); )
         unload( static_cast<QUnknownInterface*>( it.currentKey() ) );
 }
 
 /**
  * \brief unload the Plugin and the accompanied Resources.
  *
  * This will take the iface from the internal QPtrDict, Release it,
  * and deref the libray used.
  * The visibility depends on the QPtrDict.
  * @see QPtrDict::insert
  */
 void OGenericPluginLoader::unload( QUnknownInterface* iface ) {
     if ( !iface )
         return;
 
     iface->release();
     Internal::OPluginLibraryHolder::self()->deref( m_library.take( iface ) );
 }
 
 /**
  * \brief The name of the plugins.
  *
  * Return the name/type you specified in the constructor.
  * This is at least used by the OPluginManager to find the right config
  */
 QString OGenericPluginLoader::name()const {
     return m_dir;
 }
 
 
 /**
  * \brief See if loading of a plugin segfaulted
  * This tells you
  * if by previous tries to load, loading crashed your application.
  * If isInSafeMode you can use the GUI to configure the plugins prior to loading
  *
  * @return true if prior loading failed
  */
 bool OGenericPluginLoader::isInSafeMode()const {
     return m_isSafeMode;
 }
 
 
 /**
  * \brief Return all Plugins found in the plugins dirs.
  * Return the list of all available plugins. This will go through all plugin
  * directories and search for your type of plugins ( by subdir )
  *
  * @param sorted Tell if you want to have the positions sorted. This only makes sense if you
  */
 OPluginItem::List OGenericPluginLoader::allAvailable( bool sorted )const {
     OPluginItem::List lst;
     for ( QStringList::ConstIterator it = m_plugDirs.begin(); it != m_plugDirs.end(); ++it )
         lst += plugins(  *it, sorted, false );
 
     if ( sorted )
         qHeapSort( lst );
     return lst;
 }
 
 /**
  * \brief Return only the enabled plugins
  * Return only activated plugins.
  *
  * @param sorted If the list should be sorted
  */
 OPluginItem::List OGenericPluginLoader::filtered( bool sorted )const {
     OPluginItem::List lst;
     for ( QStringList::ConstIterator it = m_plugDirs.begin(); it != m_plugDirs.end(); ++it )
         lst += plugins(  *it, sorted, true );
 
     if ( sorted )
         qHeapSort( lst );
     return lst;
 }
 
 
 /**
  * \brief Load a OPluginItem for the specified interface
  * This will open the resource of the OPluginItem::path() and then will query
  * if the Interface specified in the uuid is available and then will manage the
  * resource and Interface.
  *
  * @param item The OPluginItem that should be loaded
  * @param uuid The Interface to query for
  *
  * @return Either 0 in case of failure or the Plugin as QUnknownInterface*
  */
 QUnknownInterface* OGenericPluginLoader::load( const OPluginItem& item, const QUuid& uuid) {
     /*
      * Check if there could be a library
      */
     QString pa = item.path();
     if ( pa.isEmpty() )
         return 0l;
 
     /*
      * See if we get a library
      * return if we've none
      */
     setSafeMode( pa, true );
     QLibrary *lib = Internal::OPluginLibraryHolder::self()->ref( pa );
     if ( !lib ) {
         setSafeMode();
         return 0l;
     }
 
     /**
      * try to load the plugin and just in case initialize the pointer to a pointer again
      */
     QUnknownInterface*  iface=0;
     if ( lib->queryInterface(  uuid,  &iface ) == QS_OK ) {
-        installTranslators(pa.left( pa.find(".")));
+        installTranslators( item.name() );
         m_library.insert( iface, lib );
     }else
         iface = 0;
 
     setSafeMode();
 
     return iface;
 }
 
 /**
  * @internal and reads in the safe mode
  */
 void OGenericPluginLoader::readConfig() {
 
 
 /* read the config for SafeMode */
     OConfig conf(  m_dir + "-odpplugins" );
     conf.setGroup( "General" );
     m_isSafeMode = conf.readBoolEntry( "SafeMode", false );
 }
 
 /**
  * @internal Enter or leave SafeMode
  */
 void OGenericPluginLoader::setSafeMode(const QString& str, bool b) {
     OConfig conf(  m_dir + "-odpplugins" );
     conf.setGroup( "General" );
     conf.writeEntry( "SafeMode", b );
     conf.writeEntry( "CrashedPlugin", str );
 }
 
 /**
  * @internal
  *
  * Set the List of Plugin Dirs to lst. Currently only QPEApplication::qpeDir()+"/plugins/"+mytype
  * is used as plugin dir
  */
 void OGenericPluginLoader::setPluginDirs( const QStringList& lst ) {
     m_plugDirs = lst;
 }
 
 /**
  *
  * @internal
  * Set the Plugin Dir to str. Str will be the only element in the list of plugin dirs
  */
 void OGenericPluginLoader::setPluginDir( const QString& str) {
     m_plugDirs.clear();
     m_plugDirs.append( str );
 }
 
 
 /**
  * @internal
  */
 bool OGenericPluginLoader::isSorted()const{
     return m_isSorted;
 }
 
 /*
  * make libfoo.so.1.0.0 -> foo on UNIX
  * make libfoo.dylib    -> foo on MAC OS X Unix
  * windows is obviously missing
  */
 /**
  * @internal
  */
 QString OGenericPluginLoader::unlibify( const QString& str ) {
     QString st = str.mid( str.find( "lib" )+3 );
 #ifdef Q_OS_MACX
     return st.left( st.findRev( ".dylib" ) );
 #else
     return st.left( st.findRev( ".so" ) );
 #endif
 }
 
 /**
  * @internal
  *
  * \brief method to return available plugins. Internal and for reeimplementations
  *
  *Return a List of Plugins for a dir and add positions and remove disabled.
  * If a plugin is on the excluded list assign position -2
  *
  * @param dir The dir to look in
  * @param sorted Should positions be read?
  * @param disabled Remove excluded from the list
  */
 OPluginItem::List OGenericPluginLoader::plugins( const QString& _dir, bool sorted, bool disabled )const {
 #ifdef Q_OS_MACX
     QDir dir( _dir, "lib*.dylib" );
 #else
     QDir dir( _dir, "lib*.so" );
 #endif
 
 
     OPluginItem::List lst;
 
     /*
      * get excluded list and then iterate over them
      * Excluded list contains the name
      * Position is a list with 'name.pos.name.pos.name.pos'
      *
      * For the look up we will create two QMap<QString,pos>
      */
     QMap<QString, int> positionMap;
     QMap<QString, int> excludedMap;
 
 
     OConfig cfg( m_dir+"-odpplugins" );
     cfg.setGroup( _dir );
 
 
     QStringList excludes = cfg.readListEntry( "Excluded", ',' );
     for ( QStringList::Iterator it = excludes.begin(); it != excludes.end(); ++it )
         excludedMap.insert( *it, -2 );
 
     if ( sorted ) {
         QStringList pos =  cfg.readListEntry( "Positions", '.' );
         QStringList::Iterator it = pos.begin();
         QString tmp; int i;
         while ( it != pos.end() ) {
             tmp = *it++; i = (*it++).toInt();
             positionMap.insert(  tmp, i );
         }
 
     }
 
 
 
 
     QStringList list = dir.entryList();
     for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
         QString str = unlibify( *it );
         OPluginItem item( str, _dir + "/" + *it );
 
         bool ex = excludedMap.contains( str );
         /*
          * if disabled but we should show all mark it as disabled
          * else continue because we don't want to add the item
          * else if sorted we assign the right position
          */
         if ( ex && !disabled)
             item.setEnabled( false );
         else if ( ex && disabled )
             continue;
         else if ( sorted )
             item.setPosition( positionMap[str] );
 
 
         lst.append( item );
     }
 
     return lst;
 }
 
 /**
  * @internal generate a list of languages from $LANG
  */
 QStringList OGenericPluginLoader::languageList() {
     if ( m_languages.isEmpty() ) {
         /*
          * be_BY.CP1251 We will add, be_BY.CP1251,be_BY,be
          * to our list of languages.
+         * Also for de_DE@euro we will add de_DE@eurp, de_DE, de
+         * to our list of languages
          */
         QString str = ::getenv( "LANG" );
         m_languages += str;
-        int pos = str.find( '.' );
-
+        int pos = str.find( '@' );
+        if( pos > 0 )
+            m_languages += str.left( pos );
+        
+        
+        pos = str.find( '.' );
         if ( pos > 0 )
             m_languages += str.left( pos );
 
         int n_pos = str.find( '_' );
-        if ( pos > 0 && n_pos >= pos )
+        if ( n_pos > 0  )
             m_languages += str.left( n_pos );
 
     }
     return m_languages;
 }
 
 /**
  * @internal
  * Tries to install languages using the languageList for the type
  */
 void OGenericPluginLoader::installTranslators(const QString& type) {
     QStringList lst = languageList();
 
     /*
      * for each language and maybe later for each language dir...
      * try to load a Translator
      */
     for ( QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) {
         QTranslator* trans = new QTranslator(  qApp );
-        QString tfn = QPEApplication::qpeDir()+"/i18n/" + *it + "/" + type + ".qm" ;
+        QString tfn = QPEApplication::qpeDir()+"/i18n/" + *it + "/lib" + type + ".qm" ;
 
         /*
          * If loaded then install else clean up and don't leak
          */
-        if ( trans->load( tfn ) )
-            qApp->installTranslator( trans );
+        if ( trans->load( tfn ) ) 
+                    qApp->installTranslator( trans );
         else
             delete trans;
     }
 }
 
 /**
  * \brief Simple c'tor.
  *
  * Simple C'tor same as the one of the base class. Additional this
  * class can cast for you if you nee it.
  *
  *
  * @param name The name of your plugin class
  * @param sorted If plugins are sorted
  *
  * @see OGenericPluginLoader
  */
 OPluginLoader::OPluginLoader( const QString& name,  bool sorted )
     : OGenericPluginLoader( name, sorted )
 {
 }
 
 /**
  * d'tor
  * @see OGenericPluginLoader::~OGenericPluginLoader
  */
 OPluginLoader::~OPluginLoader() {
 }
 
 /**
  * \brief C'Tor using a OGenericPluginLoader
  * The C'tor. Pass your OGenericPluginLoader to manage
  * OGenericPluginLoader::allAvailable plugins.
  *
  *
  * @param loader A Pointer to your OGenericPluginLoader
  * @param name The name
  */
 OPluginManager::OPluginManager(  OGenericPluginLoader* loader)
     : m_loader( loader ), m_isSorted( false )
 {
 }
 
 /**
  * \brief Overloaded c'tor using a List of Plugins and a type name
  * Overloaded Constructor to work with a 'Type' of plugins
  * and a correspending list of those. In this case calling load
  * is a no operation.
  *
  * @param name The name of your plugin ('today','inputmethods','applets')
  * @param lst A List with plugins of your type to manage
  * @param isSorted If the List should be treated sorted
  */
 OPluginManager::OPluginManager( const QString& name, const OPluginItem::List& lst,  bool isSorted)
     : m_loader( 0l ), m_cfgName( name ), m_plugins( lst ), m_isSorted( isSorted )
 {
 }
 
 /**
  * \brief A simple d'tor
  */
 OPluginManager::~OPluginManager() {
 }
 
 /**
  * \brief Return the OPluginItem where loading is likely to have crashed  on.
 
  * Return the Item that made the OGenericPluginLoader crash
  * the returned OPluginItem could be  empty if no crash occured
  * which should apply most of the time. It could also be empty if the crashed
  * plugin is not in the current list of available/managed plugins
  *
  * @see OPluginItem::isEmpty
  * @return OPluginItem that crashed  the loader
  */
 OPluginItem OPluginManager::crashedPlugin()const {
     return m_crashed;
 }
 
 /**
  * \brief Return a list of plugins that are managed by this OPluginManager
  *
  * Return the list of managed plugins. This could either result
  * from passing a OGenericPluginLoader and calling load or by
  * giving name and a list of plugins.
  */
 OPluginItem::List OPluginManager::managedPlugins()const {
     return m_plugins;
 }
 
 /**
  * \brief Set the position of the items
  *
  * Replace the OPluginItem  with the name and path and this way
  * apply the new position. The search is linear and this way O(n/2)
  * You still need to call save()  to make your changes effective. After saving
  * a call to OGenericPluginLoader::filtered() returns the newly configured order and items
  *
  * @param item The  OPluginItem to be replaced internall
  *
  */
 void OPluginManager::setPosition( const OPluginItem& item) {
     replace( item );
 }
 
 /**
  * \brief Enable the item specified as argument
  *
  * This will make sure that OPluginItem::setEnabled is called and then will replace
  * the item with one that matches name and path internally.
  * @see setPosition
  *
  * @param the Item to enable
  */
 void OPluginManager::enable(  const OPluginItem& item ) {
     setEnabled( item, true );
 }
 
 /**
  * \brief disable the Item.
  *
  * Disable the OPluginItem. Same applies as in
  * @see setPosition and @see enable
  *
  * @param item Item to disable
  */
 void OPluginManager::disable( const OPluginItem& item) {
     setEnabled( item, false );