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

Prevent some strings from being flipped twice in fribidi

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7509 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2011-01-23 23:47:39 +00:00
parent 009960fc8a
commit 84fcc8f1b0
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config/user_config.cpp
View File

@@ -419,7 +419,7 @@ void UserConfig::addDefaultPlayer()
class GuestPlayerProfile : public PlayerProfile
{
public:
GuestPlayerProfile() : PlayerProfile(_("Guest"))
GuestPlayerProfile() : PlayerProfile(_LTR("Guest"))
{
m_is_guest_account = true;
}

2
src/karts/kart_properties.cpp
View File

@@ -222,7 +222,7 @@ void KartProperties::getAllData(const XMLNode * root)
std::string temp_name;
root->get("name", &temp_name );
m_name = _(temp_name.c_str());
m_name = _LTR(temp_name.c_str());
root->get("icon-file", &m_icon_file );

2
src/race/grand_prix_data.cpp
View File

@@ -52,7 +52,7 @@ GrandPrixData::GrandPrixData(const std::string filename) throw(std::logic_error)
delete root;
throw std::logic_error("File contents are incomplete or corrupt");
}
m_name = _(temp_name.c_str());
m_name = _LTR(temp_name.c_str());
foundName = true;
}
else

4
src/states_screens/kart_selection.cpp
View File

@@ -1688,7 +1688,7 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
}
else
{
w->addItem(prop->getName().c_str(), prop->getIdent(),
w->addItem(translations->fribidize(prop->getName().c_str()), prop->getIdent(),
prop->getAbsoluteIconFile(), 0,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
usableKartCount++;
@@ -1715,7 +1715,7 @@ void KartSelectionScreen::setKartsFromCurrentGroup()
}
else
{
w->addItem(prop->getName().c_str(), prop->getIdent(),
w->addItem(translations->fribidize(prop->getName().c_str()), prop->getIdent(),
icon_path, 0,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
usableKartCount++;

25
src/states_screens/tracks_screen.cpp
View File

@@ -116,7 +116,8 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name, const
{
ITexture* screenshot = irr_driver->getTexture( clickedTrack->getScreenshotFile().c_str() );
new TrackInfoDialog(selection, clickedTrack->getIdent(), clickedTrack->getName().c_str(),
new TrackInfoDialog(selection, clickedTrack->getIdent(),
translations->fribidize(clickedTrack->getName().c_str()),
screenshot, 0.8f, 0.7f);
}
@@ -135,7 +136,8 @@ void TracksScreen::eventCallback(Widget* widget, const std::string& name, const
{
ITexture* screenshot = irr_driver->getTexture( clickedTrack->getScreenshotFile().c_str() );
new TrackInfoDialog(selection, clickedTrack->getIdent(), clickedTrack->getName().c_str(),
new TrackInfoDialog(selection, clickedTrack->getIdent(),
translations->fribidize(clickedTrack->getName().c_str()),
screenshot, 0.8f, 0.7f);
}
}
@@ -213,14 +215,14 @@ void TracksScreen::init()
if (unlock_manager->isLocked(gp->getId()))
{
gps_widget->addAnimatedItem( _("Locked!"),
"locked", sshot_files, 1.5f, LOCKED_BADGE | TROPHY_BADGE,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
gps_widget->addAnimatedItem(_("Locked!"),
"locked", sshot_files, 1.5f, LOCKED_BADGE | TROPHY_BADGE,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE);
}
else
{
gps_widget->addAnimatedItem( gp->getName(), gp->getId(), sshot_files, 1.5f, TROPHY_BADGE,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
gps_widget->addAnimatedItem(translations->fribidize(gp->getName()), gp->getId(), sshot_files, 1.5f,
TROPHY_BADGE, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
}
}
gps_widget->updateItemDisplay();
@@ -264,8 +266,8 @@ void TracksScreen::buildTrackList()
}
else
{
tracks_widget->addItem( curr->getName(), curr->getIdent(), curr->getScreenshotFile(),
0, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
tracks_widget->addItem(translations->fribidize(curr->getName()), curr->getIdent(),
curr->getScreenshotFile(), 0, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
}
}
@@ -288,8 +290,9 @@ void TracksScreen::buildTrackList()
}
else
{
tracks_widget->addItem( curr->getName(), curr->getIdent(), curr->getScreenshotFile(),
0 /* no badge */, IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
tracks_widget->addItem(translations->fribidize(curr->getName()), curr->getIdent(),
curr->getScreenshotFile(), 0 /* no badge */,
IconButtonWidget::ICON_PATH_TYPE_ABSOLUTE );
}
}
}

2
src/tracks/track.cpp
View File

@@ -194,7 +194,7 @@ void Track::loadTrackInfo()
}
std::string temp_name;
root->get("name", &temp_name);
m_name = _(temp_name.c_str());
m_name = _LTR(temp_name.c_str());
//root->get("description", &m_description);
root->get("designer", &m_designer);