Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
Kdenlive
Commits
23ff749f
Commit
23ff749f
authored
Sep 04, 2020
by
Jean-Baptiste Mardelle
Browse files
Delay locale reset to allow correct ui translation
Related to
#787
parent
b07c7889
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/core.cpp
View file @
23ff749f
...
...
@@ -29,7 +29,6 @@ the Free Software Foundation, either version 3 of the License, or
#include
"timeline2/model/timelineitemmodel.hpp"
#include
"timeline2/view/timelinecontroller.h"
#include
"timeline2/view/timelinewidget.h"
#include
<mlt++/MltRepository.h>
#include
<KMessageBox>
...
...
src/mainwindow.cpp
View file @
23ff749f
...
...
@@ -66,7 +66,7 @@
#include
"utils/resourcewidget.h"
#include
"utils/thememanager.h"
#include
"utils/otioconvertions.h"
#include
"lib/localeHandling.h"
#include
"profiles/profilerepository.hpp"
#include
"widgets/progressbutton.h"
#include
<config-kdenlive.h>
...
...
@@ -510,6 +510,7 @@ void MainWindow::init()
addAction
(
QStringLiteral
(
"timeline_preview_button"
),
previewButtonAction
);
setupGUI
(
KXmlGuiWindow
::
ToolBar
|
KXmlGuiWindow
::
StatusBar
|
KXmlGuiWindow
::
Save
|
KXmlGuiWindow
::
Create
);
LocaleHandling
::
resetLocale
();
if
(
firstRun
)
{
if
(
QScreen
*
current
=
QApplication
::
primaryScreen
())
{
int
screenHeight
=
current
->
availableSize
().
height
();
...
...
src/mltconnection.cpp
View file @
23ff749f
...
...
@@ -86,7 +86,6 @@ MltConnection::MltConnection(const QString &mltPath)
// After initialising the MLT factory, set the locale back from user default to C
// to ensure numbers are always serialised with . as decimal point.
m_repository
=
std
::
unique_ptr
<
Mlt
::
Repository
>
(
Mlt
::
Factory
::
init
());
LocaleHandling
::
resetLocale
();
#ifdef Q_OS_FREEBSD
auto
locale
=
strdup
(
setlocale
(
MLT_LC_CATEGORY
,
nullptr
));
...
...
Write
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!
Cancel
Please
register
or
sign in
to comment