Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-desktop
Commits
ee8e8a4f
Commit
ee8e8a4f
authored
1 week ago
by
Gaëlle Braud
Browse files
Options
Download
Patches
Plain Diff
use system locale
parent
3eca1736
master
feature/translation
release/6.0
1 merge request
!1372
English translation + use system locale to determine linphone language
Pipeline
#92488
passed with stages
in 57 minutes and 47 seconds
Changes
1
Pipelines
13
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Linphone/core/App.cpp
+6
-7
Linphone/core/App.cpp
with
6 additions
and
7 deletions
Linphone/core/App.cpp
+
6
−
7
View file @
ee8e8a4f
...
...
@@ -569,14 +569,13 @@ void App::initLocale() {
QString
locale
;
// Use english. This default translator is used if there are no found translations in others loads
mLocale
=
QLocale
(
QLocale
::
Frenc
h
);
mLocale
=
QLocale
(
QLocale
::
Englis
h
);
if
(
!
installLocale
(
*
this
,
*
mDefaultTranslatorCore
,
mLocale
))
qFatal
(
"Unable to install default translator."
);
if
(
installLocale
(
*
this
,
*
mTranslatorCore
,
getLocale
()))
{
qDebug
()
<<
"installed locale"
<<
getLocale
().
name
();
return
;
}
// if (installLocale(*this, *mTranslatorCore, getLocale())) {
// qDebug() << "installed locale" << getLocale().name();
// return;
// }
// Try to use system locale.
// #ifdef Q_OS_MACOS
...
...
@@ -1211,7 +1210,7 @@ void App::setSysTrayIcon() {
//-----------------------------------------------------------
void
App
::
setLocale
(
QString
configLocale
)
{
if
(
configLocale
.
isEmpty
())
mLocale
=
QLocale
(
configLocale
);
if
(
!
configLocale
.
isEmpty
())
mLocale
=
QLocale
(
configLocale
);
else
mLocale
=
QLocale
(
QLocale
::
system
().
name
());
}
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets