Skip to content

Commit

Permalink
Use pre-processed cldr production data (nvaccess#12422)
Browse files Browse the repository at this point in the history
Fixes nvaccess#11963

Summary of the issue:
Some time around CLDR release 36, CLDR started including "↑↑↑" in annotation values as a placeholder which meant that the value should be inherited from a parent locale.
These ↑↑↑ values were being put straight into NVDA's cldr dictionaries without any further processing, causing languages such as Chinese (Hongkong) and others to speak these ↑↑↑ values instead of useful emoji labels.

Description of how this pull request fixes the issue:
NVDA now includes the cldr-staging repository as a submodule, rather than the cldr repository. The cldr-staging repository contains a production directory, with all its xml files pre-processed to include inherited values rather than the ↑↑↑ placeholders.
  • Loading branch information
michaelDCurran authored May 17, 2021
1 parent 9390d02 commit 7e6561a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@
url = https://github.com/w3c/aria-practices
[submodule "include/cldr"]
path = include/cldr
url = https://github.com/unicode-org/cldr.git
url = https://github.com/unicode-org/cldr-staging.git
4 changes: 2 additions & 2 deletions cldrDict_sconscript
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ NVDAToCLDRLocales = {
"zh_tw":("zh","zh_Hant"),
}

annotationsDir = env.Dir("include/cldr/common/annotations")
annotationsDerivedDir = env.Dir("include/cldr/common/annotationsDerived")
annotationsDir = env.Dir("include/cldr/production/common/annotations")
annotationsDerivedDir = env.Dir("include/cldr/production/common/annotationsDerived")
for destLocale, sourceLocales in NVDAToCLDRLocales.items():
cldrSources = []
# First add all annotations, then the derived ones.
Expand Down
2 changes: 1 addition & 1 deletion include/cldr
Submodule cldr updated from 651afe to 443ca2
1 change: 1 addition & 0 deletions user_docs/en/changes.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ This release also drops support for Adobe Flash.
- Fixed the pitch change failure in SAPI4 speech synthesizer. (#12311)
- The NVDA installer now also honors the ``--minimal`` command line parameter and does not play the start-up sound, following the same documented behavior as an installed or portable copy NVDA executable. (#12289)
- In MS Word or Outlook, the table quick navigation key can now jump to layout table if "Include layout tables" option is enabled in Browse mode settings. (#11899)
- NVDA will no longer announce "↑↑↑" for emojis in particular languages. (#11963)


== Changes for Developers ==
Expand Down

0 comments on commit 7e6561a

Please sign in to comment.