diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt index 0c6ff362cf..eba5ca6abc 100644 --- a/Docs/Changelog_sm5.txt +++ b/Docs/Changelog_sm5.txt @@ -8,6 +8,10 @@ ________________________________________________________________________________ StepMania 5.0 Preview 3 | 20110??? -------------------------------------------------------------------------------- +2011/08/01 +---------- +* [MusicWheel, RoomWheel] Moved the "- EMPTY -" string to the languages file. [AJ] + 2011/07/31 ---------- * [ScreenGameplay, LyricDisplay] Stop lyrics from animating on failure. diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini index 8e1223cc1b..d64ae30472 100644 --- a/Themes/_fallback/Languages/en.ini +++ b/Themes/_fallback/Languages/en.ini @@ -258,33 +258,37 @@ P31=P31 P32=P32 [MusicWheel] +Portal=Portal +Random=Random +Roulette=Roulette +Empty=- EMPTY - + ArtistText=Artist BpmText=BPM -EasyMeterText=Easy Rank -GenreText=Genre -GroupText=Group -HardMeterText=Hard Rank ChallengeMeterText=Challenge Rank DoubleEasyMeterText=Easy Rank (Double) DoubleMediumMeterText=Medium Rank (Double) DoubleHardMeterText=Hard Rank (Double) DoubleChallengeMeterText=Challenge Rank (Double) +EasyMeterText=Easy Rank +GenreText=Genre +GroupText=Group +HardMeterText=Hard Rank LengthText=Length MediumMeterText=Medium Rank PopularityText=Player's Best! -Portal=Portal PreferredText=Preferred -Random=Random -Roulette=Roulette TitleText=Title RecentText=Recent TopGradesText=Top Grades + CoursesText=Courses AllCoursesText=All Courses NonstopText=Nonstop Courses OniText=Oni Courses EndlessText=Endless Courses SurvivalText=Survival Courses + NormalModeText=Normal Mode BattleModeText=Battle Mode (Disabled) @@ -1176,6 +1180,7 @@ NumTh=th [RoomWheel] Enter room name=Enter room name +Empty=- EMPTY - [RoomInfoDisplay] Last Round Info:=Last Round Info: diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp index ebdb79338d..89c0e442d2 100644 --- a/src/MusicWheel.cpp +++ b/src/MusicWheel.cpp @@ -21,6 +21,7 @@ #include "PlayerState.h" #include "CommonMetrics.h" #include "MessageManager.h" +#include "LocalizedString.h" static Preference g_bMoveRandomToEnd( "MoveRandomToEnd", false ); static Preference g_bPrecacheAllSorts( "PreCacheAllWheelSorts", false); @@ -34,6 +35,8 @@ static RString CHOICE_NAME( RString s ) { return ssprintf("Choice%s",s.c_str()) static RString CUSTOM_WHEEL_ITEM_NAME( RString s ) { return ssprintf("CustomWheelItem%s",s.c_str()); } static RString CUSTOM_WHEEL_ITEM_COLOR( RString s ) { return ssprintf("%sColor",s.c_str()); } +static LocalizedString EMPTY_STRING ( "MusicWheel", "Empty" ); + AutoScreenMessage( SM_SongChanged ); // TODO: Replace this with a Message and MESSAGEMAN AutoScreenMessage( SM_SortOrderChanging ); AutoScreenMessage( SM_SortOrderChanged ); @@ -1039,7 +1042,7 @@ void MusicWheel::FilterWheelItemDatas(vector &aUnFilteredD // If we've filtered all items, insert a dummy. if( aFilteredData.empty() ) - aFilteredData.push_back( new MusicWheelItemData(TYPE_SECTION, NULL, "- EMPTY -", NULL, RageColor(1,0,0,1), 0) ); + aFilteredData.push_back( new MusicWheelItemData(TYPE_SECTION, NULL, EMPTY_STRING, NULL, RageColor(1,0,0,1), 0) ); } void MusicWheel::UpdateSwitch() diff --git a/src/RoomWheel.cpp b/src/RoomWheel.cpp index 0541b90b4e..2d583005c5 100644 --- a/src/RoomWheel.cpp +++ b/src/RoomWheel.cpp @@ -7,6 +7,9 @@ #include "NetworkSyncManager.h" #include "ScreenManager.h" #include "ActorUtil.h" +#include "LocalizedString.h" + +static LocalizedString EMPTY_STRING ( "RoomWheel", "Empty" ); AutoScreenMessage( SM_BackFromRoomName ); AutoScreenMessage( SM_RoomInfoRetract ); @@ -87,7 +90,7 @@ void RoomWheelItem::Load( RString sType ) void RoomWheel::BuildWheelItemsData( vector &arrayWheelItemDatas ) { if( arrayWheelItemDatas.empty() ) - arrayWheelItemDatas.push_back( new RoomWheelItemData(TYPE_GENERIC, "- EMPTY -", "", RageColor(1,0,0,1)) ); + arrayWheelItemDatas.push_back( new RoomWheelItemData(TYPE_GENERIC, EMPTY_STRING, "", RageColor(1,0,0,1)) ); } void RoomWheel::AddPermanentItem( RoomWheelItemData *itemdata )