Commit fdc0f476 authored by Pino Toscano's avatar Pino Toscano Committed by Albert Astals Cid
Browse files

Make KGmap::getDivisionToCapitalQuestionPattern() a KLocalizedString

This way the internal text and context are hidden within KGMap.
parent 33f5385d
...@@ -28,7 +28,7 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const QString &division, int ...@@ -28,7 +28,7 @@ bool divisionCapitalAsker::nextBoxAskerQuestionHook(const QString &division, int
if (isAnswer) if (isAnswer)
{ {
const QString divisionName = p_map -> getDivision(division) -> getName(); 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_currentAnswer.setQuestion(i18nc("@item:intable column Question, %1 is region name", "%1", divisionName));
p_capital = p_map -> getDivisionCapital(division); p_capital = p_map -> getDivisionCapital(division);
p_currentAnswer.setCorrectAnswer(i18nc("@option:radio The capital of <Region> is...", "%1", p_capital)); p_currentAnswer.setCorrectAnswer(i18nc("@option:radio The capital of <Region> is...", "%1", p_capital));
......
...@@ -120,9 +120,9 @@ KLocalizedString KGmap::getCapitalToDivisionQuestionPattern() const ...@@ -120,9 +120,9 @@ KLocalizedString KGmap::getCapitalToDivisionQuestionPattern() const
return ki18nc("@title:group", p_capitalToDivisionPattern.toUtf8()); return ki18nc("@title:group", p_capitalToDivisionPattern.toUtf8());
} }
QString KGmap::getDivisionToCapitalQuestionPattern() const KLocalizedString KGmap::getDivisionToCapitalQuestionPattern() const
{ {
return p_divisionToCapitalPattern; return ki18nc("@title:group", p_divisionToCapitalPattern.toUtf8());
} }
QString KGmap::getCapitalToDivisionTitle() const QString KGmap::getCapitalToDivisionTitle() const
......
...@@ -54,7 +54,7 @@ class KGmap ...@@ -54,7 +54,7 @@ class KGmap
QList<const division*> getIgnoredDivisions(division::askMode am) const; QList<const division*> getIgnoredDivisions(division::askMode am) const;
QList<const division*> getAllDivisionsOrdered() const; QList<const division*> getAllDivisionsOrdered() const;
KLocalizedString getCapitalToDivisionQuestionPattern() const; KLocalizedString getCapitalToDivisionQuestionPattern() const;
QString getDivisionToCapitalQuestionPattern() const; KLocalizedString getDivisionToCapitalQuestionPattern() const;
QString getCapitalToDivisionTitle() const; QString getCapitalToDivisionTitle() const;
QString getDivisionToCapitalTitle() const; QString getDivisionToCapitalTitle() const;
division *getDivision(QRgb c) const; division *getDivision(QRgb c) const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment