From 57543c125b53bb1d9563dd027eb727a6467dc1a7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 4 Dec 2013 15:50:23 +0100
Subject: [PATCH] fix traduzioni ed un default nuovo valore non tradotto

---
 .../GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs      | 4 ++++
 .../WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs
index 8362fd4..45ef02b 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_ricercaGenerica.ascx.cs
@@ -35,6 +35,10 @@ public partial class mod_ricercaGenerica : ApplicationUserControl
     protected override void Page_Load(object sender, EventArgs e)
     {
         base.Page_Load(sender, e);
+        if (!Page.IsPostBack)
+        {
+            btnCerca.Text = traduci("btnCerca");
+        }
         updateText();
     }
     /// <summary>
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs
index df3b719..b364241 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tipoGuasto.ascx.cs
@@ -79,7 +79,7 @@ public partial class mod_tipoGuasto : ApplicationUserControl
         resetSelezione();
         // i primi valori ("0") di default sono "ND"... li inserisco come standard...
         GIM_data.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter taTipo = new GIM_data.DS_applicazioneTableAdapters.AnagTipoGuastoTableAdapter();
-        taTipo.Insert("-- [NUOVO] non definito --");
+        taTipo.Insert(memLayer.ML.confReadString("newTipoGuasto"));
         grView.DataBind();
     }
 }
\ No newline at end of file