From 8bda078922168f97d7a50a5b1f25cc759355e9f5 Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 26 Aug 2019 16:21:18 -0500
Subject: [PATCH] Reenable ExtensionSettings in admx using multiText.

---
 windows/de-DE/firefox.adml | 9 ++-------
 windows/en-US/firefox.adml | 9 ++-------
 windows/es-ES/firefox.adml | 9 ++-------
 windows/firefox.admx       | 4 +---
 windows/fr-FR/firefox.adml | 9 ++-------
 windows/it-IT/firefox.adml | 9 ++-------
 6 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 6ed1b27..9a41349 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -218,9 +218,7 @@ Wenn Sie die Richtlinieneinstellung aktivieren oder nicht konfigurieren, werden
 
 If this policy is disabled or not configured, extensions will not be managed.
 
-For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Hardware-Beschleunigung</string>
       <string id="HardwareAcceleration_Explain">Wenn Sie die Richtlinieneinstellung deaktivieren, wird die Hardware-Beschleunigung deaktiviert.
 
@@ -779,10 +777,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Es ist nicht erlaubt, dass Einstellungen geändert werden.</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index fef1dae..20c6dd4 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -218,9 +218,7 @@ If this policy is enabled or not configured, extensions will be updated automati
 
 If this policy is disabled or not configured, extensions will not be managed.
 
-For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Hardware Acceleration</string>
       <string id="HardwareAcceleration_Explain">If this policy is disabled, hardware acceleration and cannot be enabled.
 
@@ -779,10 +777,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 79e568d..a64e822 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -218,9 +218,7 @@ Si esta política está habilitada o no está configurada, las extensiones se ac
 
 Si esta política está deshabilitada o no está configurada, las extensiones no se gestionarán.
 
-Para obtener información detallada sobre la creación de la política, visite https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-Debe eliminar todas las líneas nuevas al insertar el JSON. Arreglaremos esto en un futuro lanzamiento.</string>
+Para obtener información detallada sobre la creación de la política, visite https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Aceleración por hardware</string>
       <string id="HardwareAcceleration_Explain">Si esta política está deshabilitada, la aceleración por hardware no se puede habilitar.
 
@@ -779,10 +777,7 @@ Si esta política está deshabilitada o no está configurada, no se añadirá ni
         <checkBox refId="FirefoxHome_Locked">No permitir que se cambie la configuración</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index de4c005..3ee413b 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -664,15 +664,13 @@
         <list id="Extensions" key="Software\Policies\Mozilla\Firefox\Extensions\Locked" valuePrefix=""/>
       </elements>
     </policy>
-    <!--
     <policy name="ExtensionSettings" class="Both" displayName="$(string.ExtensionSettings)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.ExtensionSettings_Explain)"  presentation="$(presentation.ExtensionSettings)">">
       <parentCategory ref="Extensions"/>
       <supportedOn ref="SUPPORTED_FF6801"/>
       <elements>
-        <multiText id="ExtensionSettings" valueName="ExtensionSettings" />
+        <multiText id="ExtensionSettings" valueName="ExtensionSettings"  maxLength="2048"/>
       </elements>
     </policy>
-    -->
     <policy name="NoDefaultBookmarks" class="Both" displayName="$(string.NoDefaultBookmarks)" explainText="$(string.NoDefaultBookmarks_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="NoDefaultBookmarks">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF60"/>
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 3d29183..be194c7 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -218,9 +218,7 @@ Si cette stratégie est activée ou non configurée, les extensions seront mise
 
 If this policy is disabled or not configured, extensions will not be managed.
 
-For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-You must remove all new lines when inserting the JSON. We will be fixing this in a future release.</string>
+For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Accélération matérielle</string>
       <string id="HardwareAcceleration_Explain">Si cette stratégie est désactivée, l'accélération matérielle ne peut pas être activée.
 
@@ -779,10 +777,7 @@ If this policy is disabled or not configured, no menuitem is added.</string>
         <checkBox refId="FirefoxHome_Locked">Don't allow settings to be changed</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index e7cc6d5..f2faf6a 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -218,9 +218,7 @@ Se questo criterio è abilitato o non configurato, le estensioni saranno aggiorn
 
 Se questo criterio è disabilitato o non configurato, le estensioni non saranno gestite.
 
-Per informazioni dettagliate sulla creazione della policy, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings
-
-È necessario rimuovere tutti i caratteri di ritorno a capo durante l'inserimento del JSON. Correggeremo questo bug in un rilascio successivo.</string>
+Per informazioni dettagliate sulla creazione della policy, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#extensionsettings.</string>
       <string id="HardwareAcceleration">Accelerazione hardware</string>
       <string id="HardwareAcceleration_Explain">Se questo criterio è disabilitato, l'accelerazione hardware non può essere abilitata.
 
@@ -779,10 +777,7 @@ Se questo criterio è disabilitato o non configurato, non sarà aggiunta nessuna
         <checkBox refId="FirefoxHome_Locked">Non consentire la modifica delle preferenze</checkBox>
       </presentation>
       <presentation id="ExtensionSettings">
-<!--        <multiTextBox refId="ExtensionSettings"/> -->
-        <textBox refId="ExtensionSettings">
-          <label/>
-        </textBox>
+        <multiTextBox refId="ExtensionSettings"/>
       </presentation>
     </presentationTable>
   </resources>
-- 
2.34.1