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
1bf7e1ee
Commit
1bf7e1ee
authored
Jun 06, 2020
by
Pino Toscano
Committed by
Albert Astals Cid
Jun 09, 2020
Browse files
Store division::p_capital as translated
All the users use it that way already.
parent
c43a3d61
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/capitaldivisionasker.cpp
View file @
1bf7e1ee
...
...
@@ -27,11 +27,10 @@ bool capitalDivisionAsker::nextBoxAskerQuestionHook(const QString &division, int
if
(
isAnswer
)
{
p_capital
=
p_map
->
getDivisionCapital
(
division
);
p_currentAnswer
.
setQuestion
(
i18nc
(
"@item:intable column Question, %1 is capital name"
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
p_capital
.
toUtf8
())
));
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"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
division
.
toUtf8
())));
QString
capitalName
=
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
p_capital
.
toUtf8
());
setQuestion
(
i18nc
(
"@title:group"
,
p_map
->
getCapitalToDivisionQuestionPattern
().
toUtf8
(),
capitalName
));
setQuestion
(
i18nc
(
"@title:group"
,
p_map
->
getCapitalToDivisionQuestionPattern
().
toUtf8
(),
p_capital
));
p_radioButtons
[
i
]
->
setText
(
i18nc
(
"@option:radio <City> is the capital of..."
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
division
.
toUtf8
())));
b
=
true
;
}
...
...
src/divisioncapitalasker.cpp
View file @
1bf7e1ee
...
...
@@ -31,8 +31,8 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const QString &division, int
setQuestion
(
i18nc
(
"@title:group"
,
p_map
->
getDivisionToCapitalQuestionPattern
().
toUtf8
(),
divisionName
));
p_currentAnswer
.
setQuestion
(
i18nc
(
"@item:intable column Question, %1 is region name"
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
division
.
toUtf8
())));
p_capital
=
p_map
->
getDivisionCapital
(
division
);
p_currentAnswer
.
setCorrectAnswer
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
p_capital
.
toUtf8
())
));
p_radioButtons
[
i
]
->
setText
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
p_capital
.
toUtf8
())
));
p_currentAnswer
.
setCorrectAnswer
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
p_capital
));
p_radioButtons
[
i
]
->
setText
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
p_capital
));
b
=
true
;
QStringList
falseCapitals
=
p_map
->
getDivisionFalseCapitals
(
division
);
...
...
@@ -62,7 +62,7 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const QString &division, int
// Moss
if
(
capital
!=
p_capital
)
{
p_radioButtons
[
i
]
->
setText
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
capital
.
toUtf8
())
));
p_radioButtons
[
i
]
->
setText
(
i18nc
(
"@option:radio The capital of <Region> is..."
,
"%1"
,
capital
));
b
=
true
;
}
else
b
=
false
;
...
...
src/mapasker.cpp
View file @
1bf7e1ee
...
...
@@ -147,7 +147,7 @@ void mapAsker::handleMapClick(QRgb c, const QPoint &p)
{
QString
flagFile
=
p_map
->
getDivisionFlagFile
(
aux
);
if
(
p_map
->
getDivisionCanAsk
(
aux
,
division
::
eCapital
))
cap
=
p_map
->
getDivisionCapital
(
aux
);
if
(
!
cap
.
isEmpty
())
cap
=
i18nc
(
"@item Capital name in map popup"
,
"%1"
,
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
cap
.
toUtf8
())
);
if
(
!
cap
.
isEmpty
())
cap
=
i18nc
(
"@item Capital name in map popup"
,
"%1"
,
cap
);
QString
wikiLink
(
guessWikipediaDomain
());
wikiLink
.
append
(
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
aux
.
toUtf8
()));
...
...
src/mapparser.cpp
View file @
1bf7e1ee
...
...
@@ -111,7 +111,7 @@ KGmap *mapReader::parseMap(const QString &path)
// division capital
QString
capital
=
getElementString
(
QStringLiteral
(
"capital"
),
divisionTag
,
Optional
);
if
(
!
capital
.
is
Null
())
kgdiv
->
setCapital
(
capital
);
if
(
!
capital
.
is
Empty
())
kgdiv
->
setCapital
(
i18nc
(
ctxt
,
capital
.
toUtf8
())
);
// division flag
QString
flagFile
=
getElementString
(
QStringLiteral
(
"flag"
),
divisionTag
,
Optional
);
...
...
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