Merge #180368: nixos/i18n: normalise locale names
This commit is contained in:
commit
7fbdf335d8
|
@ -53,16 +53,16 @@ with lib;
|
|||
|
||||
supportedLocales = mkOption {
|
||||
type = types.listOf types.str;
|
||||
default = builtins.map (l: l + "/UTF-8")
|
||||
(unique (
|
||||
default = unique
|
||||
(builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (
|
||||
[
|
||||
"C.UTF-8"
|
||||
config.i18n.defaultLocale
|
||||
] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings))
|
||||
));
|
||||
defaultText = literalExpression ''
|
||||
builtins.map (l: l + "/UTF-8")
|
||||
(unique (
|
||||
unique
|
||||
(builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") (
|
||||
[
|
||||
"C.UTF-8"
|
||||
config.i18n.defaultLocale
|
||||
|
|
Loading…
Reference in a new issue