Skip to content
This repository was archived by the owner on Apr 17, 2026. It is now read-only.

Update pot build command as per the one in NVDA's repo (update in PR NVDA/#15013)#106

Merged
seanbudd merged 2 commits into
nvaccess:masterfrom
CyrilleB79:fixBuildPot
Jun 27, 2023
Merged

Update pot build command as per the one in NVDA's repo (update in PR NVDA/#15013)#106
seanbudd merged 2 commits into
nvaccess:masterfrom
CyrilleB79:fixBuildPot

Conversation

@CyrilleB79

Copy link
Copy Markdown
Contributor

Issue

Today, the first version of NVDA including nvaccess/nvda#15013 has been merged to SVN. The translatable strings using ngettext appear in the nvda.po as expected. But the strings using npgettext ("%.1f lignes") don't.

Cause

In PR nvaccess/nvda#15013, the command to build the .pot file has been updated to be able to recognize npgettext as a function operating on translatable strings.
However, the nvda2svn script in the current repository does not use the .pot generated by NVDA's sconstruct; xgettext is called directly in the current repository instead. Thus the command in the nvda2svn script should match the one in NVDA's sconstruct. The change in NVDA's repository had not been duplicated here.

Solution

Update xgettext's parameters as per what was done in NVDA's repo to be able to detect ngettext as a function operating on translatable strings.

Testing

I have no way to test before merging this PR.

@seanbudd, could you test manually this branch on NVAccess server the result of nvda2svn script or merge this PR and trigger nvda2svn?

  • The string "%.1f lignes" should appear in the .pot file with a "msgid_plural" field.
  • Also the strings "category {categories}" and "with %s item" should still have the msgid_plural field (as today)

Comment thread .sh.d/01_nvda2svn.sh Outdated
@seanbudd seanbudd merged commit d36b3f9 into nvaccess:master Jun 27, 2023
@seanbudd

seanbudd commented Jun 27, 2023

Copy link
Copy Markdown
Member

All test steps appear successful

@CyrilleB79 CyrilleB79 deleted the fixBuildPot branch June 27, 2023 07:43
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants