From 53341c70fcb8888b040230e28bbe5deb1b1773ce Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 26 Sep 2020 11:45:57 +0100 Subject: Change the locale codeset representation From the normalized one, to the one actually contained within glibc. Recent versions of glibc also contain symlinks linking the normalized codeset to the locales with the .UTF-8 ending, but older ones do not. Maybe handling codeset normalisation for queries would be good, but the locale values ending in .UTF-8 are more compatible and allow the code to be simplified. For querying, maybe there should be a locales table which handles different representations. --- tests/model-package-metadata.scm | 4 ++-- tests/model-package.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/model-package-metadata.scm b/tests/model-package-metadata.scm index 2b97465..2e67233 100644 --- a/tests/model-package-metadata.scm +++ b/tests/model-package-metadata.scm @@ -43,8 +43,8 @@ ((guix-data-service model package-metadata) inferior-packages->translated-package-descriptions-and-synopsis (lambda (inferior inferior-package) - (cons `(("en_US.utf8" . "Fake synopsis")) - `(("en_US.utf8" . "Fake description"))))) + (cons `(("en_US.UTF-8" . "Fake synopsis")) + `(("en_US.UTF-8" . "Fake description"))))) (with-mock-inferior-packages (lambda () (use-modules (guix-data-service model package) diff --git a/tests/model-package.scm b/tests/model-package.scm index 3999230..e953645 100644 --- a/tests/model-package.scm +++ b/tests/model-package.scm @@ -49,8 +49,8 @@ ((guix-data-service model package-metadata) inferior-packages->translated-package-descriptions-and-synopsis (lambda (inferior inferior-package) - (cons `(("en_US.utf8" . "Fake synopsis")) - `(("en_US.utf8" . "Fake description"))))) + (cons `(("en_US.UTF-8" . "Fake synopsis")) + `(("en_US.UTF-8" . "Fake description"))))) (with-mock-inferior-packages (lambda () (use-modules (guix-data-service model package) -- cgit v1.2.3