Update and use official CLDR repository (PR nvaccess#11817)

Co-authored-by: Leonard de Ruijter <[email protected]>

.gitmodules

@@ -34,9 +34,6 @@
 [submodule "include/configobj"]
 	path = include/configobj
 	url = https://github.com/DiffSK/configobj.git
-[submodule "include/cldr-emoji-annotation"]
-	path = include/cldr-emoji-annotation
-	url = https://github.com/fujiwarat/cldr-emoji-annotation
 [submodule "include/py2exe"]
 	path = include/py2exe
 	url = https://github.com/nvaccess/py2exe-bin
@@ -46,3 +43,6 @@
 [submodule "include/w3c-aria-practices"]
 	path = include/w3c-aria-practices
 	url = https://github.com/w3c/aria-practices
+[submodule "include/cldr"]
+	path = include/cldr
+	url = https://github.com/unicode-org/cldr.git

cldrDict_sconscript

@@ -118,8 +118,8 @@ NVDAToCLDRLocales = {
 	"zh_tw":("zh","zh_Hant"),
 }
 
-annotationsDir = env.Dir("include/cldr-emoji-annotation/annotations")
-annotationsDerivedDir = env.Dir("include/cldr-emoji-annotation/annotationsDerived")
+annotationsDir = env.Dir("include/cldr/common/annotations")
+annotationsDerivedDir = env.Dir("include/cldr/common/annotationsDerived")
 for destLocale, sourceLocales in NVDAToCLDRLocales.items():
 	cldrSources = []
 	# First add all annotations, then the derived ones.

readme.md

@@ -90,7 +90,7 @@ For reference, the following run time dependencies are included in Git submodule
 * [ConfigObj](https://github.com/DiffSK/configobj), commit f9a265c
 * [Six](https://pypi.python.org/pypi/six), version 1.12.0, required by wxPython and ConfigObj
 * [liblouis](http://www.liblouis.org/), version 3.15.0
-* [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) Emoji Annotations, version 37.0
+* [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/) Emoji Annotations, version 38.0
 * NVDA images and sounds
 * [Adobe Acrobat accessibility interface, version XI](https://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)
 * Adobe FlashAccessibility interface typelib

tests/lint/flake8.ini

@@ -48,6 +48,4 @@ exclude = # don't bother looking in the following subdirectories / files.
 
 filename =
 	*.py,
-	*.pyw,
-	*sconscript,
-	sconstruct
+	*.pyw

user_docs/en/changes.t2t

@@ -28,6 +28,7 @@ What's New in NVDA
 - NVDA will now report "Copied to clipboard" before the copied text. (#6757)
 - Presentation of graphical view table in disk management has been improved. (#10048)
 - Labels for controls are now disabled (greyed out) when the control is disabled. (#11809)
+- Updated CLDR emoji annotation to version 38. (#11817)
 
 
 == Bug Fixes ==