movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

nixos/i18n: support "all" for extraLocales (#403567)

Browse source
This commit is contained in:
Doron Behar 2025-05-03 20:31:00 +03:00 • committed by GitHub
commit 01e6f1370c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nixos/modules/config/i18n.nix
View file

@ -6,13 +6,15 @@
}: }:
let let
aggregatedLocales = aggregatedLocales =
builtins.map (builtins.map
(l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8")
( (
[ config.i18n.defaultLocale ] [ config.i18n.defaultLocale ]
++ config.i18n.extraLocales ++ (lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales)
++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
); )
)
++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales);
in in
{ {
###### interface ###### interface
@ -53,13 +55,14 @@ in
}; };
extraLocales = lib.mkOption { extraLocales = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.either (lib.types.listOf lib.types.str) (lib.types.enum [ "all" ]);
default = [ ]; default = [ ];
example = [ "nl_NL.UTF-8" ]; example = [ "nl_NL.UTF-8" ];
description = '' description = ''
Additional locales that the system should support, besides the ones Additional locales that the system should support, besides the ones
configured with {option}`i18n.defaultLocale` and configured with {option}`i18n.defaultLocale` and
{option}`i18n.extraLocaleSettings`. {option}`i18n.extraLocaleSettings`.
Set this to `"all"` to install all available locales.
''; '';
}; };
@ -108,7 +111,13 @@ in
config = { config = {
warnings = warnings =
lib.optional ((lib.subtractLists config.i18n.supportedLocales aggregatedLocales) != [ ]) lib.optional
(
!(
(lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ]
|| lib.any (x: x == "all") config.i18n.supportedLocales
)
)
'' ''
`i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`, `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`,
and it seems you are using `i18n.supportedLocales` and forgot to and it seems you are using `i18n.supportedLocales` and forgot to