diff --git a/GMW/GMW_Term/GMW_Term.csproj b/GMW/GMW_Term/GMW_Term.csproj index 1efa3481..e5f34e16 100644 --- a/GMW/GMW_Term/GMW_Term.csproj +++ b/GMW/GMW_Term/GMW_Term.csproj @@ -274,7 +274,7 @@ False True - 50077 + 49998 / diff --git a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs index 14097bb6..e0266edd 100644 --- a/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_activeTask.ascx.cs @@ -10,6 +10,16 @@ namespace GMW_Term.WebUserControls { public partial class mod_activeTask : System.Web.UI.UserControl { + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + // variabile per verificare se è operatore bool _validUserInSession = false; /// @@ -53,9 +63,9 @@ namespace GMW_Term.WebUserControls } if (!Page.IsPostBack) { - lblListaAttiva.Text = "Lista prelievo attiva:"; - lblBarcode.Text = "Ultimo barcode:"; - lblRicerca.Text = "Ultima ricerca:"; + lblListaAttiva.Text = traduci("activeTakingList") + ":"; ; + lblBarcode.Text = traduci("lastBarcode") + ":"; + lblRicerca.Text = traduci("lastSearch") + ":"; } disegnaControlli(); } diff --git a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs index 9434b974..61fd0f88 100644 --- a/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_barcode.ascx.cs @@ -14,6 +14,17 @@ namespace GMW_Term.WebUserControls // variabile per verificare se è operatore bool _validUserInSession = false; + /// + /// wrapper traduzione termini + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + + #region area eventi public event EventHandler eh_scannedUser; @@ -43,7 +54,7 @@ namespace GMW_Term.WebUserControls btnLoginPage.Text = "[7]-LogOut"; btnLoginPage.Visible = true; btnButtonsHome.Visible = true; - lblData.Text = "Inserire Dati..."; + lblData.Text = traduci("Insert Data") + "..."; } // se non è valorizzato chiede di effettuare login... else @@ -51,7 +62,7 @@ namespace GMW_Term.WebUserControls // sistema visualizzazione btnLoginPage.Visible = false; btnButtonsHome.Visible = false; - lblData.Text = "Effettuare Login"; + lblData.Text = traduci("Please Login"); } txtInput.Focus(); } @@ -75,7 +86,7 @@ namespace GMW_Term.WebUserControls } else { - lblData.Text = "Codice non valido, inserire Operatore!"; + lblData.Text = traduci("Invalid Code"); txtScansione = ""; } } @@ -84,7 +95,7 @@ namespace GMW_Term.WebUserControls switch (answ) { case tipoCodiceBarcode.ND: - lblData.Text = "Codice non riconosciuto: " + txtScansione; + lblData.Text = traduci("Code Mismatch") + ": " + txtScansione; txtInput.Text = ""; break; case tipoCodiceBarcode.Operatore: @@ -97,11 +108,11 @@ namespace GMW_Term.WebUserControls verificaUdc(); break; case tipoCodiceBarcode.Particolare: - lblData.Text = "Codice Particolare: " + txtScansione; + lblData.Text = traduci("Particular Code") + ": "+ txtScansione; txtInput.Text = ""; break; default: - lblData.Text = "Codice non riconosciuto: " + txtScansione; + lblData.Text = traduci("Code Not Recognized") + ": " + txtScansione; txtInput.Text = ""; break; } @@ -129,7 +140,7 @@ namespace GMW_Term.WebUserControls else { // indico l'errore: operatore già con una lista attiva - lblData.Text = "!!! Lista di prelievo ancora aperta"; + lblData.Text = "!!!" + traduci("List Still Open"); } } else @@ -145,7 +156,7 @@ namespace GMW_Term.WebUserControls else { // indico l'errore: lista non valida o non attivabile - lblData.Text = string.Format("!!! {0} non prelevabile", txtScansione); + lblData.Text = string.Format("!!!" + "{0}" + traduci("Not Downloadable"), txtScansione); } } txtInput.Text = ""; @@ -169,7 +180,7 @@ namespace GMW_Term.WebUserControls } else { - lblData.Text = string.Format("Codice UDC non valido: {0}", valoreScan); + lblData.Text = string.Format(traduci("UDC Code Invalid") + ": " + "{0}", valoreScan); txtScansione = ""; } } @@ -199,7 +210,7 @@ namespace GMW_Term.WebUserControls catch { // c'era una lsita attiva, non l'ho recuperata, segno errore! - logger.lg.scriviLog(string.Format("Errore: l'utente {0} aveva una lista di prelievo attiva ma non sono riuscito a recuperarne i dati", user_std.UtSn.utente), tipoLog.ERROR); + logger.lg.scriviLog(string.Format(traduci("Error List Data Retrieval"), user_std.UtSn.utente), tipoLog.ERROR); } } else @@ -215,7 +226,7 @@ namespace GMW_Term.WebUserControls else { // avvisa che il codice è errato - lblData.Text = "Utente " + txtInput.Text + " non registrato nel database utenti"; + lblData.Text = traduci("Single User") + txtInput.Text + traduci("Not in db"); txtInput.Text = ""; } } diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 51a54800..9e85516a 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/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index a499c177..7d3597fa 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll index ff6ffb8c..14010e51 100644 Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 51a54800..9e85516a 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index c23d5616..56841a40 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index a499c177..7d3597fa 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Debug/SteamWare.dll b/GMW/GMW_data/bin/Debug/SteamWare.dll index ff6ffb8c..14010e51 100644 Binary files a/GMW/GMW_data/bin/Debug/SteamWare.dll and b/GMW/GMW_data/bin/Debug/SteamWare.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index a499c177..7d3597fa 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache index 3dc68735..9088e357 100644 Binary files a/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_data/obj/Debug/ResolveAssemblyReference.cache differ