Merge pull request openSUSE#871 from aschnell/master

- select table style based on codeset
aschnell · Feb 16, 2024 · 6d5b3a8 · 6d5b3a8
2 parents aa20cd7 + 1636dc3
commit 6d5b3a8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/client/GlobalOptions.cc b/client/GlobalOptions.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2019-2023] SUSE LLC
+ * Copyright (c) [2019-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -122,7 +122,7 @@ namespace snapper
     {
 	ParsedOpts::const_iterator it = opts.find("table-style");
 	if (it == opts.end())
-	    return TableFormatter::default_style;
+	    return TableFormatter::default_style();
 
 	try
 	{
@@ -141,7 +141,7 @@ namespace snapper
 	    SN_THROW(OptionsException(error));
 	}
 
-	return TableFormatter::default_style;
+	return TableFormatter::default_style();
     }
 
 

diff --git a/client/utils/TableFormatter.cc b/client/utils/TableFormatter.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2019-2020] SUSE LLC
+ * Copyright (c) [2019-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -20,6 +20,9 @@
  */
 
 
+#include <cstring>
+#include <langinfo.h>
+
 #include "client/utils/TableFormatter.h"
 
 
@@ -29,7 +32,11 @@ namespace snapper
     using namespace std;
 
 
-    const TableStyle TableFormatter::default_style = Ascii;
+    TableStyle
+    TableFormatter::default_style()
+    {
+	return strcmp(nl_langinfo(CODESET), "UTF-8") == 0 ? TableStyle::Light : TableStyle::Ascii;
+    }
 
 
     ostream&

diff --git a/client/utils/TableFormatter.h b/client/utils/TableFormatter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) [2019-2020] SUSE LLC
+ * Copyright (c) [2019-2024] SUSE LLC
  *
  * All Rights Reserved.
  *
@@ -41,7 +41,7 @@ namespace snapper
 
     public:
 
-	static const TableStyle default_style;
+	static TableStyle default_style();
 
 	TableFormatter(TableStyle style) : style(style) {}
 

diff --git a/package/snapper.changes b/package/snapper.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 16 08:26:41 CET 2024 - [email protected]
+
+- select table style based on codeset
+
 -------------------------------------------------------------------
 Wed Feb 14 09:14:32 CET 2024 - [email protected]