aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-01-16 15:40:10 +0100
committerLudovic Courtès <ludo@gnu.org>2015-01-16 21:11:55 +0100
commit24004073f06ed0e79c39c5deed9f859e0fb7971e (patch)
treebd20699b484312c188dcbc508df7110da7d111e0
parent8f4b1dfb77f01ee97263ea4d0dfd3c715ded527c (diff)
downloadguix-24004073f06ed0e79c39c5deed9f859e0fb7971e.tar
guix-24004073f06ed0e79c39c5deed9f859e0fb7971e.tar.gz
system: Add "en_US.UTF-8" to the default locales, for backward compatibility.
* gnu/system/locale.scm (%default-locale-definitions): Add "en_US.UTF-8".
-rw-r--r--gnu/system/locale.scm73
1 files changed, 39 insertions, 34 deletions
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index 17b1dead58..be9abcb81d 100644
--- a/gnu/system/locale.scm
+++ b/gnu/system/locale.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2015 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -89,38 +89,43 @@
(utf8-locales (syntax-rules ()
((_ name ...)
(list (utf8-locale name) ...)))))
- (utf8-locales "ca_ES"
- "cs_CZ"
- "da_DK"
- "de_DE"
- "el_GR"
- "en_AU"
- "en_CA"
- "en_GB"
- "en_US"
- "es_AR"
- "es_CL"
- "es_ES"
- "es_MX"
- "fi_FI"
- "fr_BE"
- "fr_CA"
- "fr_CH"
- "fr_FR"
- "ga_IE"
- "it_IT"
- "ja_JP"
- "ko_KR"
- "nb_NO"
- "nl_NL"
- "pl_PL"
- "pt_PT"
- "ro_RO"
- "ru_RU"
- "sv_SE"
- "tr_TR"
- "uk_UA"
- "vi_VN"
- "zh_CN")))
+ ;; Add "en_US.UTF-8" for compatibility with Guix 0.8.
+ (cons (locale-definition
+ (name "en_US.UTF-8")
+ (source "en_US")
+ (charset "UTF-8"))
+ (utf8-locales "ca_ES"
+ "cs_CZ"
+ "da_DK"
+ "de_DE"
+ "el_GR"
+ "en_AU"
+ "en_CA"
+ "en_GB"
+ "en_US"
+ "es_AR"
+ "es_CL"
+ "es_ES"
+ "es_MX"
+ "fi_FI"
+ "fr_BE"
+ "fr_CA"
+ "fr_CH"
+ "fr_FR"
+ "ga_IE"
+ "it_IT"
+ "ja_JP"
+ "ko_KR"
+ "nb_NO"
+ "nl_NL"
+ "pl_PL"
+ "pt_PT"
+ "ro_RO"
+ "ru_RU"
+ "sv_SE"
+ "tr_TR"
+ "uk_UA"
+ "vi_VN"
+ "zh_CN"))))
;;; locale.scm ends here