GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 22:42:25 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #579 from evandroforks/fix_msgmerge_not_failing_on_error

Browse source 
Fix msgmerge not failing on error
This commit is contained in:
Damien Elmes 2020-04-27 19:05:27 +10:00 committed by GitHub
commit 3c36b7cf81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/checks.yml vendored
View file

@ -64,6 +64,9 @@ jobs:
# https://stackoverflow.com/questions/43175529/updating-make-version-4-1-on-mac # https://stackoverflow.com/questions/43175529/updating-make-version-4-1-on-mac
echo "::set-env name=PATH::/usr/local/opt/make/libexec/gnubin:$PATH" echo "::set-env name=PATH::/usr/local/opt/make/libexec/gnubin:$PATH"
# https://stackoverflow.com/questions/59644349/msgmerge-on-macos-catalina
echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
- name: Configure Windows environment variables - name: Configure Windows environment variables
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
run: | run: |
@ -213,7 +216,6 @@ jobs:
run: | run: |
set -x set -x
brew install portaudio protobuf gettext ripgrep make brew install portaudio protobuf gettext ripgrep make
brew link gettext --force
- name: Set up python - name: Set up python
uses: actions/setup-python@v1 uses: actions/setup-python@v1

7
qt/po/scripts/build-mo-files
View file

@ -15,7 +15,8 @@ do
perl -pe "s%repo/desktop/(.*)/anki.po%$targetDir/\1/LC_MESSAGES%") perl -pe "s%repo/desktop/(.*)/anki.po%$targetDir/\1/LC_MESSAGES%")
outfile="$outdir/anki.mo" outfile="$outdir/anki.mo"
mkdir -p $outdir mkdir -p $outdir
(msgmerge -q "$file" repo/desktop/anki.pot | msgfmt - --output-file="$outfile") || ( if ! msgmerge -q "$file" repo/desktop/anki.pot | msgfmt - --output-file="$outfile"; then
echo "error building $file" echo "error building $file";
) exit 1;
fi;
done done