Skip to content

Commit 6bc7842

Browse files
committed
Fix more situations
1 parent 1663424 commit 6bc7842

13 files changed

Lines changed: 14 additions & 19 deletions

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!---
22
Include a few sentences describing the overall goals for this Pull Request.
3-
3+
44
A list of issues is at https://github.com/qgis/QGIS-Documentation/issues.
55
Add "fix #issuenumber" for each issue the PR fixes. The ticket(s) will be closed automatically.
66
If your PR doesn't fix entirely the ticket, only add the ticket(s) reference preceded by # character.

.github/workflows/builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ concurrency:
44
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
55
cancel-in-progress: true
66

7-
on:
7+
on:
88
push:
99
paths-ignore:
1010
- 'locale/**'

.github/workflows/doctest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
registry-1.docker.io:443
4545
nbg1.your-objectstorage.com:443
4646
security.ubuntu.com:80
47-
47+
4848
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4949
with:
5050
fetch-depth: 1

.github/workflows/pofiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
# Remove obsolete strings from the generated *.po files
5757
find locale/en/LC_MESSAGES/ -type f -name '*.po' -exec sed -i '/^#~ /,/^$/d' {} \;
5858
59-
- name: Commit the changes in the PO files
59+
- name: Commit the changes in the PO files
6060
id: "auto-commit-action"
6161
uses: stefanzweifel/git-auto-commit-action@04702edda442b2e678b25b537cec683a1493fcb9 # v7.1.0
6262
with:

.github/workflows/translation_statistics.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Translation statistics
22
# Pull statistics of translation in Transifex
33

4-
on:
4+
on:
55
schedule:
66
# runs tuesday at 6:00 UTC
77
- cron: '0 6 * * 2'

.mailmap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Arnaud Morvan <arnaud.morvan@camptocamp.com> arnaud.morvan@camptocamp.com <arna
2929

3030
Ayodele Adeyemo <christad92@gmail.com> christad92 <christad92@gmail.com>
3131

32-
Báthory Péter <bathory86p@gmail.com> Péter Báthory <peter.bathory@cartographia.hu>
32+
Báthory Péter <bathory86p@gmail.com> Péter Báthory <peter.bathory@cartographia.hu>
3333

3434
Benoit De Mezzo <benoit.de.mezzo@oslandia.com> bdm-oslandia <benoit.de.mezzo@oslandia.com>
3535
Benoit De Mezzo <benoit.de.mezzo@oslandia.com> benoitdm-oslandia <64401067+benoitdm-oslandia@users.noreply.github.com>
@@ -180,7 +180,7 @@ Patrice Pineault <TurboGraphxBeige@runbox.com> TurboGraphxBeige <TurboGraphxBei
180180
Paul Blottiere <blottiere.paul@gmail.com> Blottiere Paul <blottiere.paul@gmail.com>
181181

182182
Philip Albrecht <albrecht@gbd-consult.de> PhilipAlbrecht <45685457+PhilipAlbrecht@users.noreply.github.com>
183-
Philip Albrecht <albrecht@gbd-consult.de> albrecht <albrecht@gbd-consult.de>
183+
Philip Albrecht <albrecht@gbd-consult.de> albrecht <albrecht@gbd-consult.de>
184184

185185
Régis Haubourg <regis@qgis.org> Régis Haubourg <1629853+haubourg@users.noreply.github.com>
186186
Régis Haubourg <regis@qgis.org> Régis Haubourg <regis.haubourg@oslandia.com>

.tx/config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[main]
22
host = https://app.transifex.com
33
lang_map = zh-Hant: zh_Hant, zh-Hans: zh_Hans
4-

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ site: html zip
9797

9898
full: html zip
9999
make LANG=$(LANG) pdf;
100-
100+
101101
# this will build ALL languages, AND tries to rsync them to the web dir on qgis2
102102
# to be able to run this you will need a key on the server
103103
all: springclean
@@ -141,4 +141,3 @@ doctest:
141141
linkcheck:
142142
$(SPHINXBUILD) -b linkcheck $(SOURCEDIR) $(BUILDDIR)/linkcheck
143143
@echo "Check finished. Report is in $(BUILDDIR)/linkcheck/output.txt."
144-

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ make -f venv.mk cleanall
9191
### Fixing build locale error on macOS
9292

9393
When the build on macOS fails with:
94-
94+
9595
```sh
9696
locale.Error: unsupported locale setting
9797
make: *** [html] Error 1
@@ -228,7 +228,7 @@ and some custom scripts:
228228
```
229229
---
230230

231-
* The transifex integration bot:
231+
* The transifex integration bot:
232232
manages pulls and pushes of the strings, in other words:
233233
- Tracks any changes of the English `*.po` resource files in GitHub
234234
and automatically sends them to the Transifex platform
@@ -357,4 +357,3 @@ which does not appear in documentation with directive ``testsetup``, for example
357357

358358
For more information see *Sphinx* doctest extension documentation:
359359
https://www.sphinx-doc.org/en/master/usage/extensions/doctest.html
360-

clean.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ rm -rf .vscode-extensions
66
rm -rf __pycache__
77
cd ..
88
cd -
9-

0 commit comments

Comments
 (0)