From 17fe8c8242fecf9ce67bd614e52f3df810e52c2a Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 10 Aug 2021 00:32:39 -0400
Subject: [PATCH] Add support for Encoding in SearchEngine

---
 README.md                  | 4 +++-
 windows/de-DE/firefox.adml | 3 +++
 windows/en-US/firefox.adml | 3 +++
 windows/es-ES/firefox.adml | 3 +++
 windows/firefox.admx       | 5 +++++
 windows/fr-FR/firefox.adml | 3 +++
 windows/it-IT/firefox.adml | 3 +++
 windows/ru-RU/firefox.adml | 3 +++
 windows/zh-CN/firefox.adml | 3 +++
 windows/zh-TW/firefox.adml | 3 +++
 10 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 50dbe0c..107ec54 100644
--- a/README.md
+++ b/README.md
@@ -5051,7 +5051,9 @@ Add new search engines (up to five). This policy is only available on the ESR. `
 
 `SuggestURLTemplate` is a search suggestions URL with {searchTerms} to substitute for the search term.
 
-**Compatibility:** Firefox ESR 60 (POST support in Firefox ESR 68)\
+`Encoding` is the query charset for the engine. It defaults to UTF-8.
+
+**Compatibility:** Firefox ESR 60 (POST support in Firefox ESR 68, Encoding support in Firefox 91)\
 **CCK2 Equivalent:** `searchplugins`\
 **Preferences Affected:** N/A
 
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index ec65d9a..9e26e8e 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 309f984..032be71 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index bb82f47..4a4f855 100644
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <textBox refId="SearchEngine_PostData">
           <label>Datos POST:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 1c80795..378fb91 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -2648,6 +2648,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_2" class="Both" displayName="$(string.SearchEngines_2)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\2" presentation="$(presentation.SearchEngine)" >
@@ -2673,6 +2674,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_3" class="Both" displayName="$(string.SearchEngines_3)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\3" presentation="$(presentation.SearchEngine)" >
@@ -2698,6 +2700,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_4" class="Both" displayName="$(string.SearchEngines_4)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\4" presentation="$(presentation.SearchEngine)" >
@@ -2723,6 +2726,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_5" class="Both" displayName="$(string.SearchEngines_5)" explainText="$(string.SearchEngines_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines\Add\5" presentation="$(presentation.SearchEngine)" >
@@ -2748,6 +2752,7 @@
         <text id="SearchEngine_Description" valueName="Description"/>
         <text id="SearchEngine_SuggestURLTemplate" valueName="SuggestURLTemplate"/>
         <text id="SearchEngine_PostData" valueName="PostData"/>
+        <text id="SearchEngine_Encoding" valueName="Encoding"/>
       </elements>
     </policy>
     <policy name="SearchEngines_Default" class="Both" displayName="$(string.SearchEngines_Default)" explainText="$(string.SearchEngines_Default_Explain)" key="Software\Policies\Mozilla\Firefox\SearchEngines" presentation="$(presentation.SearchEngines_Default)" >
diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 234daed..982e381 100644
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -1040,6 +1040,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <textBox refId="SearchEngine_PostData">
           <label>POST data:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index daa14fd..abb0414 100644
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -1042,6 +1042,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
         <textBox refId="SearchEngine_PostData">
           <label>Dati POST:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
diff --git a/windows/ru-RU/firefox.adml b/windows/ru-RU/firefox.adml
index aecaa68..5b459da 100644
--- a/windows/ru-RU/firefox.adml
+++ b/windows/ru-RU/firefox.adml
@@ -1041,6 +1041,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. <
          <textBox refId="SearchEngine_PostData">
            <label> Данные POST:</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
diff --git a/windows/zh-CN/firefox.adml b/windows/zh-CN/firefox.adml
index 4489668..2e982c8 100644
--- a/windows/zh-CN/firefox.adml
+++ b/windows/zh-CN/firefox.adml
@@ -1039,6 +1039,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
 <textBox refId="SearchEngine_PostData">
      <label>POST 数据：</label>
     </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
    </presentation>
    <presentation id="SearchEngines_Default">
 <textBox refId="SearchEngines_Default">
diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index c50463b..34ab41d 100644
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -1039,6 +1039,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
         <textBox refId="SearchEngine_PostData">
           <label>POST 資料：</label>
         </textBox>
+        <textBox refId="SearchEngine_Encoding">
+          <label>Encoding:</label>
+        </textBox>
       </presentation>
       <presentation id="SearchEngines_Default">
         <textBox refId="SearchEngines_Default">
-- 
2.34.1