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
8396abbe
Commit
8396abbe
authored
Jun 06, 2020
by
Pino Toscano
Committed by
Albert Astals Cid
Jun 09, 2020
Browse files
Store KGmap::p_capitalToDivisionTitle as translated
All the users use it that way already.
parent
1bf7e1ee
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/capitaldivisionasker.cpp
View file @
8396abbe
...
...
@@ -60,7 +60,5 @@ void capitalDivisionAsker::setAnswerHook(int userSays)
QString
capitalDivisionAsker
::
getQuestionHook
()
const
{
QString
divisionType
=
i18nc
(
p_map
->
getFileName
().
toUtf8
(),
p_map
->
getDivisionsString
().
toUtf8
());
return
i18nc
(
"@title"
,
p_map
->
getCapitalToDivisionTitle
().
toUtf8
());
//return i18nc("@title", p_map->getCapitalToDivisionTitle().toUtf8(), divisionType);
return
p_map
->
getCapitalToDivisionTitle
();
}
src/kgeography.cpp
View file @
8396abbe
...
...
@@ -421,7 +421,7 @@ void kgeography::setMap(KGmap *m)
p_askMap
->
setText
(
i18n
(
"&Location of %1"
,
divisionType
));
p_askPlaceMap
->
setText
(
i18n
(
"&Place %1 in the Map"
,
divisionType
));
p_askCapitalDivisions
->
setText
(
i18nc
(
"@title"
,
p_map
->
getCapitalToDivisionTitle
()
.
toUtf8
())
);
p_askCapitalDivisions
->
setText
(
p_map
->
getCapitalToDivisionTitle
());
p_askDivisionCapitals
->
setText
(
i18nc
(
"@title"
,
p_map
->
getDivisionToCapitalTitle
().
toUtf8
()));
p_askFlagDivisions
->
setText
(
i18n
(
"%1 by Flag"
,
divisionType
));
p_askDivisionFlags
->
setText
(
i18n
(
"&Flags of %1"
,
divisionType
));
...
...
src/mapparser.cpp
View file @
8396abbe
...
...
@@ -80,7 +80,7 @@ KGmap *mapReader::parseMap(const QString &path)
QString
title
=
getElementString
(
QStringLiteral
(
"capitalToDivisionTitle"
),
root
,
Optional
);
if
(
!
title
.
isEmpty
()
)
{
kgmap
->
setCapitalToDivisionTitle
(
title
);
kgmap
->
setCapitalToDivisionTitle
(
i18nc
(
"@title"
,
title
.
toUtf8
())
);
}
else
{
...
...
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