diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-08-31 14:09:14 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-08-31 14:10:50 +0200 |
| commit | 07bceef2a9c520e24da427c7ce500ad36ad37571 (patch) | |
| tree | 4594865c29d0742e9d4d262d45e501fabfe26e9a /src | |
| parent | 4dc380d16dfbead78de9caaf5104dbc00bac6d75 (diff) | |
locale: support $LANGUAGE too
$LANGUAGE is a GNU extension that is probably worth supporting, since it
allows specifiying an order of languages.
https://bugs.freedesktop.org/show_bug.cgi?id=40510
Diffstat (limited to 'src')
| -rw-r--r-- | src/locale-setup.c | 8 | ||||
| -rw-r--r-- | src/localed.c | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c index 33111da218..41eb50bbba 100644 --- a/src/locale-setup.c +++ b/src/locale-setup.c @@ -32,6 +32,7 @@ enum { * using LANG instead. */ VARIABLE_LANG, + VARIABLE_LANGUAGE, VARIABLE_LC_CTYPE, VARIABLE_LC_NUMERIC, VARIABLE_LC_TIME, @@ -49,6 +50,7 @@ enum { static const char * const variable_names[_VARIABLE_MAX] = { [VARIABLE_LANG] = "LANG", + [VARIABLE_LANGUAGE] = "LANGUAGE", [VARIABLE_LC_CTYPE] = "LC_CTYPE", [VARIABLE_LC_NUMERIC] = "LC_NUMERIC", [VARIABLE_LC_TIME] = "LC_TIME", @@ -75,6 +77,7 @@ int locale_setup(void) { "LANG", &variables[VARIABLE_LANG], #endif "locale.LANG", &variables[VARIABLE_LANG], + "locale.LANGUAGE", &variables[VARIABLE_LANGUAGE], "locale.LC_CTYPE", &variables[VARIABLE_LC_CTYPE], "locale.LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC], "locale.LC_TIME", &variables[VARIABLE_LC_TIME], @@ -98,6 +101,7 @@ int locale_setup(void) { if (r <= 0 && (r = parse_env_file("/etc/locale.conf", NEWLINE, "LANG", &variables[VARIABLE_LANG], + "LANGUAGE", &variables[VARIABLE_LANGUAGE], "LC_CTYPE", &variables[VARIABLE_LC_CTYPE], "LC_NUMERIC", &variables[VARIABLE_LC_NUMERIC], "LC_TIME", &variables[VARIABLE_LC_TIME], @@ -212,8 +216,8 @@ int locale_setup(void) { "LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION], NULL)) < 0) { - if (r != -ENOENT) - log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); + if (r != -ENOENT) + log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); } #endif diff --git a/src/localed.c b/src/localed.c index cb8acf2079..d7dcc9e95b 100644 --- a/src/localed.c +++ b/src/localed.c @@ -59,6 +59,7 @@ enum { * using LANG instead. */ PROP_LANG, + PROP_LANGUAGE, PROP_LC_CTYPE, PROP_LC_NUMERIC, PROP_LC_TIME, @@ -76,6 +77,7 @@ enum { static const char * const names[_PROP_MAX] = { [PROP_LANG] = "LANG", + [PROP_LANGUAGE] = "LANGUAGE", [PROP_LC_CTYPE] = "LC_CTYPE", [PROP_LC_NUMERIC] = "LC_NUMERIC", [PROP_LC_TIME] = "LC_TIME", @@ -132,6 +134,7 @@ static int read_data(void) { r = parse_env_file("/etc/locale.conf", NEWLINE, "LANG", &data[PROP_LANG], + "LANGUAGE", &data[PROP_LANGUAGE], "LC_CTYPE", &data[PROP_LC_CTYPE], "LC_NUMERIC", &data[PROP_LC_NUMERIC], "LC_TIME", &data[PROP_LC_TIME], |