data/linux.x86.linphone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix login error messages in french

Browse source 
try to remove ninja compile
This commit is contained in:
gaelle 2025-03-04 11:34:42 +01:00
parent 5f804e2e44
commit c65c5c8c5a
3 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
View file

@ -4,7 +4,7 @@
ubuntu2004-ninja-gcc: ubuntu2004-ninja-gcc:
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null
variables: variables:
CMAKE_GENERATOR: Ninja CMAKE_GENERATOR: Ninja
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
@ -18,23 +18,23 @@ ubuntu2004-ninja-gcc:
# Nightly # Nightly
################################################# #################################################
ubuntu2004-makefile-gcc: # ubuntu2004-makefile-gcc:
rules: # rules:
- !reference [.rules-merge-request-manual, rules] # - !reference [.rules-merge-request-manual, rules]
- if: $NIGHTLY_MASTER # - if: $NIGHTLY_MASTER
variables: # variables:
CMAKE_GENERATOR: Unix Makefiles # CMAKE_GENERATOR: Unix Makefiles
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON # CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
CC: gcc # CC: gcc
CXX: g++ # CXX: g++
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS # ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
extends: .linux-desktop # extends: .linux-desktop
<<: *docker_image_platform_and_runner_tag # <<: *docker_image_platform_and_runner_tag
ubuntu2004-ninja-clang: ubuntu2004-ninja-clang:
rules: rules:
- !reference [.rules-merge-request-manual, rules] - !reference [.rules-merge-request-manual, rules]
- if: $NIGHTLY_MASTER == null - if: $NIGHTLY_MASTER && $SKIP_LINUX != 1
variables: variables:
CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON CMAKE_OPTIONS: -DENABLE_DOC=ON -DENABLE_G729=ON -DENABLE_PQCRYPTO=ON -DENABLE_GPL_THIRD_PARTIES=ON
CMAKE_GENERATOR: Ninja CMAKE_GENERATOR: Ninja
@ -46,7 +46,7 @@ ubuntu2004-ninja-clang:
ubuntu2004-ninja-clang-small: ubuntu2004-ninja-clang-small:
rules: rules:
- !reference [.rules-merge-request-manual, rules] - !reference [.rules-merge-request-manual, rules]
- if: $NIGHTLY_MASTER == null - if: $NIGHTLY_MASTER && $SKIP_LINUX != 1
variables: variables:
CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_ADVANCED_IM=NO -DENABLE_DB_STORAGE=NO -DENABLE_PQCRYPTO=OFF CMAKE_OPTIONS: -DENABLE_VIDEO=NO -DENABLE_ADVANCED_IM=NO -DENABLE_DB_STORAGE=NO -DENABLE_PQCRYPTO=OFF
extends: ubuntu2004-ninja-clang extends: ubuntu2004-ninja-clang

2
Linphone/core/login/LoginPage.cpp
View file

@ -76,7 +76,7 @@ void LoginPage::login(const QString &username,
switch (state) { switch (state) {
case linphone::RegistrationState::Failed: { case linphone::RegistrationState::Failed: {
if (message.isEmpty()) if (message.isEmpty())
setErrorMessage(QString(tr("Le couple identifiant mot de passe ne correspond pas"))); setErrorMessage(QString(tr("Erreur durant la connexion")));
else else
setErrorMessage(message); setErrorMessage(message);
if (accountManager) { if (accountManager) {

11
Linphone/model/account/AccountManager.cpp
View file

@ -105,7 +105,7 @@ bool AccountManager::login(QString username,
.arg(QStringLiteral("Unable to set identity address: `%1`.")) .arg(QStringLiteral("Unable to set identity address: `%1`."))
.arg(Utils::coreStringToAppString(identity->asStringUriOnly())); .arg(Utils::coreStringToAppString(identity->asStringUriOnly()));
*errorMessage = *errorMessage =
tr("Unable to set identity address: `%1`.").arg(Utils::coreStringToAppString(identity->asStringUriOnly())); tr("Impossible de configurer l'adresse : `%1`.").arg(Utils::coreStringToAppString(identity->asStringUriOnly()));
return false; return false;
} }
@ -125,20 +125,23 @@ bool AccountManager::login(QString username,
mAccountModel->setSelf(mAccountModel); mAccountModel->setSelf(mAccountModel);
connect(mAccountModel.get(), &AccountModel::registrationStateChanged, this, connect(mAccountModel.get(), &AccountModel::registrationStateChanged, this,
[this, authInfo, core](const std::shared_ptr<linphone::Account> &account, linphone::RegistrationState state, [this, authInfo, core](const std::shared_ptr<linphone::Account> &account, linphone::RegistrationState state,
const std::string &message) { const std::string &message) {
QString errorMessage = QString::fromStdString(message);
if (mAccountModel && account == mAccountModel->getAccount()) { if (mAccountModel && account == mAccountModel->getAccount()) {
if (state == linphone::RegistrationState::Failed) { if (state == linphone::RegistrationState::Failed) {
connect( connect(
mAccountModel.get(), &AccountModel::removed, this, [this]() { mAccountModel = nullptr; }, mAccountModel.get(), &AccountModel::removed, this, [this]() { mAccountModel = nullptr; },
Qt::SingleShotConnection); Qt::SingleShotConnection);
mAccountModel->removeAccount(); if (account->getError() == linphone::Reason::Forbidden) errorMessage = tr("Le couple identifiant mot de passe ne correspond pas");
else errorMessage = tr("Erreur durant la connexion");
mAccountModel->removeAccount();
} else if (state == linphone::RegistrationState::Ok) { } else if (state == linphone::RegistrationState::Ok) {
core->setDefaultAccount(account); core->setDefaultAccount(account);
emit mAccountModel->removeListener(); emit mAccountModel->removeListener();
mAccountModel = nullptr; mAccountModel = nullptr;
} }
} }
emit registrationStateChanged(state, QString::fromStdString(message)); emit registrationStateChanged(state, errorMessage);
}); });
auto status = core->addAccount(account); auto status = core->addAccount(account);
if (status == -1) { if (status == -1) {