]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
login: move getlogindefs_num() after localization init
authorSami Kerola <kerolasa@iki.fi>
Thu, 12 Nov 2020 23:44:55 +0000 (23:44 +0000)
committerSami Kerola <kerolasa@iki.fi>
Thu, 3 Dec 2020 20:06:51 +0000 (20:06 +0000)
There are translations in getlogindefs_num() and they will not take effect
unless the function call is after the setlocale(), bindtextdomain(), and
textdomain().

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
login-utils/login.c

index b15b0ee18e4ed04cb734ac750915d37f70fd0eec..11d1afd49311047466cf08f2e7ceabb029e2dc74 100644 (file)
@@ -1284,12 +1284,12 @@ int main(int argc, char **argv)
                {NULL, 0, NULL, 0}
        };
 
-       timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
-
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
 
+       timeout = (unsigned int)getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
+
        /* TRANSLATORS: The standard value for %u is 60. */
        xasprintf(&timeout_msg, _("%s: timed out after %u seconds"),
                                  program_invocation_short_name, timeout);