From ff357e4def0b206ff6d38021eb17c1b0e8370bea Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Fri, 23 Mar 2012 12:42:06 -0500 Subject: [PATCH] going on a string localization rampage in the default theme. aside from graphics, this should be the last of the non-themeable text that actually matters (unless someone really has to change 'P1'/'P2' on the DifficultyList cursors...) --- .../ScreenGameOver underlay/default.lua | 4 ++-- .../ScreenHowToPlay overlay/default.lua | 12 ++++++------ .../default/Graphics/Player judgment/default.lua | 2 +- .../Graphics/ScreenMapControllers exit.lua | 2 +- .../Graphics/ScreenOptions disqualify.lua | 2 +- Themes/default/Languages/en.ini | 16 +++++++++++++++- 6 files changed, 26 insertions(+), 12 deletions(-) diff --git a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua index ead078958e..4cfaedad3c 100644 --- a/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua +++ b/Themes/default/BGAnimations/ScreenGameOver underlay/default.lua @@ -1,11 +1,11 @@ return Def.ActorFrame { InitCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y); LoadFont("Common Normal") .. { - Text="GAME OVER"; + Text=ScreenString("GAME OVER"); InitCommand=cmd(y,-4;shadowlength,1;diffuse,Color("Red")); }; LoadFont("Common Normal") .. { - Text="Play again soon!"; + Text=ScreenString("Play again soon!"); InitCommand=cmd(y,16;shadowlength,1;zoom,0.5;); }; }; \ No newline at end of file diff --git a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua index 34b9531e75..eecab8257d 100644 --- a/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua +++ b/Themes/default/BGAnimations/ScreenHowToPlay overlay/default.lua @@ -15,21 +15,21 @@ return Def.ActorFrame { LoadActor("tapglow") .. { OnCommand=cmd(x,148;y,95;zoom,0.7;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,6;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); }; - + LoadActor("tapglow") .. { OnCommand=cmd(x,148;y,95;zoom,0.7;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,9.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); }; - + -- 2nd step UP LoadActor("tapglow") .. { OnCommand=cmd(x,212;y,95;zoom,0.7;rotationz,180;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,12.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); }; - + -- 3rd step UP LoadActor("tapglow") .. { OnCommand=cmd(x,84;y,95;zoom,0.7;rotationz,90;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,15.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); }; - + -- 4th step jump LoadActor("tapglow") .. { OnCommand=cmd(x,85;y,95;zoom,0.7;rotationz,90;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,18.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); @@ -37,7 +37,7 @@ return Def.ActorFrame { LoadActor("tapglow") .. { OnCommand=cmd(x,275;y,95;zoom,0.7;rotationz,270;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,18.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); }; - + -- miss step LoadActor("healthhilight") .. { OnCommand=cmd(x,180;y,40;diffuseshift;effectcolor1,1,0.93333,0.266666,0.4;effectcolor2,1,1,1,1;effectperiod,0.25;effectmagnitude,0,1,0;diffusealpha,0;sleep,22.7;linear,0;diffusealpha,1;sleep,1.7;linear,0;diffusealpha,0); @@ -46,7 +46,7 @@ return Def.ActorFrame { -- messages LoadFont("Common Normal") .. { - Text="How To Play StepMania", + Text=ScreenString("How To Play StepMania"), InitCommand=cmd(zbuffer,1;z,20;x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;shadowlength,1;strokecolor,Color("Outline")); OnCommand=cmd(diffusealpha,0;zoom,4;sleep,0.0;linear,0.3;diffusealpha,1;zoom,1;sleep,1.8;linear,0.3;zoom,0.75;x,170;y,60); }; diff --git a/Themes/default/Graphics/Player judgment/default.lua b/Themes/default/Graphics/Player judgment/default.lua index a25763d392..983e0dc4fe 100644 --- a/Themes/default/Graphics/Player judgment/default.lua +++ b/Themes/default/Graphics/Player judgment/default.lua @@ -76,7 +76,7 @@ t[#t+1] = Def.ActorFrame { }; LoadFont("Common Normal") .. { Name="TextDisplay"; - Text="MS"; + Text=THEME:GetString("Protiming","MS"); InitCommand=cmd(visible,false); OnCommand=THEME:GetMetric("Protiming","TextOnCommand"); ResetCommand=cmd(finishtweening;stopeffect;visible,false); diff --git a/Themes/default/Graphics/ScreenMapControllers exit.lua b/Themes/default/Graphics/ScreenMapControllers exit.lua index 6da4333adc..276f1bd9f2 100644 --- a/Themes/default/Graphics/ScreenMapControllers exit.lua +++ b/Themes/default/Graphics/ScreenMapControllers exit.lua @@ -1,5 +1,5 @@ return LoadFont("Common Normal") .. { - Text="Exit"; + Text=ScreenString("Exit"); InitCommand=cmd(x,SCREEN_CENTER_X;zoom,0.75;shadowlength,0;diffuse,color("#880000");NoStroke); OnCommand=cmd(diffusealpha,0;decelerate,0.5;diffusealpha,1); OffCommand=cmd(stoptweening;accelerate,0.3;diffusealpha,0;queuecommand,"Hide"); diff --git a/Themes/default/Graphics/ScreenOptions disqualify.lua b/Themes/default/Graphics/ScreenOptions disqualify.lua index b0dc98a26a..cf2369e4f6 100644 --- a/Themes/default/Graphics/ScreenOptions disqualify.lua +++ b/Themes/default/Graphics/ScreenOptions disqualify.lua @@ -1,3 +1,3 @@ return LoadFont("Common Normal") .. { - Text="Score will be disqualified!"; + Text=ScreenString("Disqualified"); }; \ No newline at end of file diff --git a/Themes/default/Languages/en.ini b/Themes/default/Languages/en.ini index 32a4fe2480..40f71f03a6 100644 --- a/Themes/default/Languages/en.ini +++ b/Themes/default/Languages/en.ini @@ -74,6 +74,7 @@ HelpText=&BACK; Exit &START; Select / Join &SELECT; Magic Codes &MENULEFT;&MENUR [ScreenOptions] HelpText=&BACK; Exit &START; Choose &SELECT; Go Up &MENULEFT;&MENURIGHT;&MENUUP;&MENUDOWN; Move +Disqualified=Score will be disqualified! [ScreenStageInformation] HelpText= @@ -217,4 +218,17 @@ S=S V=V A=A F=F -C=C \ No newline at end of file +C=C + +[ScreenMapControllers] +Exit=Exit + +[ScreenGameOver] +GAME OVER=GAME OVER +Play again soon!=Play again soon! + +[ScreenHowToPlay] +How To Play StepMania=How To Play StepMania + +[Protiming] +MS=MS \ No newline at end of file