X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flocale-setup.c;h=39b877cabeea3e78fcaea48330ec851404f6b8e0;hb=fe8954ab47b57703d2fb3116f5dbe389426e99bc;hp=055c1fa3f31b03104b5da17bd28734bdc6e97845;hpb=2fc9784656900c4dc3715db506096ddc23fdd87c;p=elogind.git

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 055c1fa3f..39b877cab 100644
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -54,7 +54,7 @@ static const char * const variable_names[_VARIABLE_MAX] = {
         [VARIABLE_LC_TIME] = "LC_TIME",
         [VARIABLE_LC_COLLATE] = "LC_COLLATE",
         [VARIABLE_LC_MONETARY] = "LC_MONETARY",
-        [VARIABLE_LC_MESSAGES] = "LC_MESSAGE",
+        [VARIABLE_LC_MESSAGES] = "LC_MESSAGES",
         [VARIABLE_LC_PAPER] = "LC_PAPER",
         [VARIABLE_LC_NAME] = "LC_NAME",
         [VARIABLE_LC_ADDRESS] = "LC_ADDRESS",
@@ -65,7 +65,7 @@ static const char * const variable_names[_VARIABLE_MAX] = {
 
 int locale_setup(void) {
         char *variables[_VARIABLE_MAX];
-        int r, i;
+        int r = 0, i;
 
         zero(variables);
 
@@ -139,7 +139,19 @@ int locale_setup(void) {
 #elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
         if (r <= 0 &&
             (r = parse_env_file("/etc/default/locale", NEWLINE,
-                                "LANG", &variables[VARIABLE_LANG],
+                                "LANG",              &variables[VARIABLE_LANG],
+                                "LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
+                                "LC_NUMERIC",        &variables[VARIABLE_LC_NUMERIC],
+                                "LC_TIME",           &variables[VARIABLE_LC_TIME],
+                                "LC_COLLATE",        &variables[VARIABLE_LC_COLLATE],
+                                "LC_MONETARY",       &variables[VARIABLE_LC_MONETARY],
+                                "LC_MESSAGES",       &variables[VARIABLE_LC_MESSAGES],
+                                "LC_PAPER",          &variables[VARIABLE_LC_PAPER],
+                                "LC_NAME",           &variables[VARIABLE_LC_NAME],
+                                "LC_ADDRESS",        &variables[VARIABLE_LC_ADDRESS],
+                                "LC_TELEPHONE",      &variables[VARIABLE_LC_TELEPHONE],
+                                "LC_MEASUREMENT",    &variables[VARIABLE_LC_MEASUREMENT],
+                                "LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION],
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)