Skip to content
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.

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

Appdata and translation related patches #220

Merged
merged 5 commits into from Jan 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,20 @@ jobs:

meson-build-test:
runs-on: ubuntu-latest
container:
# Use Ubuntu 23.04 in order to have appstreamcli v0.16 instead of 0.15.
image: ubuntu:23.04
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.8'
- run: sudo apt-get -y install meson appstream desktop-file-utils gettext
- run: pip install meson ninja
# Extra installation since we are not using ubuntu-latest
- run: apt-get update && apt-get -y install libglib2.0-dev-bin
- run: apt-get -y install meson appstream desktop-file-utils gettext
- run: meson setup build
- run: meson compile -C build
- run: meson test -C build
- run: meson test --print-errorlogs -C build

flatpak-build-test:
runs-on: ubuntu-latest
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Flatpak manifest now runs the tests (@sabriunal)
- Use `appstreamcli` instead of the deprecated `appstream-util` to validate
appdata (@sabriunal)
- Update appdata: add translation tag, vcs-browser and translate URLs (@sabriunal)
- Translation: mark the developer name and release descriptions as
untranslatable (@sabriunal)
- Translation: update Turkish translation (@sabriunal)

### Removed

Expand Down
32 changes: 17 additions & 15 deletions data/io.github.mightycreak.Diffuse.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@
<project_license>GPL-2.0-or-later</project_license>
<content_rating type="oars-1.1"/>
<launchable type="desktop-id">io.github.mightycreak.Diffuse.desktop</launchable>
<translation type="gettext">diffuse</translation>
<url type="homepage">https://mightycreak.github.io/diffuse/</url>
<url type="bugtracker">https://github.com/MightyCreak/diffuse/issues</url>
<url type="vcs-browser">https://github.com/MightyCreak/diffuse</url>
<url type="translate">https://github.com/MightyCreak/diffuse/blob/main/docs/translators.md</url>

<screenshots>
<screenshot type="default">
Expand All @@ -33,13 +36,12 @@
</screenshot>
</screenshots>

<!-- Translators: no need to translate after this comment -->
<developer_name>Romain Failliot</developer_name>
<developer_name translatable="no">Romain Failliot</developer_name>
<update_contact>[email protected]</update_contact>

<releases>
<release version="0.8.2" date="2023-04-16">
<description>
<description translatable="no">
<p>Use more modern, symbolic icons, add Dutch translation, and a couple of small fixes.</p>
<p>Added:</p>
<ul>
Expand All @@ -62,7 +64,7 @@
</description>
</release>
<release version="0.8.1" date="2023-04-07">
<description>
<description translatable="no">
<p>
Fix for the shortcuts that weren't working anymore due to migration to Gtk.Application.
</p>
Expand All @@ -82,7 +84,7 @@
</description>
</release>
<release version="0.8.0" date="2023-04-03">
<description>
<description translatable="no">
<p>
Update to GNOME 44, improved GTK 3 support, initial support for Rust, added Turkish and
Georgian translations, and a couple of fixes.
Expand Down Expand Up @@ -119,7 +121,7 @@
</description>
</release>
<release version="0.7.7" date="2022-10-23">
<description>
<description translatable="no">
<p>
Update translations.
</p>
Expand All @@ -132,7 +134,7 @@
</description>
</release>
<release version="0.7.6" date="2022-10-23">
<description>
<description translatable="no">
<p>
Add port to Mac OS.
</p>
Expand All @@ -153,7 +155,7 @@
</description>
</release>
<release version="0.7.5" date="2022-04-15">
<description>
<description translatable="no">
<p>
Crashfix and French translation.
</p>
Expand All @@ -170,7 +172,7 @@
</description>
</release>
<release version="0.7.4" date="2022-04-03">
<description>
<description translatable="no">
<p>
Mainly a maintenance release. It does increase the GNOME SDK's version.
</p>
Expand Down Expand Up @@ -204,7 +206,7 @@
</description>
</release>
<release version="0.7.3" date="2021-11-22">
<description>
<description translatable="no">
<p>
Patch release that introduces linters (flake8 and mypy).
</p>
Expand All @@ -229,7 +231,7 @@
</description>
</release>
<release version="0.7.2" date="2021-11-18">
<description>
<description translatable="no">
<p>
Patch release that fixes an error about APP_NAME and the Brazilian translation.
</p>
Expand Down Expand Up @@ -257,7 +259,7 @@
</description>
</release>
<release version="0.7.1" date="2021-11-17">
<description>
<description translatable="no">
<p>
Patch release to fix a bug when using the Flatpak package.
</p>
Expand All @@ -271,7 +273,7 @@
</description>
</release>
<release version="0.7.0" date="2021-11-16">
<description>
<description translatable="no">
<p>
With this release, the main end-user change is the new icon. The rest
is mainly maintenance improvements with a much more standard folder
Expand Down Expand Up @@ -310,7 +312,7 @@
</description>
</release>
<release version="0.6.0" date="2020-11-29">
<description>
<description translatable="no">
<p>
Mainly under the hood changes in this release, so nothing really
visible to the users in this version. That said, I figured it was a
Expand All @@ -335,7 +337,7 @@
</description>
</release>
<release version="0.5.0" date="2020-07-18">
<description>
<description translatable="no">
<p>
Here is the v0.5.0. Unintentionally, this release happens exactly 6
years after the previous v0.4.8 release!
Expand Down
6 changes: 0 additions & 6 deletions docs/translators.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ repo root:
xgettext -w 84 -o po/diffuse.pot -f po/POTFILES
```

Regenerating the POT file will add a bunch of new lines coming from
`data/io.github.mightycreak.Diffuse.appdata.xml.in`. Not all the lines need to
be translated in this file. In `diffuse.pot`, look for the comment
`Translators: no need to translate after this comment`, and remove all the
added lines for this file.

_Note:_ why 84 characters, you ask? because the usage text has to be 80-char
wide, plus the beginning and ending `"` and the final `\n` (which is two
characters).
Expand Down
Loading