Create a shared dictionary class for plugin and engine

WixInstaller/adblockplusie.wxs

Index: WixInstaller/adblockplusie.wxs
===================================================================
--- a/WixInstaller/adblockplusie.wxs
+++ b/WixInstaller/adblockplusie.wxs
@@ -58,16 +58,17 @@
         -->

[Eric, 2013/06/07 14:06:23]

These installer changes are LGTM.

Pretty much identical to what I would have written myself.

         <Feature Id="ProductFeature"
             Title="!(loc.Title)" Description="!(loc.UI_Description)"
             Display="hidden"
             ConfigurableDirectory="INSTALLFOLDER">
             <ComponentGroupRef Id="Installation_Folders"/>
             <ComponentGroupRef Id="Binaries"/>
             <ComponentGroupRef Id="HTML_Tree"/>
+            <ComponentGroupRef Id="Locale_Files"/>
             <ComponentGroupRef Id="INI_Files"/>
         </Feature>
 
     	<!--
     		Remove the "Modify" button from our control panel entry.
     		Since we only have a single feature, there's only a single way of installing the plugin,
     			and thus modifying the installation can't possibly do anything.
             This is currently set by the WiXUI property WIXUI_INSTALLDIR, so it's commented out now.
@@ -142,16 +143,17 @@
     	<Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="$(var.Program_Files)">
                 <!--
                     INSTALLFOLDER is within ProgramFilesFolder, which is a protected directory.
                     As a result, this installer requires elevated permissions to operate.
                 -->
                 <Directory Id="INSTALLFOLDER" Name="Adblock Plus for IE">
                     <Directory Id="HTML_Folder" Name="html"></Directory>
+                    <Directory Id="Locales_Folder" Name="locales"></Directory>
                 </Directory>
                 <Directory Id="APP_DATA_FOLDER">
                     <Directory Id="ABP_APPDATA_FOLDER" Name="Adblock Plus for IE"></Directory>
                 </Directory>
             </Directory>
         </Directory>
 
         <!--
@@ -275,31 +277,41 @@
                 </Directory>
                 <Directory Name="templates" Id="html_templates">
                     <Component Id="html_templates_index.html"><File Name="index.html"/></Component>
                </Directory>
             </Directory>
         </DirectoryRef>
 
         <!--
+            Locale files
+        -->
+        <ComponentGroup Id="Locale_Files">
+            <ComponentRef Id="locales_en.ini"/>
+            <ComponentRef Id="locales_ru.ini"/>
+        </ComponentGroup>
+        <DirectoryRef Id="Locales_Folder">
+            <Directory Id="locales" FileSource="SourceDir\..\locales">
+                <Component Id="locales_en.ini"><File Name="en.ini"/></Component>
+                <Component Id="locales_ru.ini"><File Name="ru.ini"/></Component>
+            </Directory>
+        </DirectoryRef>
+
+        <!--
             INI files
 
             The settings.ini file should not be installed this way, since it contains user-generated data.
             A component in Windows Installer represents a fixed piece of data with the MSI, not a changing one.
             The present method of making settings.ini a component is simply an expedient for the present,
                 not a permanent solution.
             The correct solution requires the application to manage this file; the installer can't do it right.
             See http://stackoverflow.com/questions/357911/manage-configuration-files-with-wix
         -->
         <ComponentGroup Id="INI_Files">
-            <ComponentRef Id="ini_settings.page.w.ini"/>
-            <ComponentRef Id="ini_dictionary.w.ini"/>
             <ComponentRef Id="ini_settings.ini"/>
         </ComponentGroup>
         <DirectoryRef Id="ABP_APPDATA_FOLDER">
             <Directory Id="ini" FileSource="SourceDir\..\files">
-                <Component Id="ini_settings.page.w.ini"><File Name="settings_page_w.ini"/></Component>
-                <Component Id="ini_dictionary.w.ini"><File Name="dictionary_w.ini"/></Component>
                 <Component Id="ini_settings.ini"><File Name="settings.ini"/></Component>
             </Directory>
         </DirectoryRef>
     </Product>
 </Wix>