diff --git a/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx.cs index e69378c4..ed7f6237 100644 --- a/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_currentTask.ascx.cs @@ -10,12 +10,25 @@ namespace GMW_Term.WebUserControls { public partial class mod_currentTask : System.Web.UI.UserControl { + + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + protected void Page_Load(object sender, EventArgs e) { + + string task = memLayer.ML.StringSessionObj("activeTask"); if (task == "") { - task = "... waiting ..."; + task = "..." + traduci("waiting") + "..."; } lblTask.Text = task; } diff --git a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs index 9d3665ff..7873c5ba 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs @@ -272,24 +272,24 @@ namespace GMW_Term.WebUserControls private void traduciObj() { // buttons primari - btnDeposita.Text = "[4] - Deposita"; + btnDeposita.Text = "[4] - " + traduci("Store"); btnDeposita.AccessKey = "4"; - btnSposta.Text = "[5] - Sposta"; + btnSposta.Text = "[5] - " + traduci("Move"); btnSposta.AccessKey = "5"; - btnRettifica.Text = "[6] - Rettifica"; + btnRettifica.Text = "[6] -" +traduci("Correct"); btnRettifica.AccessKey = "6"; - btnPreleva.Text = "[7] - Preleva"; + btnPreleva.Text = "[7] - " + traduci("Take"); btnPreleva.AccessKey = "7"; btnChiudi.Text = "[9] - Home"; btnChiudi.AccessKey = "9"; - btnChiudiInput.Text = "[0] - Chiudi"; + btnChiudiInput.Text = "[0] - " + traduci("Close"); btnChiudiInput.AccessKey = "0"; btnBarcode.Text = "[1] - Barcode"; btnBarcode.AccessKey = "1"; // buttons secondari btnConferma.Text = "[2] - OK"; btnConferma.AccessKey = "2"; - btnCellaPiena.Text = "[4] - OK+Piena"; + btnCellaPiena.Text = "[4] - " + traduci("OkFull"); btnCellaPiena.AccessKey = "4"; } /// @@ -405,7 +405,7 @@ namespace GMW_Term.WebUserControls switch (answ) { case tipoCodiceBarcode.Cella: - lblData.Text = "Cella: " + txtScansione; + lblData.Text = traduci("Box") + ": " + txtScansione; txtScansione = ""; // mostro btnConferma btnConferma.Enabled = true; @@ -434,7 +434,7 @@ namespace GMW_Term.WebUserControls break; default: - lblData.Text = "Codice non riconosciuto: " + valoreScanUdc; + lblData.Text = traduci("Code Not Recognized") + ": " + valoreScanUdc; txtInput.Text = ""; txtInput.Focus(); break; diff --git a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs index fc0cecbe..f484505c 100644 --- a/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_home.ascx.cs @@ -4,11 +4,21 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using SteamWare; namespace GMW_Term.WebUserControls { public partial class mod_home : System.Web.UI.UserControl { + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } protected void Page_Load(object sender, EventArgs e) { @@ -16,11 +26,11 @@ namespace GMW_Term.WebUserControls btn1.Text = "[1]-Barcode"; btn1.AccessKey = "1"; - btn2.Text = "[3]-Ricerca"; + btn2.Text = "[3]-" + traduci("Research"); btn2.AccessKey = "3"; - btn3.Text = "[7]-Liste Prel"; + btn3.Text = "[7]-" + traduci("TakeList"); btn3.AccessKey = "7"; - btn4.Text = "[9]-Task Attivi"; + btn4.Text = "[9]-" + traduci("ActiveTask"); btn4.AccessKey = "9"; } diff --git a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs index d5c38300..b9e7e030 100644 --- a/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_listePrelievo.ascx.cs @@ -237,7 +237,6 @@ namespace GMW_Term.WebUserControls resetSelezione(); } - #endregion #endregion @@ -272,7 +271,7 @@ namespace GMW_Term.WebUserControls btnLoginPage.AccessKey = "7"; btnButtonsHome.Text = "[9]-Home"; btnButtonsHome.AccessKey = "9"; - btnCloseDet.Text = "[3]-Chiudi"; + btnCloseDet.Text = "[3]-" + traduci("Close"); btnCloseDet.AccessKey = "3"; btnBarcode.Text = "[1]-Barcode"; btnBarcode.AccessKey = "1"; diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 9e85516a..3819da8a 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 9e85516a..3819da8a 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