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
33f5385d
Commit
33f5385d
authored
Jun 07, 2020
by
Pino Toscano
Committed by
Albert Astals Cid
Jun 09, 2020
Browse files
Make KGmap::getCapitalToDivisionQuestionPattern() a KLocalizedString
This way the internal text and context are hidden within KGMap.
parent
562f5e44
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/capitaldivisionasker.cpp
View file @
33f5385d
...
...
@@ -31,7 +31,7 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const QString &division, int
p_currentAnswer
.
setQuestion
(
i18nc
(
"@item:intable column Question, %1 is capital name"
,
"%1"
,
p_capital
));
p_currentAnswer
.
setCorrectAnswer
(
i18nc
(
"@option:radio <City> is the capital of..."
,
"%1"
,
divisionName
));
setQuestion
(
i18nc
(
"@title:group"
,
p_map
->
getCapitalToDivisionQuestionPattern
().
toUtf8
(),
p_capital
));
setQuestion
(
p_map
->
getCapitalToDivisionQuestionPattern
().
subs
(
p_capital
).
toString
(
));
p_radioButtons
[
i
]
->
setText
(
i18nc
(
"@option:radio <City> is the capital of..."
,
"%1"
,
divisionName
));
b
=
true
;
}
...
...
src/map.cpp
View file @
33f5385d
...
...
@@ -115,9 +115,9 @@ QStringList KGmap::getDivisionFalseCapitals(const QString &divisionName) const
return
getDivision
(
divisionName
)
->
getFalseCapitals
();
}
Q
String
KGmap
::
getCapitalToDivisionQuestionPattern
()
const
KLocalized
String
KGmap
::
getCapitalToDivisionQuestionPattern
()
const
{
return
p_capitalToDivisionPattern
;
return
ki18nc
(
"@title:group"
,
p_capitalToDivisionPattern
.
toUtf8
())
;
}
QString
KGmap
::
getDivisionToCapitalQuestionPattern
()
const
...
...
src/map.h
View file @
33f5385d
...
...
@@ -11,6 +11,8 @@
#ifndef MAP_H
#define MAP_H
#include
<klocalizedstring.h>
#include
<qcolor.h>
#include
<qmap.h>
...
...
@@ -51,7 +53,7 @@ class KGmap
QColor
getColor
(
const
QString
&
s
)
const
;
QList
<
const
division
*>
getIgnoredDivisions
(
division
::
askMode
am
)
const
;
QList
<
const
division
*>
getAllDivisionsOrdered
()
const
;
Q
String
getCapitalToDivisionQuestionPattern
()
const
;
KLocalized
String
getCapitalToDivisionQuestionPattern
()
const
;
QString
getDivisionToCapitalQuestionPattern
()
const
;
QString
getCapitalToDivisionTitle
()
const
;
QString
getDivisionToCapitalTitle
()
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