diff -r 5de72ea7a065 -r 579cc610882e calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp --- a/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Wed Jun 23 18:11:28 2010 +0300 +++ b/calendarui/regionalplugins/lunarchinese/src/CalenLunarChinesePlugin.cpp Tue Jul 06 14:14:56 2010 +0300 @@ -18,13 +18,12 @@ #include #include -#include #include #include #include #include #include -#include +#include #include #include @@ -102,11 +101,13 @@ } delete iInfoProvider; + iInfoProvider = NULL; delete iLocalizer; + iLocalizer = NULL; delete iLocInfo; + iLocInfo = NULL; // Remove the translator for plugin - HbApplication::instance()->removeTranslator(iTranslator); if (iTranslator) { delete iTranslator; iTranslator = 0; @@ -125,13 +126,7 @@ iServices->GetCommandRange( iStart, iEnd ); // Install the translator before the CCalenLunarLocalizer is constructed - iTranslator = new QTranslator; - QString lang = QLocale::system().name(); - QString path = "Z:/resource/qt/translations/"; - bool loaded = iTranslator->load("calenregional_en_GB", ":/translations"); - // TODO: Load the appropriate .qm file based on locale - //bool loaded = iTranslator->load("calenregional_" + lang, path); - HbApplication::instance()->installTranslator(iTranslator); + iTranslator = new HbTranslator("calenregional"); iLocalizer = CCalenLunarLocalizer::NewL(); @@ -269,7 +264,7 @@ void CCalenLunarChinesePlugin::UpdateLocalizerInfoL() { TRACE_ENTRY_POINT; - QDateTime focusDateTime= iServices->Context().focusDateAndTimeL(); + QDateTime focusDateTime= iServices->Context().focusDateAndTime(); TDateTime tempDateTime( focusDateTime.date().year(), static_cast(focusDateTime.date().month() - 1),