ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fribidize more strings

Browse Source
This commit is contained in:
Flakebi 2015-03-30 00:38:59 +02:00
parent b041d0d79e
commit 06c8089dfc
12 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/achievements/achievement.cpp
View File

@ -200,7 +200,7 @@ void Achievement::check()
{
//show achievement
core::stringw s = _("Completed achievement \"%s\".",
m_achievement_info->getName().c_str());
m_achievement_info->getName());
MessageQueue::add(MessageQueue::MT_ACHIEVEMENT, s);
// Sends a confirmation to the server that an achievement has been

6
src/challenges/challenge_data.cpp
View File

@ -483,8 +483,7 @@ const irr::core::stringw
// shouldn't happen but let's avoid crashes as much as possible...
if (track == NULL) return irr::core::stringw( L"????" );
return _("New track '%s' now available",
core::stringw(track->getName()));
return _("New track '%s' now available", track->getName());
break;
}
case UNLOCK_MODE:
@ -513,8 +512,7 @@ const irr::core::stringw
// shouldn't happen but let's avoid crashes as much as possible...
if (kp == NULL) return irr::core::stringw( L"????" );
return _("New kart '%s' now available",
core::stringw(kp->getName()));
return _("New kart '%s' now available", kp->getName());
}
default:
assert(false);

2
src/input/input_manager.cpp
View File

@ -749,7 +749,7 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
// is not associated to any player
GUIEngine::showMessage(
_("Ignoring '%s', you needed to join earlier to play!",
irr::core::stringw(gp->getName().c_str()).c_str()) );
core::stringw(gp->getName().c_str())));
}
}
return;

2
src/modes/world.cpp
View File

@ -1145,7 +1145,7 @@ void World::eliminateKart(int kart_id, bool notify_of_elimination)
2.0f);
else
m_race_gui->addMessage(_("'%s' has been eliminated.",
core::stringw(kart->getName())),
kart->getName()),
camera->getKart(),
2.0f);
} // for i < number of cameras

4
src/states_screens/dialogs/select_challenge.cpp
View File

@ -131,13 +131,13 @@ SelectChallengeDialog::SelectChallengeDialog(const float percentWidth,
if (c->getData()->isGrandPrix())
{
const GrandPrixData* gp = grand_prix_manager->getGrandPrix(c->getData()->getGPId());
getWidget<LabelWidget>("title")->setText( gp->getName(), true );
getWidget<LabelWidget>("title")->setText(translations->fribidize(gp->getName()), true);
}
else
{
const core::stringw track_name =
track_manager->getTrack(c->getData()->getTrackId())->getName();
getWidget<LabelWidget>("title")->setText( track_name, true );
getWidget<LabelWidget>("title")->setText(translations->fribidize(track_name), true);
}
LabelWidget* typeLbl = getWidget<LabelWidget>("race_type_val");

5
src/states_screens/edit_gp_screen.cpp
View File

@ -155,7 +155,7 @@ void EditGPScreen::init()
{
LabelWidget* header = getWidget<LabelWidget>("title");
assert(header != NULL);
header->setText(m_gp->getName(), true);
header->setText(translations->fribidize(m_gp->getName()), true);
IconButtonWidget* button = getWidget<IconButtonWidget>("save");
assert(button != NULL);
@ -281,7 +281,8 @@ void EditGPScreen::setModified(const bool modified)
LabelWidget* header = getWidget<LabelWidget>("title");
assert(header != NULL);
header->setText(m_gp->getName() + (modified ? L" (+)" : L""), true);
//I18N: Indicate that the grand prix is modified and not saved
header->setText(modified ? _(L"%s (+)", m_gp->getName()) : L"", true);
enableButtons();
}

2
src/states_screens/edit_track_screen.cpp
View File

@ -223,7 +223,7 @@ void EditTrackScreen::selectTrack(const std::string& id)
if (m_track != NULL)
{
tracks->setSelection(m_track->getIdent(), PLAYER_ID_GAME_MASTER, true);
selected_track->setText(m_track->getName(), true);
selected_track->setText(translations->fribidize(m_track->getName()), true);
laps->setValue(m_laps);

4
src/states_screens/gp_info_screen.cpp
View File

@ -215,11 +215,11 @@ void GPInfoScreen::init()
m_gp.createRandomGP(m_num_tracks_spinner->getValue(),
m_group_name, getReverse(), true);
getWidget<LabelWidget>("name")->setText(m_gp.getName(), false);
getWidget<LabelWidget>("name")->setText(translations->fribidize(m_gp.getName()), false);
}
else
{
getWidget<LabelWidget>("name")->setText(m_gp.getName(), false);
getWidget<LabelWidget>("name")->setText(translations->fribidize(m_gp.getName()), false);
m_gp.checkConsistency();
}

2
src/states_screens/grand_prix_editor_screen.cpp
View File

@ -168,7 +168,7 @@ void GrandPrixEditorScreen::setSelection (const GrandPrixData* gpdata)
else
{
m_selection = grand_prix_manager->editGrandPrix(gpdata->getId());
gpname_widget->setText (gpdata->getName(), true);
gpname_widget->setText(translations->fribidize(gpdata->getName()), true);
gplist_widget->setSelection(m_selection->getId(), PLAYER_ID_GAME_MASTER, true);
loadTrackList (gpdata->getId());
}

5
src/states_screens/race_gui_overworld.cpp
View File

@ -490,7 +490,7 @@ void RaceGUIOverworld::drawGlobalMiniMap()
}
gui::ScalableFont* font = GUIEngine::getTitleFont();
font->draw(gp->getName(), pos, video::SColor(255,255,255,255),
font->draw(translations->fribidize(gp->getName()), pos, video::SColor(255,255,255,255),
false, true /* vcenter */, NULL);
core::rect<s32> pos(15,
@ -515,7 +515,8 @@ void RaceGUIOverworld::drawGlobalMiniMap()
}
gui::ScalableFont* font = GUIEngine::getTitleFont();
font->draw(track->getName(), pos, video::SColor(255,255,255,255),
font->draw(translations->fribidize(track->getName()),
pos, video::SColor(255, 255, 255, 255),
false, true /* vcenter */, NULL);
}

2
src/states_screens/track_info_screen.cpp
View File

@ -100,7 +100,7 @@ void TrackInfoScreen::init()
const bool has_laps = race_manager->modeHasLaps();
const bool has_highscores = race_manager->modeHasHighscores();
getWidget<LabelWidget>("name")->setText(m_track->getName(), false);
getWidget<LabelWidget>("name")->setText(translations->fribidize(m_track->getName()), false);
//I18N: when showing who is the author of track '%s'
//I18N: (place %s where the name of the author should appear)

2
src/tracks/track.cpp
View File

@ -182,7 +182,7 @@ bool Track::operator<(const Track &other) const
\note this is the LTR name, invoke fribidi as needed. */
core::stringw Track::getName() const
{
core::stringw translated = translations->w_gettext(m_name.c_str());
core::stringw translated = _LTR(m_name.c_str());
int index = translated.find("|");
if(index>-1)
{