From 3b50e9d9d5f3e711de99076652c301b97a843af8 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 16 Dec 2011 10:27:30 +0000 Subject: [PATCH] MGR: in Simple View, localize institution, science area and description svn path=/trunk/boinc/; revision=24815 --- checkin_notes | 7 +++++++ clientgui/BOINCGUIApp.cpp | 1 + clientgui/sg_TaskPanel.cpp | 10 +++++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 57011f6c32..f891a4e750 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9051,3 +9051,10 @@ Charlie 14 Dec 2011 mac_installer/ make_CharityEngine.sh make_ProgThruProc.sh + +Charlie 16 Dec 2011 + - MGR: in Simple View, localize institution, science area and description. + + clientgui/ + BOINCGUIApp.cpp + sg_TaskPanel.cpp diff --git a/clientgui/BOINCGUIApp.cpp b/clientgui/BOINCGUIApp.cpp index 28d5d556b6..2e1917fb33 100644 --- a/clientgui/BOINCGUIApp.cpp +++ b/clientgui/BOINCGUIApp.cpp @@ -284,6 +284,7 @@ bool CBOINCGUIApp::OnInit() { m_pLocale->AddCatalogLookupPathPrefix(wxT("locale")); m_pLocale->AddCatalog(wxT("BOINC-Manager")); m_pLocale->AddCatalog(wxT("BOINC-Client")); + m_pLocale->AddCatalog(wxT("BOINC-Web")); InitSupportedLanguages(); diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp index da8331ca59..ae2d152713 100755 --- a/clientgui/sg_TaskPanel.cpp +++ b/clientgui/sg_TaskPanel.cpp @@ -243,6 +243,7 @@ void CSlideShowPanel::OnSlideShowTimer(wxTimerEvent& WXUNUSED(event)) { void CSlideShowPanel::AdvanceSlideShow(bool changeSlide, bool reload) { double xRatio, yRatio, ratio; unsigned int i; + wxString s; TaskSelectionData* selData = ((CSimpleTaskPanel*)GetParent())->GetTaskSelectionData(); if (selData == NULL) return; @@ -281,9 +282,12 @@ numSlides = 0; for (i=0; iurl.c_str(), selData->project_url)) { - m_institution->SetLabel(wxString(m_AllProjectsList.projects[i]->home.c_str(), wxConvUTF8)); - m_scienceArea->SetLabel(wxString(m_AllProjectsList.projects[i]->specific_area.c_str(), wxConvUTF8)); - m_description->SetValue(wxString(m_AllProjectsList.projects[i]->description.c_str(), wxConvUTF8)); + s = wxString(m_AllProjectsList.projects[i]->home.c_str(), wxConvUTF8); + m_institution->SetLabel(wxGetTranslation(s)); + s = wxString(m_AllProjectsList.projects[i]->specific_area.c_str(), wxConvUTF8); + m_scienceArea->SetLabel(wxGetTranslation(s)); + s = wxString(m_AllProjectsList.projects[i]->description.c_str(), wxConvUTF8); + m_description->SetValue(wxGetTranslation(s)); m_institution->Show(true); m_scienceArea->Show(true);