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

cinnamon.cinnamon-control-center: Fix some localization issues #199139

Merged
merged 1 commit into from
Nov 2, 2022

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Nov 2, 2022

Description of changes

cinnamon-settings is a weird app, some of the modules are actually loaded from the external cinnamon-control-center app (which is a forked gnome-control-center but most users never directly opens it), so to fix translations sometimes you need to fix there.

We do pass localedir to cinnamon-control-center, but cinnamon-control-center does not always respect this and what they do is:

bindtextdomain (GETTEXT_PACKAGE, "/usr/share/locale");

The situation is still better than the previous Pantheon, though, and we can resolve most issues by simply sed all the paths so I am doing it here. Making proper fix on upstream is possible but I don't have the time so far, note that is still a little different from Pantheon since cinnamon-control-center does not contain the translations itself and again it is loaded from external packages 😴

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@bobby285271 bobby285271 requested a review from mkg20001 as a code owner November 2, 2022 10:23
@github-actions github-actions bot added the 6.topic: cinnamon Desktop environment label Nov 2, 2022
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Nov 2, 2022
@bobby285271 bobby285271 merged commit 50e75b7 into NixOS:master Nov 2, 2022
@bobby285271 bobby285271 deleted the cinnamon branch November 2, 2022 11:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cinnamon Desktop environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

1 participant