From 260f1a0ba4e45230407669fab4eb991add5de377 Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Fri, 4 Oct 2024 18:38:23 +1000 Subject: [PATCH 1/4] Rename nvdaL10nUtil.exe to l10nUtil.exe and change appveyor's deploy code to look for the main nvda launcher as nvda_*.exe. --- appveyor/scripts/deployScript.ps1 | 2 +- sconstruct | 2 +- user_docs/{nvdaL10nUtil.py => l10nUtil.py} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename user_docs/{nvdaL10nUtil.py => l10nUtil.py} (100%) diff --git a/appveyor/scripts/deployScript.ps1 b/appveyor/scripts/deployScript.ps1 index e9d55ab6cf0..ab98b2a9e4b 100644 --- a/appveyor/scripts/deployScript.ps1 +++ b/appveyor/scripts/deployScript.ps1 @@ -8,7 +8,7 @@ if (!$env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:versionType) { } # Notify the NV Access server if this is an NV Access build. if ($env:APPVEYOR_REPO_NAME.StartsWith("nvaccess/")) { - $exe = Get-ChildItem -Name output\*.exe + $exe = Get-ChildItem -Name output\nvda_*.exe $hash = (Get-FileHash "output\$exe" -Algorithm SHA1).Hash.ToLower() $apiVersion = (py -c "import sys; sys.path.append('source'); from addonAPIVersion import CURRENT; print('{}.{}.{}'.format(*CURRENT))") echo apiversion: $apiVersion diff --git a/sconstruct b/sconstruct index 92f9608aa89..aac191d5e98 100755 --- a/sconstruct +++ b/sconstruct @@ -736,6 +736,6 @@ nvdaL10nUtil = env.Command( target=outputDir.File("nvdaL10nUtil.exe"), source="user_docs/nvdaL10nUtil.py", ENV=os.environ, - action=f"nuitka --assume-yes-for-downloads --remove-output --standalone --onefile --output-dir={outputDir.abspath} --include-module=mdx_truly_sane_lists --include-module=markdown_link_attr_modifier --include-module=mdx_gh_links user_docs/nvdaL10nUtil.py", + action=f"nuitka --assume-yes-for-downloads --remove-output --standalone --onefile --output-dir={outputDir.abspath} --include-module=mdx_truly_sane_lists --include-module=markdown_link_attr_modifier --include-module=mdx_gh_links user_docs/l10nUtil.py", ) env.Alias("nvdaL10nUtil", nvdaL10nUtil) diff --git a/user_docs/nvdaL10nUtil.py b/user_docs/l10nUtil.py similarity index 100% rename from user_docs/nvdaL10nUtil.py rename to user_docs/l10nUtil.py From 8ca273afd5264694cc6b811caa2d0d6aacaddba7 Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Fri, 4 Oct 2024 18:50:15 +1000 Subject: [PATCH 2/4] Update documetnation to reflect renaming of nvdaL10nUtil.exe to l10nUtil.exe --- projectDocs/translating/crowdin.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/projectDocs/translating/crowdin.md b/projectDocs/translating/crowdin.md index 8aff66e1143..6eb8c84c4f4 100644 --- a/projectDocs/translating/crowdin.md +++ b/projectDocs/translating/crowdin.md @@ -167,9 +167,9 @@ To translate any of these files: * Make sure to choose "Download" not "Export xliff". * Make a copy of this file. * Open the xliff file in Poedit, translate, and save the file. -* Use the nvdaL10nUtil program to strip the xliff so that it only contains translations that were added / changed. E.g. +* Use the NVDA l10nUtil program to strip the xliff so that it only contains translations that were added / changed. E.g. ``` -nvdaL10nUtil stripXliff -o +l10nUtil.exe stripXliff -o ``` * Upload the xliff file back to Crowdin. If it is a stripped xliff file, it is safe to check the `allow target to match source` checkbox. @@ -194,7 +194,7 @@ All strings for translation contain translator notes which include: ### Verifying your translation -When ever you have saved the xliff file with Poedit, you can use the nvdaL10nUtil program to generate the html version of the documentation file. E.g. +When ever you have saved the xliff file with Poedit, you can use the NVDA l10nUtil program to generate the html version of the documentation file. E.g. ``` -nvdaL10nUtil xliff2html -t [userGuide|changes|keyCommands] +l10nUtil.exe xliff2html -t [userGuide|changes|keyCommands] ``` From 6ab6a1bda6f2c720cd64ce09fa9094e606852f13 Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Fri, 4 Oct 2024 19:17:12 +1000 Subject: [PATCH 3/4] sconstruct: correctly rename target --- sconstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sconstruct b/sconstruct index aac191d5e98..48ad1d515d0 100755 --- a/sconstruct +++ b/sconstruct @@ -733,7 +733,7 @@ target = env.File(os.path.join(outputDir.abspath, "library_modules.txt")) env.Alias("moduleList", env.GenerateModuleList(target, source)) nvdaL10nUtil = env.Command( - target=outputDir.File("nvdaL10nUtil.exe"), + target=outputDir.File("l10nUtil.exe"), source="user_docs/nvdaL10nUtil.py", ENV=os.environ, action=f"nuitka --assume-yes-for-downloads --remove-output --standalone --onefile --output-dir={outputDir.abspath} --include-module=mdx_truly_sane_lists --include-module=markdown_link_attr_modifier --include-module=mdx_gh_links user_docs/l10nUtil.py", From 14816df9e8fd043799eb5b4bacbb4a27e5c7b0c4 Mon Sep 17 00:00:00 2001 From: Michael Curran Date: Fri, 4 Oct 2024 19:18:45 +1000 Subject: [PATCH 4/4] sconstruct: recorrectly rename source for l10nUtil --- sconstruct | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sconstruct b/sconstruct index 48ad1d515d0..f42666dfaf8 100755 --- a/sconstruct +++ b/sconstruct @@ -734,7 +734,7 @@ env.Alias("moduleList", env.GenerateModuleList(target, source)) nvdaL10nUtil = env.Command( target=outputDir.File("l10nUtil.exe"), - source="user_docs/nvdaL10nUtil.py", + source="user_docs/l10nUtil.py", ENV=os.environ, action=f"nuitka --assume-yes-for-downloads --remove-output --standalone --onefile --output-dir={outputDir.abspath} --include-module=mdx_truly_sane_lists --include-module=markdown_link_attr_modifier --include-module=mdx_gh_links user_docs/l10nUtil.py", )