From 22996529f514e2ec9e76719a8899e55908be7d8d Mon Sep 17 00:00:00 2001
From: Tim Young <tim.young@lightsys.org>
Date: Tue, 3 Oct 2017 17:54:41 -0500
Subject: [PATCH] Final touches on translation window.

---
 .../Resources/languages/edustrings.fr.resx      |  8 ++++++--
 .../Resources/languages/edustrings.resx         |  4 ++++
 EduNetworkBuilder/TranslationWindow.cs          | 17 ++++++++++++-----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/EduNetworkBuilder/Resources/languages/edustrings.fr.resx b/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
index 9672b02..869fa2e 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.fr.resx
@@ -862,7 +862,7 @@
     <comment>NB_NBEn = English</comment>
   </data>
   <data name="NB_NBFr" xml:space="preserve">
-    <value>français</value>
+    <value>Français</value>
     <comment>NB_NBFr = French</comment>
   </data>
   <data name="NB_RdCtxtHelp" xml:space="preserve">
@@ -1866,7 +1866,7 @@
     <comment>PPF_UserDirectory</comment>
   </data>
   <data name="_Save" xml:space="preserve">
-    <value>Save</value>
+    <value>Enregistrer</value>
     <comment>_Save = Save</comment>
   </data>
   <data name="PC_HWFileImportStats" xml:space="preserve">
@@ -1961,4 +1961,8 @@
     <value>Network</value>
     <comment>RPC_Network = Network</comment>
   </data>
+  <data name="TW_Translate" xml:space="preserve">
+    <value>Translate</value>
+    <comment>TW_Translate = Translate</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EduNetworkBuilder/Resources/languages/edustrings.resx b/EduNetworkBuilder/Resources/languages/edustrings.resx
index 0c17731..030aafe 100644
--- a/EduNetworkBuilder/Resources/languages/edustrings.resx
+++ b/EduNetworkBuilder/Resources/languages/edustrings.resx
@@ -1961,4 +1961,8 @@
     <value>Network</value>
     <comment>RPC_Network = Network</comment>
   </data>
+  <data name="TW_Translate" xml:space="preserve">
+    <value>Translate</value>
+    <comment>TW_Translate = Translate</comment>
+  </data>
 </root>
\ No newline at end of file
diff --git a/EduNetworkBuilder/TranslationWindow.cs b/EduNetworkBuilder/TranslationWindow.cs
index fb44efa..e488011 100644
--- a/EduNetworkBuilder/TranslationWindow.cs
+++ b/EduNetworkBuilder/TranslationWindow.cs
@@ -14,6 +14,8 @@ namespace EduNetworkBuilder
     public partial class TranslationWindow : Form
     {
         Network myNet = null;
+        string[,] LanguageChoices = { { NB.Translate("NB_NBEn"), "en" }, { NB.Translate("NB_NBFr"), "fr" } };
+
         public TranslationWindow(Network ToEdit)
         {
             InitializeComponent();
@@ -24,8 +26,7 @@ namespace EduNetworkBuilder
         }
 
         void LocalSetup()
-        {
-            string[,] LanguageChoices = NB.LanguageChoices;
+        {            
             cb1Language.Items.Clear();
             cb2Language.Items.Clear();
             NBSettings mySettings = NB.GetSettings();
@@ -46,11 +47,18 @@ namespace EduNetworkBuilder
             if (cb2Language.SelectedIndex == -1) cb2Language.SelectedIndex = 0;
             Icon = Properties.Resources.NBIco;
             lblStatus.Text = "";
+            LanguagifyComponents();
+        }
+
+        private void LanguagifyComponents()
+        {
+            Text = NB.Translate("Translate");
+            btnSave.Text = NB.Translate("_Save");
+            btnClose.Text = NB.Translate("_Done");
         }
 
         private void ClosingStuff()
         {
-            string[,] LanguageChoices = NB.LanguageChoices;
             NBSettings mySettings = NB.GetSettings();
             for (int i = 0; i < LanguageChoices.GetLength(0); i++)
             {
@@ -68,7 +76,6 @@ namespace EduNetworkBuilder
 
         string CodeFromLang(string language)
         {
-            string[,] LanguageChoices = NB.LanguageChoices;
             for (int i = 0; i < LanguageChoices.GetLength(0); i++)
             {
                 if (language == LanguageChoices[i, 0]) return LanguageChoices[i, 1];
@@ -78,13 +85,13 @@ namespace EduNetworkBuilder
 
         string LangFromCode(string Code)
         {
-            string[,] LanguageChoices = NB.LanguageChoices;
             for (int i = 0; i < LanguageChoices.GetLength(0); i++)
             {
                 if (Code == LanguageChoices[i, 1]) return LanguageChoices[i, 0];
             }
             return "";
         }
+
         private void btnClose_Click(object sender, EventArgs e)
         {            
             Close();