Skip to content

Move CLDR data from /lib/gettext to /share/cldr #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlocati merged 1 commit into from
Jan 21, 2026
Merged

Move CLDR data from /lib/gettext to /share/cldr #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,13 +261,13 @@ jobs:
name: Extract CLDR
run: |
unzip -p src/downloads/cldr-${{ steps.vars.outputs.cldr-version }}.zip LICENSE > installed/licenses/cldr.txt
mkdir -p installed/lib/gettext/common/supplemental
unzip -p src/downloads/cldr-${{ steps.vars.outputs.cldr-version }}.zip common/supplemental/plurals.xml >installed/lib/gettext/common/supplemental/plurals.xml
mkdir -p installed/share/cldr/common/supplemental
unzip -p src/downloads/cldr-${{ steps.vars.outputs.cldr-version }}.zip common/supplemental/plurals.xml >installed/share/cldr/common/supplemental/plurals.xml
-
name: Simplify CLDR plurals.xml
if: steps.vars.outputs.simplify-plurals-xml == 'yes'
shell: pwsh
run: ./build-exe/simplify-plurals-xml.ps1 installed/lib/gettext/common/supplemental/plurals.xml
run: ./build-exe/simplify-plurals-xml.ps1 installed/share/cldr/common/supplemental/plurals.xml
-
name: Extract iconv
run: |
Expand Down Expand Up @@ -549,7 +549,7 @@ jobs:
}
Write-Output -InputObject "As expected, without GETTEXTCLDRDIR there isn't a Plural-Forms header in the .po file for the locale $lang."

$env:GETTEXTCLDRDIR = "$PWD\files-unsigned\lib\gettext"
$env:GETTEXTCLDRDIR = "$PWD\files-unsigned\share\cldr"
$po = $pot | & .\files-unsigned\bin\msginit.exe --input=- --output-file=- --locale="$lang"
$rule = $po -match "Plural-Forms:"
if ('${{ steps.vars.outputs.cldr-plural-works }}' -eq 'yes') {
Expand Down
2 changes: 1 addition & 1 deletion build-exe/create-installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end;

function EnvCLDRDir(): String;
begin
Result := ExpandConstant('{app}\lib\gettext');
Result := ExpandConstant('{app}\share\cldr');
end;


Expand Down
4 changes: 2 additions & 2 deletions build-exe/create-output.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ fi
if [ -f "$SOURCE/share/gettext/msgunfmt.tcl" ]; then
copyFile "$SOURCE/share/gettext/msgunfmt.tcl"
fi
if [ -f "$SOURCE/lib/gettext/common/supplemental/plurals.xml" ]; then
copyFile "$SOURCE/lib/gettext/common/supplemental/plurals.xml"
if [ -f "$SOURCE/share/cldr/common/supplemental/plurals.xml" ]; then
copyFile "$SOURCE/share/cldr/common/supplemental/plurals.xml"
fi
echo '::endgroup::'

Expand Down