From 708b6a3ad0cb901e2df11f9e74326f093b24e851 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 19 Sep 2012 21:58:21 +0200 Subject: [PATCH] - neutrino.cpp: localize "Saving EPG" --- data/locale/deutsch.locale | 1 + data/locale/english.locale | 1 + src/neutrino.cpp | 10 +++++----- src/system/locals.h | 1 + src/system/locals_intern.h | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 1b6fe0dfc..2ca31dd32 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -292,6 +292,7 @@ date.Sun So date.Thu Do date.Tue Di date.Wed Mi +epg.saving Speichere EPG epgextended.actors Darsteller epgextended.director Regie epgextended.guests Gäste diff --git a/data/locale/english.locale b/data/locale/english.locale index 3219c99bb..3f3100cbf 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -292,6 +292,7 @@ date.Sun Sun date.Thu Thu date.Tue Tue date.Wed Wed +epg.saving Saving EPG epgextended.actors Actors epgextended.director Director epgextended.guests Guests diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 004e2dfd7..369f89771 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3063,16 +3063,16 @@ void CNeutrinoApp::saveEpg(bool cvfd_mode) { struct stat my_stat; if(stat(g_settings.epg_dir.c_str(), &my_stat) == 0){ - const char *save_txt = "Saving EPG"; - printf("%s to %s....\n",save_txt, g_settings.epg_dir.c_str()); - neutrino_msg_t msg; - neutrino_msg_data_t data; + printf("[neutrino] Saving EPG to %s...\n", g_settings.epg_dir.c_str()); CVFD::getInstance()->Clear(); CVFD::getInstance()->setMode(CVFD::MODE_TVRADIO); - CVFD::getInstance ()->ShowText(save_txt); + CVFD::getInstance()->ShowText(g_Locale->getText(LOCALE_EPG_SAVING)); g_Sectionsd->writeSI2XML(g_settings.epg_dir.c_str()); + + neutrino_msg_t msg; + neutrino_msg_data_t data; while( true ) { g_RCInput->getMsg(&msg, &data, 1200); // 120 secs.. if (( msg == CRCInput::RC_timeout ) || (msg == NeutrinoMessages::EVT_SI_FINISHED)) { diff --git a/src/system/locals.h b/src/system/locals.h index fc39162e1..272c29188 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -319,6 +319,7 @@ typedef enum LOCALE_DATE_THU, LOCALE_DATE_TUE, LOCALE_DATE_WED, + LOCALE_EPG_SAVING, LOCALE_EPGEXTENDED_ACTORS, LOCALE_EPGEXTENDED_DIRECTOR, LOCALE_EPGEXTENDED_GUESTS, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index eedc2a634..2879066a0 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -319,6 +319,7 @@ const char * locale_real_names[] = "date.Thu", "date.Tue", "date.Wed", + "epg.saving", "epgextended.actors", "epgextended.director", "epgextended.guests",