fix setting locale when none is specified in config

diff --git a/CHANGES b/CHANGES
index ca1ecf5a8da89e6df2963529ee23fad162c7e12a..004daec03eba183a5a8b942319a3df908cf926d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,7 @@
    of command execution
  - Fix: Live traffic meter occasionally showing higher minimum than average
    in end statistics (Debian Bug #687812)
+ - Fix: Setting locale when none is specified in config (Debian Bug #606397)
  - Fix: Cppcheck findings (may fix Debian Bug #692330)
  - Improve traffic meter output accuracy
  - Add tests and debug compilation target

diff --git a/man/vnstat.conf.5 b/man/vnstat.conf.5
index 5cd7b45903a91e7849a7ffa3035fc4f5307d4add..10be80a52c1cd30553e2289eef3ceb51d0b82994 100644 (file)
--- a/man/vnstat.conf.5
+++ b/man/vnstat.conf.5
@@ -58,8 +58,8 @@ the command line. (vnstat and vnstati only)
 .TP
 .BI Locale
 Locale setting to be used for prints. This replaces the LC_ALL
-environment variable. Set to "-" in order to use the system default
-value. (vnstat and vnstati only)
+environment variable. Set to "-" or leave empty in order to use the
+system default value. (vnstat and vnstati only)
 
 .TP
 .BI MaxBandwidth

diff --git a/src/vnstat.c b/src/vnstat.c
index bcb24d5a0e25db40ffce23b5ed1f07da759a1e7e..25b3ac0a4209dab3c9e79fb355f1df914b54491a 100644 (file)
--- a/src/vnstat.c
+++ b/src/vnstat.c
@@ -65,6 +65,8 @@ int main(int argc, char *argv[]) {
        } else {
                if (getenv("LC_ALL")) {
                        setlocale(LC_ALL, getenv("LC_ALL"));
+               } else {
+                       setlocale(LC_ALL, "");
                }
        }
        strncpy_nt(p.interface, "default", 32);

diff --git a/src/vnstati.c b/src/vnstati.c
index 645a1e3c3ab5cea81aaa017f4c4812400dd72ebf..3b77f993157755f8ca026a4931919607f6c9b746 100644 (file)
--- a/src/vnstati.c
+++ b/src/vnstati.c
@@ -65,6 +65,8 @@ int main(int argc, char *argv[])
        } else {
                if (getenv("LC_ALL")) {
                        setlocale(LC_ALL, getenv("LC_ALL"));
+               } else {
+                       setlocale(LC_ALL, "");
                }
        }
        strncpy_nt(interface, cfg.iface, 32);