Issue 7114 - Remove az and untranslated resources from Windows packages

packagerEdge.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import os
 import shutil
 import json
 import re
-import errno
 from StringIO import StringIO
 from glob import glob
 import subprocess
 import tempfile
 from xml.etree import ElementTree
 from zipfile import ZipFile
 
 import packager
 import packagerChrome
 
@@ skipping 75 matching lines @@
     tree = ElementTree.parse(manifest_path)
     root = tree.getroot()
 
     for xpath, text, attributes in overrides:
         element = root.find(xpath, namespaces)
         if text:
             element.text = text
         for attr, value in attributes:
                 element.set(attr, value)
 
-    # Windows rejects to install packages that contain localized resources
-    # for either 'az' or 'uz'. Both languages have dialects using different
-    # scripts. Using the script-sepcific language code instead seems to work.
+    # Windows rejects to install the package if it contains localized
+    # resources for 'az', or if the manifest lists resources for 'uz'
+    # but the relevant strings aren't translated.
     resources_dir = os.path.join(os.path.dirname(manifest_path), 'Resources')
-    for element in root.findall('_d:Resources/_d:Resource', namespaces):
-        old_code = element.get('Language')
-        new_code = {'az': 'az-latn',
-                    'uz': 'uz-cyrl'}.get(old_code)
-        if new_code:
-            element.set('Language', new_code)
-            try:
-                os.rename(os.path.join(resources_dir, old_code),
-                          os.path.join(resources_dir, new_code))
-            except OSError as e:
-                if e.errno != errno.ENOENT:
-                    raise
+    resources_element = root.find('_d:Resources', namespaces)
+    for element in resources_element.findall('_d:Resource', namespaces):
+        language = element.get('Language')
+        if language:
+            folder = os.path.join(resources_dir, language)
+            if language == 'az':
+                shutil.rmtree(folder, ignore_errors=True)
+            if not os.path.exists(folder):
+                resources_element.remove(element)
 
     tree.write(manifest_path, encoding='utf-8', xml_declaration=True)
 
 
 def createBuild(baseDir, type='edge', outFile=None,  # noqa: preserve API.
                 buildNum=None, releaseBuild=False, keyFile=None,
                 devenv=False):
 
     metadata = packager.readMetadata(baseDir, type)
     version = packager.getBuildVersion(baseDir, metadata, releaseBuild,
@@ skipping 92 matching lines @@
         cmd = ['npm', 'run', '--silent', 'package-edge']
 
         subprocess.check_call(cmd, env=cmd_env, cwd=os.path.dirname(__file__))
 
         package = os.path.join(manifold_folder, 'package',
                                'edgeExtension.appx')
 
         shutil.copyfile(package, outfile)
     finally:
         shutil.rmtree(tmp_dir, ignore_errors=True)