Skip to content

Localization #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
user7496335 wants to merge 26 commits into
base: master
Choose a base branch
from
Open

Localization #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cd9a8f3
Update Server.as
user7496335 Jun 3, 2014
79b793b
Create Localization.as
user7496335 Jun 3, 2014
9c417d5
Create PreloadTimer.as
user7496335 Jun 3, 2014
3747000
Create default.ru
user7496335 Jun 3, 2014
07dc4b7
Update EmpireMap.as
user7496335 Jun 3, 2014
8b25663
Update StdMap.as
user7496335 Jun 3, 2014
0bd16cb
Update EmpireMap.as
user7496335 Jun 3, 2014
b6976f2
Update FormEnter.as
user7496335 Jun 3, 2014
7e76ce9
Update default.ru
user7496335 Jun 3, 2014
0c60781
Update Common.as
user7496335 Jun 3, 2014
e5c119a
Update Localization.as
user7496335 Jun 3, 2014
039995f
Update Common.as
user7496335 Jun 3, 2014
91ef223
Update Localization.as
user7496335 Jun 4, 2014
f371ae1
Update PreloadTimer.as
user7496335 Jun 4, 2014
c7c0f83
Update FormStd.as
user7496335 Jun 4, 2014
dd2c76b
Update FormEnter.as
user7496335 Jun 4, 2014
90fd4ea
Update FormEnter.as
user7496335 Jun 4, 2014
651974d
Update FormEnter.as
user7496335 Jun 4, 2014
a239c41
Update PreloadTimer.as
user7496335 Jun 5, 2014
1a38f62
Update FormEnter.as
user7496335 Jun 5, 2014
f95ca44
Update Localization.as
user7496335 Jun 9, 2014
9e8d1a5
Update Localization.as
user7496335 Jun 9, 2014
14dcccf
Update PreloadTimer.as
user7496335 Jun 9, 2014
c1be337
Update EmpireMap.as
user7496335 Jun 9, 2014
2a2bb8f
Update FormEnter.as
user7496335 Jun 9, 2014
b57edcc
Update EmpireMap.as
user7496335 Jun 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,434 changes: 2,434 additions & 0 deletions localization/default.ru
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 59 additions & 59 deletions src/Empire/Common.as
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion src/Empire/EmpireMap.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,15 @@ public class EmpireMap extends StdMap

public override function init():void
{
if (!PreloadTimer.PreloadDone()) return;

super.init();

if (C3D.m_FatalError != ""){
m_FormHint.Show("Fatal error:\n" + C3D.m_FatalError);
m_PCE = true;
}

BaseStr.TagSetCallback("user", TagUser);

var i:int;
Expand All @@ -565,7 +572,7 @@ public class EmpireMap extends StdMap

Common.CalcFinalPower(4000);

Common.LangInitRus();
//Common.LangInitRus();

Server.Self=new Server();
Server.Self.addEventListener("ConnectClose", RecvConnectClose);
Expand Down Expand Up @@ -954,6 +961,7 @@ public class EmpireMap extends StdMap
LoadGraphBegin();

// startSampling();

}

public override function InitializeC3D():void
Expand Down
75 changes: 72 additions & 3 deletions src/Empire/FormEnter.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ public class FormEnter extends FormStd
private var m_SaveName:CtrlCheckBox = null;
private var m_SaveAll:CtrlCheckBox = null;

private var m_TabTrainingText:TextField = null;
private var m_TabLoginText:TextField = null;
private var m_TabServerText:TextField = null;
private var m_TabLanguageText:TextField = null;

private var m_LabelTrainingText:TextField = null;
private var m_LabelLoginNameText:TextField = null;
private var m_LabelLoginPasswordText:TextField = null;
private var m_LabelServerText:TextField = null;
private var m_LabelProtocolText:TextField = null;

private var m_Server:CtrlComboBox = null;
private var m_Protocol:CtrlComboBox = null;
private var m_Scale:CtrlComboBox = null;
Expand All @@ -63,21 +74,24 @@ public class FormEnter extends FormStd
caption = Common.Txt.FormEnterCaption;
closeDisable = true;

TabAdd(Common.Txt.FormEnterTabTraining);
m_TabTrainingText = TabGet( TabAdd(Common.Txt.FormEnterTabTraining) ).m_Caption;

i = ItemLabel(Common.Txt.FormEnterTxtTraining, true); //ItemAlign(i, 1, 0); //ItemCellCnt(i, 2);
m_LabelTrainingText = ( ItemObj( i ) as TextField );
LocNextRow();

TabAdd(Common.Txt.FormEnterTabLogin);
m_TabLoginText = TabGet( TabAdd(Common.Txt.FormEnterTabLogin) ).m_Caption;

i = ItemLabel(Common.Txt.FormEnterName + ":"); ItemAlign(i, 1, 0);
m_LabelLoginNameText = ( ItemObj( i ) as TextField );
i = ItemInput("", 33, true, Server.LANG_RUS, true, "@"); m_Name = ItemObj(i) as CtrlInput; //m_Name.input.addEventListener(Event.CHANGE, nameChange);
//m_Name.input.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDownHandler);
m_Name.input.addEventListener(Event.CHANGE, onNameChange);
m_Name.restrict = null;
LocNextRow();

