From dcf77ffe7962182a6f34bb5ef31f1aa312671b05 Mon Sep 17 00:00:00 2001
From: Julien Wadel <julien.wadel@belledonne-communications.com>
Date: Mon, 7 Nov 2022 10:03:45 +0100
Subject: [PATCH] Fix translations on CLI commands. Use Phone number assistant
 : Fix phone number that was considered as not valid.

---
 linphone-app/src/app/App.cpp                  | 22 +++++++++++--------
 .../App/Main/Assistant/UseAppSipAccount.qml   |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp
index 4dd083b69..2d6fd820a 100644
--- a/linphone-app/src/app/App.cpp
+++ b/linphone-app/src/app/App.cpp
@@ -153,7 +153,7 @@ static inline bool installLocale (App &app, QTranslator &translator, const QLoca
 }
 
 static inline string getConfigPathIfExists (const QCommandLineParser &parser) {
-	QString filePath = parser.value("config");
+	QString filePath = parser.isSet("config") ? parser.value("config") : "";
 	string configPath;
 	if(!QUrl(filePath).isRelative()){
 		configPath = Utils::appStringToCoreString(FileDownloader::synchronousDownload(filePath, Utils::coreStringToAppString(Paths::getConfigDirPath(false)), true));
@@ -217,12 +217,21 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U
 	}
 	bctbx_set_default_encoding(Constants::LinphoneLocaleEncoding);// Use UTF-8 for internals. Linphone uses UTF-8 so there will be no loss on data with less precise encodings. Qt will do the rest.
 	
+	
 	createParser();
+	mParser->parse(this->arguments());
+// Get configuration for translators
+	shared_ptr<linphone::Config> config = Utils::getConfigIfExists (QString::fromStdString(getConfigPathIfExists(*mParser)));
+	
+	// Init locale.
+	mTranslator = new DefaultTranslator(this);
+	mDefaultTranslator = new DefaultTranslator(this);
+	initLocale(config);
+	Logger::init(config);
+	
+	createParser();// Recreate parser in order to use translations from config.
 	mParser->process(*this);
 	
-	// Initialize logger.
-	shared_ptr<linphone::Config> config = Utils::getConfigIfExists (QString::fromStdString(getConfigPathIfExists(*mParser)));
-	Logger::init(config);
 	if (mParser->isSet("verbose"))
 		Logger::getInstance()->setVerbose(true);
 	
@@ -230,11 +239,6 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U
 	for (const auto &locale : QDir(Constants::LanguagePath).entryList())
 		mAvailableLocales << QLocale(locale);
 	
-	// Init locale.
-	mTranslator = new DefaultTranslator(this);
-	mDefaultTranslator = new DefaultTranslator(this);
-	initLocale(config);
-	
 	if (mParser->isSet("help")) {
 		mParser->showHelp();
 	}
diff --git a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml
index e7bbd5c14..4870c8155 100644
--- a/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml
+++ b/linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml
@@ -89,7 +89,7 @@ AssistantAbstractView {
 		
 		function setCountryCode (index) {
 			var model = telephoneNumbersModel
-			assistantModel.countryCode = index !== -1 ? model.data(model.index(index, 0)).countryCode || '' : ''
+			assistantModel.countryCode = index !== -1 ?  model.data(model.index(index, 0),"countryCode") || '' : ''
 		}
 		
 		configFilename: 'use-app-sip-account.rc'