FIX gettext changes

Author: deepnight

src/electron.renderer/Lang.hx

@@ -1,4 +1,4 @@
-import dn.data.GetText;
+import dn.data.LocaleString;
 
 class Lang {
 	// Text constants
@@ -16,7 +16,7 @@ class Lang {
 	static var _initDone = false;
 	static var DEFAULT = "en";
 	public static var CUR = "??";
-	public static var t : GetText;
+	public static var t : dn.data.GetText;
 
 
 	public static function init(?lid:String) {
@@ -26,7 +26,7 @@ class Lang {
 		_initDone = true;
 		CUR = lid==null ? DEFAULT : lid;
 
-		t = new GetText();
+		t = new dn.data.GetText();
 		t.readPo( hxd.Res.load("lang/"+CUR+".po").entry.getBytes() );
 	}
 

src/electron.renderer/form/input/EnumSelect.hx

@@ -4,7 +4,7 @@ class EnumSelect<T:EnumValue> extends form.Input<T> {
 	var enumRef : Enum<T>;
 	var allowNull : Bool;
 
-	public function new(j:js.jquery.JQuery, e:Enum<T>, allowNull=false, getter:Void->T, setter:T->Void, ?nameLocalizer:T->dn.data.GetText.LocaleString, ?keepOnly:T->Bool, disableFilteredOuts=false) {
+	public function new(j:js.jquery.JQuery, e:Enum<T>, allowNull=false, getter:Void->T, setter:T->Void, ?nameLocalizer:T->LocaleString, ?keepOnly:T->Bool, disableFilteredOuts=false) {
 		this.allowNull = allowNull;
 
 		super(j, getter, setter);

src/electron.renderer/import.hx

@@ -8,7 +8,7 @@ import dn.Chrono;
 import dn.legacy.Color as C;
 import hxd.Key as K;
 import Lang as L;
-import dn.data.GetText;
+import dn.data.LocaleString;
 import dn.js.ElectronTools as ET;
 import dn.js.NodeTools as NT;
 

src/electron.renderer/page/Editor.hx

@@ -2549,7 +2549,7 @@ class Editor extends Page {
 		var jGuide = new J("#guide");
 		jGuide.empty();
 
-		function _createGuideBlock(?keys:Array<Int>, mouseIconId:Null<String>, label:dn.data.GetText.LocaleString) {
+		function _createGuideBlock(?keys:Array<Int>, mouseIconId:Null<String>, label:LocaleString) {
 			var block = new J('<span/>');
 			block.appendTo(jGuide);
 

src/electron.renderer/ui/LastChance.hx

@@ -4,7 +4,7 @@ class LastChance extends dn.Process {
 	static var CUR : Null<LastChance>;
 	var elem : js.jquery.JQuery;
 
-	public function new(str:dn.data.GetText.LocaleString, project:data.Project) {
+	public function new(str:LocaleString, project:data.Project) {
 		super(Editor.ME);
 
 		LastChance.end();

src/electron.renderer/ui/modal/ContextMenu.hx

@@ -1,7 +1,5 @@
 package ui.modal;
 
-import dn.data.GetText.LocaleString;
-
 typedef ContextActions = Array<ContextAction>;
 typedef ContextAction = {
 	var ?label : LocaleString;

src/electron.renderer/ui/modal/Dialog.hx

@@ -40,22 +40,22 @@ class Dialog extends ui.Modal {
 	}
 
 
-	public function addTitle(label:dn.data.GetText.LocaleString, atTheBeginning:Bool) {
+	public function addTitle(label:LocaleString, atTheBeginning:Bool) {
 		var t = new J('<h2>$label</h2>');
 		if( atTheBeginning )
 			jContent.prepend(t);
 		else
 			jContent.append(t);
 	}
 
-	public function addParagraph(str:dn.data.GetText.LocaleString, ?className:String) {
+	public function addParagraph(str:LocaleString, ?className:String) {
 		var jElem = new J('<p>$str</p>');
 		if( className!=null )
 			jElem.addClass(className);
 		jContent.append(jElem);
 	}
 
-	public function addDiv(str:dn.data.GetText.LocaleString, ?className:String) {
+	public function addDiv(str:LocaleString, ?className:String) {
 		var jElem = new J('<div>$str</div>');
 		if( className!=null )
 			jElem.addClass(className);

src/electron.renderer/ui/modal/dialog/InputDialog.hx

@@ -8,7 +8,7 @@ class InputDialog<T> extends ui.modal.Dialog {
 	var parser : String->T;
 	var onConfirm : T->Void;
 
-	public function new(desc:dn.data.GetText.LocaleString, ?curValue:T, ?suffix="", ?getError:T->Null<String>, parser:String->T, onConfirm:T->Void) {
+	public function new(desc:LocaleString, ?curValue:T, ?suffix="", ?getError:T->Null<String>, parser:String->T, onConfirm:T->Void) {
 		super("inputDialog");
 
 		this.getError = getError;

src/electron.renderer/ui/modal/dialog/LockMessage.hx

@@ -3,7 +3,7 @@ package ui.modal.dialog;
 class LockMessage extends ui.modal.Dialog {
 	static var ME : LockMessage;
 
-	public function new(str:dn.data.GetText.LocaleString, action:Void->Void) {
+	public function new(str:LocaleString, action:Void->Void) {
 		super("lockMessage");
 
 		ME = this;

src/electron.renderer/ui/modal/dialog/Message.hx

@@ -1,7 +1,7 @@
 package ui.modal.dialog;
 
 class Message extends ui.modal.Dialog {
-	public function new(?str:dn.data.GetText.LocaleString, ?iconId:String, ?onClose:Void->Void) {
+	public function new(?str:LocaleString, ?iconId:String, ?onClose:Void->Void) {
 		super("message");
 
 		if( iconId!=null ) {