Fix wrong slow data text when selecting francais_2 #60

Common/AudioUnit.cpp

@@ -72,7 +72,7 @@ void CAudioUnit::setLanguage(const std::string & dir, TEXT_LANG language)
 			ambeFileName = "fr_FR.ambe";
 			indxFileName = "fr_FR.indx";
 			break;
-		case TL_FRANCAIS2:
+		case TL_FRANCAIS_2:
 			ambeFileName = "fr_FR2.ambe";
 			indxFileName = "fr_FR2.indx";
 			break;

Common/Defs.h

@@ -91,7 +91,7 @@ enum TEXT_LANG {
 	TL_DEUTSCH,
 	TL_DANSK,
 	TL_FRANCAIS,
-	TL_FRANCAIS2,
+	TL_FRANCAIS_2,
 	TL_ITALIANO,
 	TL_POLSKI,
 	TL_ENGLISH_US,

Common/RepeaterHandler.cpp

@@ -2468,6 +2468,7 @@ void CRepeaterHandler::writeLinkingTo(const std::string &callsign)
 			text = CStringUtils::string_format("Linker til %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = CStringUtils::string_format("Connexion a %s", callsign.c_str());
 			break;
 		case TL_ITALIANO:
@@ -2523,6 +2524,7 @@ void CRepeaterHandler::writeLinkedTo(const std::string &callsign)
 			text = CStringUtils::string_format("Linket til %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = CStringUtils::string_format("Connecte a %s", callsign.c_str());
 			break;
 		case TL_ITALIANO:
@@ -2578,6 +2580,7 @@ void CRepeaterHandler::writeNotLinked()
 			text = "Ikke forbundet";
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			break;
 		case TL_ITALIANO:
@@ -2636,6 +2639,7 @@ void CRepeaterHandler::writeIsBusy(const std::string& callsign)
 			tempText = CStringUtils::string_format("Optaget fra %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			tempText = CStringUtils::string_format("Occupe par %s", callsign.c_str());
 			break;
@@ -2704,6 +2708,7 @@ void CRepeaterHandler::ccsLinkMade(const std::string& callsign, DIRECTION direct
 			text = CStringUtils::string_format("Linket til %s", callsign.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = CStringUtils::string_format("Connecte a %s", callsign.c_str());
 			break;
 		case TL_ITALIANO:
@@ -2769,6 +2774,7 @@ void CRepeaterHandler::ccsLinkEnded(const std::string&, DIRECTION direction)
 			tempText = "CCS er afsluttet";
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			tempText = "CCS a pris fin";
 			break;
@@ -2848,6 +2854,7 @@ void CRepeaterHandler::ccsLinkFailed(const std::string& dtmf, DIRECTION directio
 			tempText = CStringUtils::string_format("%s unknown", dtmf.c_str());
 			break;
 		case TL_FRANCAIS:
+		case TL_FRANCAIS_2:
 			text = "Non connecte";
 			tempText = CStringUtils::string_format("%s inconnu", dtmf.c_str());
 			break;

DStarGateway/DStarGatewayConfig.cpp

@@ -354,7 +354,7 @@ bool CDStarGatewayConfig::loadGateway(const CConfig & cfg)
 	else if(lang == "deutsch")		m_gateway.language = TL_DEUTSCH;
 	else if(lang == "dansk")		m_gateway.language = TL_DANSK;
 	else if(lang == "francais")		m_gateway.language = TL_FRANCAIS;
-	else if(lang == "francais_2")	m_gateway.language = TL_FRANCAIS2;
+	else if(lang == "francais_2")	m_gateway.language = TL_FRANCAIS_2;
 	else if(lang == "italiano") 	m_gateway.language = TL_ITALIANO;
 	else if(lang == "polski")		m_gateway.language = TL_POLSKI;
 	else if(lang == "english_us")	m_gateway.language = TL_ENGLISH_US;