From: ghost Date: Tue, 5 Jul 2011 21:30:59 +0000 (+0200) Subject: Merge branch 'bug_785_fix_rtl_group_epg' into experimental X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=8932edecb7854241f2213d1ba77c629eff5aab85;hp=74e73fc17f163be508f19fc68ecce835be0177b9 Merge branch 'bug_785_fix_rtl_group_epg' into experimental --- diff --git a/lib/service/event.cpp b/lib/service/event.cpp index 949e150..85c8f5f 100644 --- a/lib/service/event.cpp +++ b/lib/service/event.cpp @@ -84,9 +84,11 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid) const ShortEventDescriptor *sed = (ShortEventDescriptor*)*desc; const std::string &cc = sed->getIso639LanguageCode(); int table=encodingHandler.getCountryCodeDefaultMapping(cc); + std::string s2; + std::transform(cc.begin(), cc.end(), s2.begin(), tolower); if (lang.empty()) - lang = cc; // use first found language - if (cc == lang) + lang = s2; // use first found language + if (lang == s2) { m_event_name = convertDVBUTF8(replace_all(replace_all(sed->getEventName(), "\n", " "), "\t", " "), table, tsidonid); m_short_description = convertDVBUTF8(sed->getText(), table, tsidonid); @@ -99,9 +101,11 @@ bool eServiceEvent::loadLanguage(Event *evt, std::string lang, int tsidonid) const ExtendedEventDescriptor *eed = (ExtendedEventDescriptor*)*desc; const std::string &cc = eed->getIso639LanguageCode(); int table=encodingHandler.getCountryCodeDefaultMapping(cc); + std::string s2; + std::transform(cc.begin(), cc.end(), s2.begin(), tolower); if (lang.empty()) - lang = cc; // use first found language - if (cc == lang) + lang = s2; // use first found language + if (lang == s2) { m_extended_description += convertDVBUTF8(eed->getText(), table, tsidonid); retval=1;