From 39c7e2bb0399802e65a3025c4a73db211e730479 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sun, 1 Oct 2017 14:25:33 -0700
Subject: Add support for BindPaths and building .wixlibs

---
 src/WixToolset.Core/Localizer.cs | 53 ++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 29 deletions(-)

(limited to 'src/WixToolset.Core/Localizer.cs')

diff --git a/src/WixToolset.Core/Localizer.cs b/src/WixToolset.Core/Localizer.cs
index 3c299896..63ead24a 100644
--- a/src/WixToolset.Core/Localizer.cs
+++ b/src/WixToolset.Core/Localizer.cs
@@ -23,11 +23,32 @@ namespace WixToolset
         /// <summary>
         /// Instantiate a new Localizer.
         /// </summary>
-        public Localizer()
+        public Localizer(IEnumerable<Localization> localizations)
         {
             this.Codepage = -1;
-            this.variables = new Dictionary<string,WixVariableRow>();
+            this.variables = new Dictionary<string, WixVariableRow>();
             this.localizedControls = new Dictionary<string, LocalizedControl>();
+
+            foreach (var localization in localizations)
+            {
+                if (-1 == this.Codepage)
+                {
+                    this.Codepage = localization.Codepage;
+                }
+
+                foreach (WixVariableRow wixVariableRow in localization.Variables)
+                {
+                    Localizer.AddWixVariable(this.variables, wixVariableRow);
+                }
+
+                foreach (KeyValuePair<string, LocalizedControl> localizedControl in localization.LocalizedControls)
+                {
+                    if (!this.localizedControls.ContainsKey(localizedControl.Key))
+                    {
+                        this.localizedControls.Add(localizedControl.Key, localizedControl.Value);
+                    }
+                }
+            }
         }
 
         /// <summary>
@@ -75,31 +96,6 @@ namespace WixToolset
             return localization;
         }
 
-        /// <summary>
-        /// Add a localization file.
-        /// </summary>
-        /// <param name="localization">The localization file to add.</param>
-        public void AddLocalization(Localization localization)
-        {
-            if (-1 == this.Codepage)
-            {
-                this.Codepage = localization.Codepage;
-            }
-
-            foreach (WixVariableRow wixVariableRow in localization.Variables)
-            {
-                Localizer.AddWixVariable(this.variables, wixVariableRow);
-            }
-
-            foreach (KeyValuePair<string, LocalizedControl> localizedControl in localization.LocalizedControls)
-            {
-                if (!this.localizedControls.ContainsKey(localizedControl.Key))
-                {
-                    this.localizedControls.Add(localizedControl.Key, localizedControl.Value);
-                }
-            }
-        }
-
         /// <summary>
         /// Get a localized data value.
         /// </summary>
@@ -107,8 +103,7 @@ namespace WixToolset
         /// <returns>The localized data value or null if it wasn't found.</returns>
         public string GetLocalizedValue(string id)
         {
-            WixVariableRow wixVariableRow;
-            return this.variables.TryGetValue(id, out wixVariableRow) ? wixVariableRow.Value : null;
+            return this.variables.TryGetValue(id, out var wixVariableRow) ? wixVariableRow.Value : null;
         }
 
         /// <summary>
-- 
cgit v1.2.3-55-g6feb