diff --git a/libtemplate/templateview.c b/libtemplate/templateview.c index 8410b66..2db31d9 100644 --- a/libtemplate/templateview.c +++ b/libtemplate/templateview.c @@ -265,6 +265,21 @@ void cTemplateView::Translate(void) { func->SetTranslatedText(translation); } } + if (func->GetType() == ftLoop) { + cTemplateLoopFunction *funcsLoop = dynamic_cast(func); + funcsLoop->InitIterator(); + cTemplateFunction *loopFunc = NULL; + while(loopFunc = funcsLoop->GetNextFunction()) { + if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox) { + string text = loopFunc->GetParameter(ptText); + string translation; + bool translated = globals->Translate(text, translation); + if (translated) { + loopFunc->SetTranslatedText(translation); + } + } + } + } } } } @@ -346,6 +361,32 @@ void cTemplateView::Translate(void) { func->SetTranslatedText(translation); } } + if (func->GetType() == ftLoop) { + cTemplateLoopFunction *funcsLoop = dynamic_cast(func); + funcsLoop->InitIterator(); + cTemplateFunction *loopFunc = NULL; + while(loopFunc = funcsLoop->GetNextFunction()) { + if (loopFunc->GetType() == ftDrawText || loopFunc->GetType() == ftDrawTextBox) { + string text = loopFunc->GetParameter(ptText); + string translation; + bool translated = globals->Translate(text, translation); + if (translated) { + loopFunc->SetTranslatedText(translation); + } + } + } + } + } + } + + //Translate Plugin Views + for (map < string, map< int, cTemplateView*> >::iterator it = pluginViews.begin(); it != pluginViews.end(); it++) { + esyslog("skindesigner: translating plugin %s", (it->first).c_str()); + map< int, cTemplateView*> plugViews = it->second; + for (map< int, cTemplateView*>::iterator it2 = plugViews.begin(); it2 != plugViews.end(); it2++) { + esyslog("skindesigner: translating view %d", (int)it2->first); + cTemplateView *pluginView = it2->second; + pluginView->Translate(); } } diff --git a/skins/metrixhd/themes/default/globals.xml b/skins/metrixhd/themes/default/globals.xml index 3f54d56..006eb5a 100644 --- a/skins/metrixhd/themes/default/globals.xml +++ b/skins/metrixhd/themes/default/globals.xml @@ -194,6 +194,82 @@ Pause Pause + + Temperature + Temperatur + + + Felt Temperature + Gefühlte Temperatur + + + minimum today + heutiges Minimum + + + maximum today + heutiges Maximum + + + Precipitation Prob. + Regenwahrsch. + + + Precipitation Intensity + Regenmenge + + + Humidity + Luftfeuchtigkeit + + + Felt Temperature + Gefühlte Temperatur + + + Wind Bearing + Windrichtung + + + Wind Speed + Windgeschwindigkeit + + + Cloud Cover + Bewölkung + + + Pressure + Luftdruck + + + Ozone + Ozon + + + visibility + Sicht + + + Weather Conditions + Wetterlage + + + from + aus + + + felt + gefühlt + + + min + min + + + max + max + - + @@ -59,22 +123,22 @@ - + - - - - - - - - - - + + + + + + + + + + diff --git a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml index 42026d5..f1b07e2 100644 --- a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml +++ b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml @@ -14,21 +14,6 @@ - - - - - - - - - - - - - - - @@ -48,19 +33,54 @@ + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetaildaily.xml b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetaildaily.xml index 42026d5..72b98a6 100644 --- a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetaildaily.xml +++ b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetaildaily.xml @@ -14,21 +14,6 @@ - - - - - - - - - - - - - - - @@ -49,18 +34,54 @@ + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + diff --git a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailhourly.xml b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailhourly.xml index c7e41e8..f90e34f 100644 --- a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailhourly.xml +++ b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailhourly.xml @@ -14,21 +14,6 @@ - - - - - - - - - - - - - - - @@ -48,15 +33,53 @@ + + + + + + + + + + + + + - + + + - - - + + + +