From 06c8089dfc8504880ecf8054e6c6b747ee286a07 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Mon, 30 Mar 2015 00:38:59 +0200 Subject: [PATCH] Fribidize more strings --- src/achievements/achievement.cpp | 2 +- src/challenges/challenge_data.cpp | 6 ++---- src/input/input_manager.cpp | 2 +- src/modes/world.cpp | 2 +- src/states_screens/dialogs/select_challenge.cpp | 4 ++-- src/states_screens/edit_gp_screen.cpp | 5 +++-- src/states_screens/edit_track_screen.cpp | 2 +- src/states_screens/gp_info_screen.cpp | 4 ++-- src/states_screens/grand_prix_editor_screen.cpp | 2 +- src/states_screens/race_gui_overworld.cpp | 5 +++-- src/states_screens/track_info_screen.cpp | 2 +- src/tracks/track.cpp | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp index 74ae97ff3..739b681b4 100644 --- a/src/achievements/achievement.cpp +++ b/src/achievements/achievement.cpp @@ -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 diff --git a/src/challenges/challenge_data.cpp b/src/challenges/challenge_data.cpp index 6d0d0514a..ee0f8e011 100644 --- a/src/challenges/challenge_data.cpp +++ b/src/challenges/challenge_data.cpp @@ -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); diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp index 0580b5f08..47885a0b8 100644 --- a/src/input/input_manager.cpp +++ b/src/input/input_manager.cpp @@ -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; diff --git a/src/modes/world.cpp b/src/modes/world.cpp index 7a76ea5df..b5870958f 100644 --- a/src/modes/world.cpp +++ b/src/modes/world.cpp @@ -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 diff --git a/src/states_screens/dialogs/select_challenge.cpp b/src/states_screens/dialogs/select_challenge.cpp index 7ec264700..3c2cc7041 100644 --- a/src/states_screens/dialogs/select_challenge.cpp +++ b/src/states_screens/dialogs/select_challenge.cpp @@ -131,13 +131,13 @@ SelectChallengeDialog::SelectChallengeDialog(const float percentWidth, if (c->getData()->isGrandPrix()) { const GrandPrixData* gp = grand_prix_manager->getGrandPrix(c->getData()->getGPId()); - getWidget("title")->setText( gp->getName(), true ); + getWidget("title")->setText(translations->fribidize(gp->getName()), true); } else { const core::stringw track_name = track_manager->getTrack(c->getData()->getTrackId())->getName(); - getWidget("title")->setText( track_name, true ); + getWidget("title")->setText(translations->fribidize(track_name), true); } LabelWidget* typeLbl = getWidget("race_type_val"); diff --git a/src/states_screens/edit_gp_screen.cpp b/src/states_screens/edit_gp_screen.cpp index 92f9eeeb1..68199d986 100644 --- a/src/states_screens/edit_gp_screen.cpp +++ b/src/states_screens/edit_gp_screen.cpp @@ -155,7 +155,7 @@ void EditGPScreen::init() { LabelWidget* header = getWidget("title"); assert(header != NULL); - header->setText(m_gp->getName(), true); + header->setText(translations->fribidize(m_gp->getName()), true); IconButtonWidget* button = getWidget("save"); assert(button != NULL); @@ -281,7 +281,8 @@ void EditGPScreen::setModified(const bool modified) LabelWidget* header = getWidget("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(); } diff --git a/src/states_screens/edit_track_screen.cpp b/src/states_screens/edit_track_screen.cpp index c7dcd0d2a..4e3946ef0 100644 --- a/src/states_screens/edit_track_screen.cpp +++ b/src/states_screens/edit_track_screen.cpp @@ -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); diff --git a/src/states_screens/gp_info_screen.cpp b/src/states_screens/gp_info_screen.cpp index 42eab4068..faff5444b 100644 --- a/src/states_screens/gp_info_screen.cpp +++ b/src/states_screens/gp_info_screen.cpp @@ -215,11 +215,11 @@ void GPInfoScreen::init() m_gp.createRandomGP(m_num_tracks_spinner->getValue(), m_group_name, getReverse(), true); - getWidget("name")->setText(m_gp.getName(), false); + getWidget("name")->setText(translations->fribidize(m_gp.getName()), false); } else { - getWidget("name")->setText(m_gp.getName(), false); + getWidget("name")->setText(translations->fribidize(m_gp.getName()), false); m_gp.checkConsistency(); } diff --git a/src/states_screens/grand_prix_editor_screen.cpp b/src/states_screens/grand_prix_editor_screen.cpp index 06405e217..1292202e4 100644 --- a/src/states_screens/grand_prix_editor_screen.cpp +++ b/src/states_screens/grand_prix_editor_screen.cpp @@ -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()); } diff --git a/src/states_screens/race_gui_overworld.cpp b/src/states_screens/race_gui_overworld.cpp index b6242217c..f29a735eb 100644 --- a/src/states_screens/race_gui_overworld.cpp +++ b/src/states_screens/race_gui_overworld.cpp @@ -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 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); } diff --git a/src/states_screens/track_info_screen.cpp b/src/states_screens/track_info_screen.cpp index 21bf33586..d6a78e7a4 100644 --- a/src/states_screens/track_info_screen.cpp +++ b/src/states_screens/track_info_screen.cpp @@ -100,7 +100,7 @@ void TrackInfoScreen::init() const bool has_laps = race_manager->modeHasLaps(); const bool has_highscores = race_manager->modeHasHighscores(); - getWidget("name")->setText(m_track->getName(), false); + getWidget("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) diff --git a/src/tracks/track.cpp b/src/tracks/track.cpp index 7df8d8191..0df6418a4 100644 --- a/src/tracks/track.cpp +++ b/src/tracks/track.cpp @@ -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) {