From f5de22926912e0844af2a594ac2a12c8d52719a8 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 14 Jun 2017 10:52:29 +0200 Subject: [PATCH] feat(src/app/App): display correctly help in the correct locale --- linphone-desktop/assets/languages/en.ts | 4 ++-- linphone-desktop/assets/languages/fr.ts | 4 ++-- linphone-desktop/src/app/App.cpp | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/linphone-desktop/assets/languages/en.ts b/linphone-desktop/assets/languages/en.ts index 4518af654..ce13a4cf0 100644 --- a/linphone-desktop/assets/languages/en.ts +++ b/linphone-desktop/assets/languages/en.ts @@ -78,11 +78,11 @@ commandLineOptionHelp - + show this help commandLineOptionVersion - + show app version diff --git a/linphone-desktop/assets/languages/fr.ts b/linphone-desktop/assets/languages/fr.ts index 833a44a47..244b9578d 100644 --- a/linphone-desktop/assets/languages/fr.ts +++ b/linphone-desktop/assets/languages/fr.ts @@ -78,11 +78,11 @@ commandLineOptionHelp - + affiche cette aide commandLineOptionVersion - + affiche la version de l'application diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp index 6dc9cb22d..4be0bf53f 100644 --- a/linphone-desktop/src/app/App.cpp +++ b/linphone-desktop/src/app/App.cpp @@ -90,10 +90,11 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true) { mTranslator = new DefaultTranslator(this); initLocale(); - parseArgs(); - - if (mParser->isSet("help")) + if (mParser->isSet("help")) { + parseArgs(); mParser->showHelp(); + } + if (mParser->isSet("version")) mParser->showVersion(); }