diff --git a/DGWTimeServer/TimeServerConfig.cpp b/DGWTimeServer/TimeServerConfig.cpp index 0a2f170..5516f54 100644 --- a/DGWTimeServer/TimeServerConfig.cpp +++ b/DGWTimeServer/TimeServerConfig.cpp @@ -112,7 +112,7 @@ bool CTimeServerConfig::loadTimeServer(const CConfig & cfg) else if(format == "text") m_timeServer.format = FORMAT_TEXT_TIME; std::string lang; - ret = cfg.getValue("timeserver", "language", lang, "english_uk_1", {"english_uk_1", "english_uk_2", "english_us_1", "english_us_2", "deutsch_1", "deutsch_2", "francais", "nederlands", "svenska", "espanol", "norsk", "portugues"}) && ret;; + ret = cfg.getValue("timeserver", "language", lang, "english_uk_1", {"english_uk_1", "english_uk_2", "english_us_1", "english_us_2", "deutsch_1", "deutsch_2", "francais", "francais_2" "nederlands", "svenska", "espanol", "norsk", "portugues"}) && ret;; if (lang == "english_uk_1") m_timeServer.language = LANG_ENGLISH_UK_1; else if(lang == "english_uk_2") m_timeServer.language = LANG_ENGLISH_UK_2; else if(lang == "english_us_1") m_timeServer.language = LANG_ENGLISH_US_1; @@ -120,6 +120,7 @@ bool CTimeServerConfig::loadTimeServer(const CConfig & cfg) else if(lang == "deutsch_1" ) m_timeServer.language = LANG_DEUTSCH_1; else if(lang == "detusch_2" ) m_timeServer.language = LANG_DEUTSCH_2; else if(lang == "francais" ) m_timeServer.language = LANG_FRANCAIS; + else if(lang == "francais_2" ) m_timeServer.language = LANG_FRANCAIS_2; else if(lang == "nederlands" ) m_timeServer.language = LANG_NEDERLANDS; else if(lang == "svenska" ) m_timeServer.language = LANG_SVENSKA; else if(lang == "espanol" ) m_timeServer.language = LANG_ESPANOL; diff --git a/DGWTimeServer/TimeServerDefs.h b/DGWTimeServer/TimeServerDefs.h index b6910c2..b92433f 100644 --- a/DGWTimeServer/TimeServerDefs.h +++ b/DGWTimeServer/TimeServerDefs.h @@ -29,6 +29,7 @@ enum LANGUAGE { LANG_DEUTSCH_1, LANG_DEUTSCH_2, LANG_FRANCAIS, + LANG_FRANCAIS_2, LANG_NEDERLANDS, LANG_SVENSKA, LANG_ESPANOL, diff --git a/DGWTimeServer/TimeServerThread.cpp b/DGWTimeServer/TimeServerThread.cpp index e3f90ff..2530f6a 100644 --- a/DGWTimeServer/TimeServerThread.cpp +++ b/DGWTimeServer/TimeServerThread.cpp @@ -186,6 +186,7 @@ void CTimeServerThread::sendTime(unsigned int hour, unsigned int min) words = sendTimeDeDE2(hour, min); break; case LANG_FRANCAIS: + case LANG_FRANCAIS_2: words = sendTimeFrFR(hour, min); break; case LANG_NEDERLANDS: @@ -953,6 +954,10 @@ bool CTimeServerThread::loadAMBE() ambeFileName = "TIME_fr_FR.ambe"; indxFileName = "TIME_fr_FR.indx"; break; + case LANG_FRANCAIS_2: + ambeFileName = "TIME_fr_FR2.ambe"; + indxFileName = "TIME_fr_FR2.indx"; + break; case LANG_NEDERLANDS: ambeFileName = "TIME_nl_NL.ambe"; indxFileName = "TIME_nl_NL.indx"; @@ -1093,6 +1098,7 @@ bool CTimeServerThread::send(const std::vector &words, unsigned int slowData = CStringUtils::string_format(("Es ist %02u:%02u Uhr"), hour, min); break; case LANG_FRANCAIS: + case LANG_FRANCAIS_2: header.setMyCall2(("TIME")); slowData = CStringUtils::string_format(("Il est %02u:%02u"), hour, min); break;