Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
659a6a5f
Commit
659a6a5f
authored
Jul 19, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(app): display locale only if help or version is not displayed
parent
29b90408
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
App.cpp
src/app/App.cpp
+2
-3
No files found.
src/app/App.cpp
View file @
659a6a5f
...
...
@@ -102,6 +102,8 @@ App::App (int &argc, char *argv[]) : SingleApplication(argc, argv, true, Mode::U
if
(
mParser
->
isSet
(
"version"
))
mParser
->
showVersion
();
qInfo
()
<<
QStringLiteral
(
"Use locale: %1"
).
arg
(
mLocale
);
}
App
::~
App
()
{
...
...
@@ -462,7 +464,6 @@ void App::initLocale (const shared_ptr<linphone::Config> &config) {
if
(
!
locale
.
isEmpty
()
&&
::
installLocale
(
*
this
,
*
mTranslator
,
QLocale
(
locale
)))
{
mLocale
=
locale
;
qInfo
()
<<
QStringLiteral
(
"Use preferred locale: %1"
).
arg
(
locale
);
return
;
}
...
...
@@ -470,7 +471,6 @@ void App::initLocale (const shared_ptr<linphone::Config> &config) {
QLocale
sysLocale
=
QLocale
::
system
();
if
(
::
installLocale
(
*
this
,
*
mTranslator
,
sysLocale
))
{
mLocale
=
sysLocale
.
name
();
qInfo
()
<<
QStringLiteral
(
"Use system locale: %1"
).
arg
(
mLocale
);
return
;
}
...
...
@@ -478,7 +478,6 @@ void App::initLocale (const shared_ptr<linphone::Config> &config) {
mLocale
=
DEFAULT_LOCALE
;
if
(
!::
installLocale
(
*
this
,
*
mTranslator
,
QLocale
(
mLocale
)))
qFatal
(
"Unable to install default translator."
);
qInfo
()
<<
QStringLiteral
(
"Use default locale: %1"
).
arg
(
mLocale
);
}
QString
App
::
getConfigLocale
()
const
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment