Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-windows
Commits
acb75b0f
Commit
acb75b0f
authored
Mar 16, 2020
by
Ming Rui Zhang
Browse files
translations: QTranslator scope change from local to application
Change-Id: I4a1966e9c453ab954ab05117757490b21e5936fb
parent
fd9c2e28
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/mainapplication.cpp
View file @
acb75b0f
...
...
@@ -144,32 +144,32 @@ MainApplication::loadTranslations()
const
auto
locale_name
=
QLocale
::
system
().
name
();
const
auto
locale_lang
=
locale_name
.
split
(
'_'
)[
0
];
QTranslator
qtTranslator_lang
;
QTranslator
qtTranslator_name
;
QTranslator
*
qtTranslator_lang
=
new
QTranslator
(
this
)
;
QTranslator
*
qtTranslator_name
=
new
QTranslator
(
this
)
;
if
(
locale_name
!=
locale_lang
)
{
if
(
qtTranslator_lang
.
load
(
"qt_"
+
locale_lang
,
QLibraryInfo
::
location
(
QLibraryInfo
::
TranslationsPath
)))
installTranslator
(
&
qtTranslator_lang
);
if
(
qtTranslator_lang
->
load
(
"qt_"
+
locale_lang
,
QLibraryInfo
::
location
(
QLibraryInfo
::
TranslationsPath
)))
installTranslator
(
qtTranslator_lang
);
}
qtTranslator_name
.
load
(
"qt_"
+
locale_name
,
QLibraryInfo
::
location
(
QLibraryInfo
::
TranslationsPath
));
installTranslator
(
&
qtTranslator_name
);
qtTranslator_name
->
load
(
"qt_"
+
locale_name
,
QLibraryInfo
::
location
(
QLibraryInfo
::
TranslationsPath
));
installTranslator
(
qtTranslator_name
);
QTranslator
lrcTranslator_lang
;
QTranslator
lrcTranslator_name
;
QTranslator
*
lrcTranslator_lang
=
new
QTranslator
(
this
)
;
QTranslator
*
lrcTranslator_name
=
new
QTranslator
(
this
)
;
if
(
locale_name
!=
locale_lang
)
{
if
(
lrcTranslator_lang
.
load
(
appDir
+
"share/libringclient/translations/lrc_"
+
locale_lang
))
installTranslator
(
&
lrcTranslator_lang
);
if
(
lrcTranslator_lang
->
load
(
appDir
+
"share/libringclient/translations/lrc_"
+
locale_lang
))
installTranslator
(
lrcTranslator_lang
);
}
if
(
lrcTranslator_name
.
load
(
appDir
+
"share/libringclient/translations/lrc_"
+
locale_name
))
installTranslator
(
&
lrcTranslator_name
);
if
(
lrcTranslator_name
->
load
(
appDir
+
"share/libringclient/translations/lrc_"
+
locale_name
))
installTranslator
(
lrcTranslator_name
);
QTranslator
mainTranslator_lang
;
QTranslator
mainTranslator_name
;
QTranslator
*
mainTranslator_lang
=
new
QTranslator
(
this
)
;
QTranslator
*
mainTranslator_name
=
new
QTranslator
(
this
)
;
if
(
locale_name
!=
locale_lang
)
{
if
(
mainTranslator_lang
.
load
(
appDir
+
"share/ring/translations/ring_client_windows_"
+
locale_lang
))
installTranslator
(
&
mainTranslator_lang
);
if
(
mainTranslator_lang
->
load
(
appDir
+
"share/ring/translations/ring_client_windows_"
+
locale_lang
))
installTranslator
(
mainTranslator_lang
);
}
if
(
mainTranslator_name
.
load
(
appDir
+
"share/ring/translations/ring_client_windows_"
+
locale_name
))
installTranslator
(
&
mainTranslator_name
);
if
(
mainTranslator_name
->
load
(
appDir
+
"share/ring/translations/ring_client_windows_"
+
locale_name
))
installTranslator
(
mainTranslator_name
);
}
void
...
...
Write
Preview
Supports
Markdown
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