mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 06:08:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix translations on CLI commands.

Browse source 
Use Phone number assistant : Fix phone number that was considered as not valid.
This commit is contained in:
Julien Wadel 2022-11-07 10:03:45 +01:00
parent 19de0a5d6c
commit dcf77ffe79
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
linphone-app/src/app/App.cpp
View file

@ -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();
}

2
linphone-app/ui/views/App/Main/Assistant/UseAppSipAccount.qml
View file

@ -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'