Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
calamares
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
17
Issues
17
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
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 @@
#include "utils/Logger.h"
#include "utils/Retranslator.h"
#include <QApplication>
void
RequirementsModel
::
setRequirementsList
(
const
Calamares
::
RequirementsList
&
requirements
)
{
...
...
@@ -155,7 +153,7 @@ Config::initLanguages()
QString
name
=
m_languages
->
locale
(
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
);
}
else
...
...
@@ -194,7 +192,7 @@ Config::setLocaleIndex( const int& index )
cDebug
()
<<
"Selected locale"
<<
selectedLocale
;
QLocale
::
setDefault
(
selectedLocale
);
CalamaresUtils
::
installTranslator
(
selectedLocale
,
Calamares
::
Branding
::
instance
()
->
translationsDirectory
()
,
qApp
);
CalamaresUtils
::
installTranslator
(
selectedLocale
,
Calamares
::
Branding
::
instance
()
->
translationsDirectory
()
);
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