i = ItemLabel(Common.Txt.FormEnterPassword + ":"); ItemAlign(i, 1, 0);
m_LabelLoginPasswordText = ( ItemObj( i ) as TextField );
i = ItemInput("", 33, true, Server.LANG_RUS, true); m_Password = ItemObj(i) as CtrlInput; //m_Name.input.addEventListener(Event.CHANGE, nameChange);
//m_Password.input.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDownHandler);
m_Password.input.addEventListener(Event.CHANGE, onPasswordChange);
Expand All @@ -93,13 +107,15 @@ public class FormEnter extends FormStd
m_SaveAll.addEventListener(MouseEvent.CLICK, onSaveAllClick);
LocNextRow();

TabAdd(Common.Txt.FormEnterTabSet);
m_TabServerText = TabGet( TabAdd(Common.Txt.FormEnterTabSet) ).m_Caption;

i = ItemLabel(Common.Txt.FormEnterServer + ":"); ItemAlign(i, 1, 0);
m_LabelServerText = ( ItemObj( i ) as TextField );
i = ItemComboBox(); m_Server = ItemObj(i) as CtrlComboBox;
LocNextRow();

i = ItemLabel(Common.Txt.FormEnterProtocol + ":"); ItemAlign(i, 1, 0);
m_LabelProtocolText = ( ItemObj( i ) as TextField );
i = ItemComboBox(); m_Protocol = ItemObj(i) as CtrlComboBox;
m_Protocol.ItemAdd(Common.Txt.FormEnterProtocolRaw, Server.ProtocolRaw);
m_Protocol.ItemAdd(Common.Txt.FormEnterProtocolDefaultHTTP, Server.ProtocolDefaultHTTP);
Expand All @@ -117,11 +133,36 @@ public class FormEnter extends FormStd
//i = ItemBut(Common.Txt.FormEnterBut); ItemCellCnt(i, 2); ItemAlign(i, 1); ItemSpace(i, 0, 5); m_ButEnter = ItemObj(i) as CtrlBut; m_ButEnter.addEventListener(MouseEvent.CLICK, clickEnter);
//LocNextRow();

m_TabLanguageText = TabGet( TabAdd("language") ).m_Caption;
( ItemObj( ItemBut("Русский") ) as CtrlBut ).addEventListener(MouseEvent.CLICK,
function(e:Event):void {
Localization.Load( Server.LANG_RUS, null, function():void {
UpdateLocalization();
});
var so:SharedObject = SharedObject.getLocal("EGEmpireData");
if (so != null) {
so.data.lang = Server.LANG_RUS
}
} );
LocNextRow();
( ItemObj( ItemBut("English") ) as CtrlBut ).addEventListener(MouseEvent.CLICK,
function(e:Event):void {
Localization.Load( Server.LANG_ENG, null, function():void {
UpdateLocalization();
});
var so:SharedObject = SharedObject.getLocal("EGEmpireData");
if (so != null) {
so.data.lang = Server.LANG_ENG
}
} );
LocNextRow();

m_ButEnter = new CtrlBut();
addChild(m_ButEnter);
m_ButEnter.caption = Common.Txt.FormEnterBut;
m_ButEnter.addEventListener(MouseEvent.CLICK, clickEnter);


tab = 0;

addEventListener("page", onChangePage);
Expand All @@ -132,6 +173,34 @@ public class FormEnter extends FormStd
}
}

public function UpdateLocalization():void
{
if (tab == 0) m_ButEnter.caption = Common.Txt.FormEnterButTraining;
else m_ButEnter.caption = Common.Txt.FormEnterBut;

caption = Common.Txt.FormEnterCaption;

m_TabTrainingText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterTabTraining );
m_TabLoginText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterTabLogin );
m_TabServerText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterTabSet );
//m_TabLanguageText.htmlText = BaseStr.FormatTag( );

m_LabelTrainingText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterTxtTraining, true, true );
m_LabelLoginNameText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterName+":", true, true );
m_LabelLoginPasswordText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterPassword+":", true, true );
m_LabelServerText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterServer+":", true, true );
m_LabelProtocolText.htmlText = BaseStr.FormatTag( Common.Txt.FormEnterProtocol+":", true, true );

m_SaveName.Caption = Common.Txt.FormEnterSaveName;
m_SaveAll.Caption = Common.Txt.FormEnterSaveAll;

var i:int = m_Protocol.current;
m_Protocol.ItemClear();
m_Protocol.ItemAdd(Common.Txt.FormEnterProtocolRaw, Server.ProtocolRaw);
m_Protocol.ItemAdd(Common.Txt.FormEnterProtocolDefaultHTTP, Server.ProtocolDefaultHTTP);
m_Protocol.current = i;
}

public function onChangePage(e:Event):void
{
if (tab == 0) m_ButEnter.caption = Common.Txt.FormEnterButTraining;
Expand Down
Loading