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
Education
KGeography
Commits
fdc0f476
Commit
fdc0f476
authored
Jun 07, 2020
by
Pino Toscano
Committed by
Albert Astals Cid
Jun 09, 2020
Browse files
Make KGmap::getDivisionToCapitalQuestionPattern() a KLocalizedString
This way the internal text and context are hidden within KGMap.
parent
33f5385d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/divisioncapitalasker.cpp
View file @
fdc0f476
...
...
@@ -28,7 +28,7 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const QString &division, int
if
(
isAnswer
)
{
const
QString
divisionName
=
p_map
->
getDivision
(
division
)
->
getName
();
setQuestion
(
i18nc
(
"@title:group"
,
p_map
->
getDivisionToCapitalQuestionPattern
().
toUtf8
(),
divisionName
));
setQuestion
(
p_map
->
getDivisionToCapitalQuestionPattern
().
subs
(
divisionName
)
.
toString
()
);
p_currentAnswer
.
setQuestion
(
i18nc
(
"@item:intable column Question, %1 is region name"
,
"%1"
,
divisionName
));
p_capital
=
p_map
->
getDivisionCapital
(
division
);
p_currentAnswer
.
setCorrectAnswer
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
p_capital
));
...
...
src/map.cpp
View file @
fdc0f476
...
...
@@ -120,9 +120,9 @@ KLocalizedString KGmap::getCapitalToDivisionQuestionPattern() const
return
ki18nc
(
"@title:group"
,
p_capitalToDivisionPattern
.
toUtf8
());
}
Q
String
KGmap
::
getDivisionToCapitalQuestionPattern
()
const
KLocalized
String
KGmap
::
getDivisionToCapitalQuestionPattern
()
const
{
return
p_divisionToCapitalPattern
;
return
ki18nc
(
"@title:group"
,
p_divisionToCapitalPattern
.
toUtf8
())
;
}
QString
KGmap
::
getCapitalToDivisionTitle
()
const
...
...
src/map.h
View file @
fdc0f476
...
...
@@ -54,7 +54,7 @@ class KGmap
QList
<
const
division
*>
getIgnoredDivisions
(
division
::
askMode
am
)
const
;
QList
<
const
division
*>
getAllDivisionsOrdered
()
const
;
KLocalizedString
getCapitalToDivisionQuestionPattern
()
const
;
Q
String
getDivisionToCapitalQuestionPattern
()
const
;
KLocalized
String
getDivisionToCapitalQuestionPattern
()
const
;
QString
getCapitalToDivisionTitle
()
const
;
QString
getDivisionToCapitalTitle
()
const
;
division
*
getDivision
(
QRgb
c
)
const
;
...
...
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