Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Applications
calamares
Commits
2a93c7e2
Commit
2a93c7e2
authored
Mar 25, 2020
by
Adriaan de Groot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[welcome] Chase changed API in master
parent
ce244d85
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
src/modules/welcome/Config.cpp
src/modules/welcome/Config.cpp
+2
-4
No files found.
src/modules/welcome/Config.cpp
View file @
2a93c7e2
...
@@ -23,8 +23,6 @@
...
@@ -23,8 +23,6 @@
#include "utils/Logger.h"
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include "utils/Retranslator.h"
#include <QApplication>
void
void
RequirementsModel
::
setRequirementsList
(
const
Calamares
::
RequirementsList
&
requirements
)
RequirementsModel
::
setRequirementsList
(
const
Calamares
::
RequirementsList
&
requirements
)
{
{
...
@@ -155,7 +153,7 @@ Config::initLanguages()
...
@@ -155,7 +153,7 @@ Config::initLanguages()
QString
name
=
m_languages
->
locale
(
matchedLocaleIndex
).
name
();
QString
name
=
m_languages
->
locale
(
matchedLocaleIndex
).
name
();
cDebug
()
<<
Logger
::
SubEntry
<<
"Matched with index"
<<
matchedLocaleIndex
<<
name
;
cDebug
()
<<
Logger
::
SubEntry
<<
"Matched with index"
<<
matchedLocaleIndex
<<
name
;
CalamaresUtils
::
installTranslator
(
name
,
Calamares
::
Branding
::
instance
()
->
translationsDirectory
()
,
qApp
);
CalamaresUtils
::
installTranslator
(
name
,
Calamares
::
Branding
::
instance
()
->
translationsDirectory
()
);
setLocaleIndex
(
matchedLocaleIndex
);
setLocaleIndex
(
matchedLocaleIndex
);
}
}
else
else
...
@@ -194,7 +192,7 @@ Config::setLocaleIndex( const int& index )
...
@@ -194,7 +192,7 @@ Config::setLocaleIndex( const int& index )
cDebug
()
<<
"Selected locale"
<<
selectedLocale
;
cDebug
()
<<
"Selected locale"
<<
selectedLocale
;
QLocale
::
setDefault
(
selectedLocale
);
QLocale
::
setDefault
(
selectedLocale
);
CalamaresUtils
::
installTranslator
(
selectedLocale
,
Calamares
::
Branding
::
instance
()
->
translationsDirectory
()
,
qApp
);
CalamaresUtils
::
installTranslator
(
selectedLocale
,
Calamares
::
Branding
::
instance
()
->
translationsDirectory
()
);
emit
localeIndexChanged
(
m_localeIndex
);
emit
localeIndexChanged
(
m_localeIndex
);
}
}
...
...
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