- album search error because of i18n corrected

git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@47 e10066b5-e1e2-0310-b819-94efdf66514b

3 files changed, 22 insertions, 18 deletions

diff --git a/TODO b/TODO
index 7ae39f5..2ce638a 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,6 @@ Code polishing
 - check for memory leaks
 - check for (reasonably) consistent usage of char*/string
 - mg_database is not used
-- album filter works not properly
 
 Short term items
 ================
@@ -16,7 +15,6 @@ OSD
 - DisplayTrackInfo
 - DisplayAlbumInfo
 - Edit playlist (means moving tracks around?)
-- i18n
 
 Content
 -------
diff --git a/gd_content_interface.c b/gd_content_interface.c
index d01e97d..2ceedb5 100644
--- a/gd_content_interface.c
+++ b/gd_content_interface.c
@@ -3,8 +3,8 @@
  * \brief  Data Objects for content (e.g. mp3 files, movies)
  * for the vdr muggle plugindatabase
  ******************************************************************** 
- * \version $Revision: 1.19 $
- * \date    $Date: 2004/02/23 15:56:19 $
+ * \version $Revision: 1.20 $
+ * \date    $Date: 2004/02/23 16:30:58 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
  * \author  file owner: $Author: RaK $
  *
@@ -190,22 +190,22 @@ string gdFilterSets::computeRestriction(int *viewPrt)
   {
     if((*iter)->isSet())
     {
-      if(strcmp((*iter)->getName(), "playlist title") == 0 )
+      if(strcmp((*iter)->getName(), tr("playlist title")) == 0 )
       {
         sql_str = sql_str + " AND playlist.title like '%%" 
            + (*iter)->getStrVal() + "%%'";
       }
-      else if(strcmp((*iter)->getName(), "playlist author") == 0 )
+      else if(strcmp((*iter)->getName(), tr("playlist author")) == 0 )
       {
         sql_str = sql_str + " AND playlist.author like '%%" 
            + (*iter)->getStrVal() + "%%'";
       }
-      else if(strcmp((*iter)->getName(), "album title") == 0 )
+      else if(strcmp((*iter)->getName(), tr("album title")) == 0 )
       {
         sql_str = sql_str + " AND album.title like '%%" 
            + (*iter)->getStrVal() + "%%'";
       }
-      else if(strcmp((*iter)->getName(), "album artist") == 0 )
+      else if(strcmp((*iter)->getName(), tr("album artist")) == 0 )
       { 
         sql_str = sql_str + " AND album.artist like '%%" 
          + (*iter)->getStrVal() + "%%'";
@@ -220,22 +220,22 @@ string gdFilterSets::computeRestriction(int *viewPrt)
         sql_str = sql_str + " AND tracks.artist like '%%" 
          + (*iter)->getStrVal() + "%%'";
       }
-      else if(strcmp((*iter)->getName(), "genre") == 0 )
+      else if(strcmp((*iter)->getName(), tr("genre")) == 0 )
       { 
         sql_str = sql_str + " AND (genre1.genre like '" 
          + (*iter)->getStrVal() + "'";
         sql_str = sql_str + " OR genre2.genre like '" 
          + (*iter)->getStrVal() + "')";
       }
-      else if(strcmp((*iter)->getName(), "year (from)") == 0 )
+      else if(strcmp((*iter)->getName(), tr("year (from)")) == 0 )
       { 
         sql_str = sql_str + " AND tracks.year >= " + (*iter)->getStrVal();
       }
-      else if(strcmp((*iter)->getName(), "year (to)") == 0 )
+      else if(strcmp((*iter)->getName(), tr("year (to)")) == 0 )
       { 
         sql_str = sql_str + " AND tracks.year <= " + (*iter)->getStrVal();
       }
-      else if(strcmp((*iter)->getName(), "rating") == 0 )
+      else if(strcmp((*iter)->getName(), tr("rating")) == 0 )
       { 
         if ((*iter)->getStrVal() == "-") {
           sql_str = sql_str + " AND tracks.rating >= 0 ";
@@ -1391,6 +1391,9 @@ mgContentItem* GdTreeNode::getSingleTrack()
 
 /* -------------------- begin CVS log ---------------------------------
  * $Log: gd_content_interface.c,v $
+ * Revision 1.20  2004/02/23 16:30:58  RaK
+ * - album search error because of i18n corrected
+ *
  * Revision 1.19  2004/02/23 15:56:19  RaK
  * - i18n
  *
diff --git a/mg_media.c b/mg_media.c
index 4a2e83b..bbb682b 100644
--- a/mg_media.c
+++ b/mg_media.c
@@ -3,10 +3,10 @@
  *  \brief  Top level access to media in vdr plugin muggle
  *          for the vdr muggle plugindatabase
  ******************************************************************** 
- * \version $Revision: 1.11 $
- * \date    $Date: 2004/02/12 09:15:07 $
+ * \version $Revision: 1.12 $
+ * \date    $Date: 2004/02/23 16:30:58 $
  * \author  Ralf Klueber, Lars von Wedel, Andreas Kellner
- * \author  file owner: $Author: LarsAC $
+ * \author  file owner: $Author: RaK $
  */
 /*******************************************************************/
 
@@ -180,7 +180,7 @@ mgMedia::mgMedia(contentType mediatype)
 	case GD_MP3:
 	{
 	    errval = GdInitDatabase(&m_db);
-	    mgDebug(3, "Successfully conntected to sql database 'GiantDisc2'"); 
+	    mgDebug(3, "Successfully conntected to sql database 'GiantDisc'"); 
 	}
     }
     if(errval < 0)
@@ -194,7 +194,7 @@ mgMedia::mgMedia(contentType mediatype)
 	case GD_MP3:
 	{
 	    errval = GdInitDatabase(&m_db);
-	    mgDebug(3, "Successfully conntected to sql database 'GiantDisc2'"); 
+	    mgDebug(3, "Successfully conntected to sql database 'GiantDisc'"); 
 	}
     }
 }
@@ -220,7 +220,7 @@ string mgMedia::getMediaTypeName()
     switch(m_mediatype)
     {
 	case GD_MP3:
-	    return "GiantDisc2";
+	    return "GiantDisc";
     }	    
     mgError("implementation Error"); // we should never get here
     return "";
@@ -429,6 +429,9 @@ mgSelectionTreeNode *mgMedia::applyActiveFilter()
 
 /* -------------------- begin CVS log ---------------------------------
  * $Log: mg_media.c,v $
+ * Revision 1.12  2004/02/23 16:30:58  RaK
+ * - album search error because of i18n corrected
+ *
  * Revision 1.11  2004/02/12 09:15:07  LarsAC
  * Moved filter classes into separate files
  *