From a2e0a6e0690958144bfb41fedcf28af808866cd1 Mon Sep 17 00:00:00 2001
From: Andrew Polk <andrew_polk@sil.org>
Date: Mon, 6 Oct 2014 15:21:50 -0400
Subject: [PATCH] Add a few fields for I18N during New Collection Wizard

---
 DistFiles/localization/Bloom.en.tmx           | 10 ++++++++++
 .../CollectionCreating/NewCollectionWizard.cs |  5 +++++
 src/BloomExe/Wizard/WizardAdapterControl.cs   | 19 +++++++++++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/DistFiles/localization/Bloom.en.tmx b/DistFiles/localization/Bloom.en.tmx
index 7274fce3d9a9..32c8a443e67f 100644
--- a/DistFiles/localization/Bloom.en.tmx
+++ b/DistFiles/localization/Bloom.en.tmx
@@ -1618,6 +1618,11 @@
 		<seg>What would you like to call this collection?</seg>
 	  </tuv>
 	</tu>
+    <tu tuid="NewCollectionWizard.CollectionNameProblem">
+      <tuv xml:lang="en">
+        <seg>Collection Name Problem</seg>
+      </tuv>
+    </tu>
 	<tu tuid="NewCollectionWizard.CollectionWillBeCreatedAt">
 	  <tuv xml:lang="en">
 		<seg>Collection will be created at: {0}</seg>
@@ -1689,6 +1694,11 @@
 		<seg>Create New Bloom Collection</seg>
 	  </tuv>
 	</tu>
+    <tu tuid="NewCollectionWizard.ProjectName">
+      <tuv xml:lang="en">
+        <seg>Project Name</seg>
+      </tuv>
+    </tu>
 	<tu tuid="NewCollectionWizard.UnableToCreateANewCollectionUsingThatName">
 	  <tuv xml:lang="en">
 		<seg>Unable to create a new collection using that name.</seg>
diff --git a/src/BloomExe/CollectionCreating/NewCollectionWizard.cs b/src/BloomExe/CollectionCreating/NewCollectionWizard.cs
index a38ffdd8d315..6fe5d24d8549 100644
--- a/src/BloomExe/CollectionCreating/NewCollectionWizard.cs
+++ b/src/BloomExe/CollectionCreating/NewCollectionWizard.cs
@@ -100,6 +100,10 @@ private void SetLocalizedStrings()
 																   "Welcome To Bloom!");
 			this._kindOfCollectionPage.Text = LocalizationManager.GetString("NewCollectionWizard.KindOfCollectionPage",
 																			"Choose the Collection Type");
+			_collectionNamePage.Text = LocalizationManager.GetString("NewCollectionWizard.ProjectName",
+																			"Project Name");
+			_collectionNameProblemPage.Text = LocalizationManager.GetString("NewCollectionWizard.CollectionNameProblem",
+																			"Collection Name Problem");
 			this._languageLocationPage.Text = LocalizationManager.GetString("NewCollectionWizard.LocationPage",
 																			"Give Language Location");
 			this._vernacularLanguagePage.Text = LocalizationManager.GetString("NewCollectionWizard.ChooseLanguagePage",
@@ -110,6 +114,7 @@ private void SetLocalizedStrings()
 																		  "Used for the Next button in wizards, like that used for making a New Collection");
 			wizardControl1.FinishButtonText = LocalizationManager.GetString("Common.Finish", "&Finish",
 																			"Used for the Finish button in wizards, like that used for making a New Collection");
+			wizardControl1.CancelButtonText = LocalizationManager.GetString("Common.CancelButton", "&Cancel");
 
 			var one = L10NSharp.LocalizationManager.GetString("NewCollectionWizard.WelcomePage.WelcomeLine1",
 																 "You are almost ready to start making books.");
diff --git a/src/BloomExe/Wizard/WizardAdapterControl.cs b/src/BloomExe/Wizard/WizardAdapterControl.cs
index 1e836945d371..1403f1d9b46c 100644
--- a/src/BloomExe/Wizard/WizardAdapterControl.cs
+++ b/src/BloomExe/Wizard/WizardAdapterControl.cs
@@ -82,8 +82,10 @@ public void Setup()
 				SetTitle = (value) => _aeroWizard.Title = value;
 				GetNextButtonText = () => _aeroWizard.NextButtonText;
 				SetNextButtonText = (value) => _aeroWizard.NextButtonText = value;
-				GetFinishButtonText= () => _aeroWizard.FinishButtonText;
-				SetFinishButtonText= (value) => _aeroWizard.FinishButtonText = value;
+				GetFinishButtonText = () => _aeroWizard.FinishButtonText;
+				SetFinishButtonText = (value) => _aeroWizard.FinishButtonText = value;
+				GetCancelButtonText = () => _aeroWizard.CancelButtonText;
+				SetCancelButtonText = (value) => _aeroWizard.CancelButtonText = value;
 				GetIcon = () => _aeroWizard.TitleIcon;
 				SetIcon = (icon) => _aeroWizard.TitleIcon = icon;
 
@@ -180,6 +182,8 @@ public void Setup()
 		Action<string> SetNextButtonText;
 		Func<string> GetFinishButtonText;
 		Action<string> SetFinishButtonText;
+		Func<string> GetCancelButtonText;
+		Action<string> SetCancelButtonText;
 		Func<Icon> GetIcon;
 		Action<Icon> SetIcon;
 		Action BeginInitLogic;
@@ -244,6 +248,17 @@ public string FinishButtonText
 				SetFinishButtonText(value);
 			}
 		}
+		public string CancelButtonText
+		{
+			get
+			{
+				return GetCancelButtonText();
+			}
+			set
+			{
+				SetCancelButtonText(value);
+			}
+		}
 
 		public Icon TitleIcon
 		{