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

fix(check-desktop-strings): order, logging, Focal/bullseye compatibility #7008

Merged
merged 4 commits into from Oct 16, 2023

Conversation

cfm
Copy link
Member

@cfm cfm commented Oct 16, 2023

Status

Ready for review

Description of Changes

Testing

  • CI lint should, indeed, pass for the translations in develop after Translations update from Weblate #6984.

  • Optional: Locally confirm the expected behavior for current translations:

    (.venv) user@sd-dev:~/securedrop$ make check-desktop-files
    ███ Checking desktop translation catalogs...
    make[2]: Nothing to be done for 'install_files/ansible-base/roles/tails-config/templates/ssh_config.j2'.
    (.venv) user@sd-dev:~/securedrop$ securedrop/bin-dev-shell^C
    (.venv) user@sd-dev:~/securedrop$ securedrop/bin/dev-shell make -C .. check-desktop-files
    [...]
    make: Entering directory '/home/user/securedrop'
    ███ Checking desktop translation catalogs...
    make[2]: Nothing to be done for 'install_files/ansible-base/roles/tails-config/templates/ssh_config.j2'.
    make: Leaving directory '/home/user/securedrop'
  • Optional: Locally confirm the expected behavior on future translations:

    (.venv) user@sd-dev:~/securedrop$ head install_files/ansible-base/roles/tails-config/templates/locale/LINGUAS > install_files/ansible-base/roles/tails-config/templates/locale/LINGUAS 
    (.venv) user@sd-dev:~/securedrop$ make check-desktop-files
    ███ Checking desktop translation catalogs...
    make[2]: Nothing to be done for 'install_files/ansible-base/roles/tails-config/templates/ssh_config.j2'.
    Desktop files are out of date. Please run "make update-desktop-files" and commit the changes.
    make: *** [Makefile:388: check-desktop-files] Error 1
    (.venv) user@sd-dev:~/securedrop$ securedrop/bin/dev-shell make -C .. check-desktop-files
    make: Entering directory '/home/user/securedrop'
    ███ Checking desktop translation catalogs...
    make[2]: Nothing to be done for 'install_files/ansible-base/roles/tails-config/templates/ssh_config.j2'.
    Desktop files are out of date. Please run "make update-desktop-files" and commit the changes.
    make: *** [Makefile:388: check-desktop-files] Error 1
    make: Leaving directory '/home/user/securedrop'

Deployment

Tooling-only; no deployment considerations.

zenmonkeykstop and others added 3 commits October 16, 2023 10:18
…t 0.21 behavior

Fixes #7007.  Beginning in gettext 0.21---specifically, as of
autotools-mirror/gettext@1c9b721---xgettext and (of interest to us)
msgfmt do not localize the "Icon" keyword.  That's fine, indeed
preferable, for our purposes.  But since Ubuntu Focal only has gettext
0.19, where they do, we need to pass an explicit "--keyword=Name" here
to get consistent output across platforms.
@cfm cfm added this to the SecureDrop 2.7.0 milestone Oct 16, 2023
@cfm cfm requested a review from a team as a code owner October 16, 2023 22:00
@legoktm legoktm self-assigned this Oct 16, 2023
legoktm
legoktm previously approved these changes Oct 16, 2023
Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test plan checks out, so LGTM. Not merging in case you want to do #7007 (comment) and fold that into this PR. (But if that's separate/merits further discussion, that's fine too IMO).

@cfm
Copy link
Member Author

cfm commented Oct 16, 2023

We've gone back and forth enough already that I might as well include it here. :-) Let me know what you think of 60f8afb.

Copy link
Member

@legoktm legoktm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect, thanks :) Will merge once CI passes!

@legoktm legoktm merged commit 8545296 into develop Oct 16, 2023
12 checks passed
@legoktm legoktm deleted the test-strings-lint branch October 16, 2023 23:41
@cfm cfm mentioned this pull request Oct 19, 2023
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

CI Lint check failing because check-desktop-files always fails in CircleCI.
3 participants