From 43c23270a675652866cd703bd828a48a6da2410a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamila=20=C5=81opusza=C5=84ska?= Date: Wed, 2 Jul 2025 14:32:07 +0200 Subject: [PATCH] migrate locale from en_US.UTF-8 to C.UTF-8 --- .gitlab-ci.yml | 5 ++--- test/test-client.vala | 7 +------ test/test-engine.vala | 7 +------ test/test-js.vala | 7 +------ 4 files changed, 5 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e00ab09a..576c0f5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,9 +10,8 @@ variables: # See Infrastructure/Infrastructure#97. TEST_ARGS: -t 10 - # Locale used for unit tests. See notes in test/test-engine.vala and - # test/test-client.vala. - TEST_LOCALE: en_US.UTF-8 + # Locale used for unit tests + TEST_LOCALE: C.UTF-8 # Build BUILD_DIR: build diff --git a/test/test-client.vala b/test/test-client.vala index cef97674..af80942f 100644 --- a/test/test-client.vala +++ b/test/test-client.vala @@ -22,12 +22,7 @@ int main(string[] args) { * Initialise all the things. */ - // Ensure things like e.g. GLib's formatting routines uses a - // well-known UTF-8-based locale rather ASCII. Would like to use - // C.UTF-8 here, but currently only Debian et al and Fedora ship - // it, and as of Fedora 32 they disagree on collation order for - // non-ASCII chars. - GLib.Intl.setlocale(LocaleCategory.ALL, "en_US.UTF-8"); + GLib.Intl.setlocale(LocaleCategory.ALL, "C.UTF-8"); Gtk.init(ref args); Test.init(ref args); diff --git a/test/test-engine.vala b/test/test-engine.vala index e829b0bf..699683b6 100644 --- a/test/test-engine.vala +++ b/test/test-engine.vala @@ -10,12 +10,7 @@ int main(string[] args) { * Initialise all the things. */ - // Ensure things like e.g. GLib's formatting routines uses a - // well-known UTF-8-based locale rather ASCII. Would like to use - // C.UTF-8 here, but currently only Debian et al and Fedora ship - // it, and as of Fedora 32 they disagree on collation order for - // non-ASCII chars. - GLib.Intl.setlocale(LocaleCategory.ALL, "en_US.UTF-8"); + GLib.Intl.setlocale(LocaleCategory.ALL, "C.UTF-8"); Test.init(ref args); diff --git a/test/test-js.vala b/test/test-js.vala index 998ff10c..20388d92 100644 --- a/test/test-js.vala +++ b/test/test-js.vala @@ -22,12 +22,7 @@ int main(string[] args) { * Initialise all the things. */ - // Ensure things like e.g. GLib's formatting routines uses a - // well-known UTF-8-based locale rather ASCII. Would like to use - // C.UTF-8 here, but currently only Debian et al and Fedora ship - // it, and as of Fedora 32 they disagree on collation order for - // non-ASCII chars. - GLib.Intl.setlocale(LocaleCategory.ALL, "en_US.UTF-8"); + GLib.Intl.setlocale(LocaleCategory.ALL, "C.UTF-8"); Gtk.init(ref args); Test.init(ref args);