From 269b52ec4e6dc933adfe5016ce68ba2c58bde4ea Mon Sep 17 00:00:00 2001
From: Burt P <pburt0@gmail.com>
Date: Wed, 12 Jul 2017 03:42:03 -0500
Subject: Add column for localized field descriptions to Devices->Memory

To get around the earlier problems with localized labels in the
memory view, add a column "Description" that uses the localized
labels.

Signed-off-by: Burt P <pburt0@gmail.com>
---
 modules/devices.c           | 32 ++++++++++++++++++++------------
 modules/devices/devmemory.c |  4 ++--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/modules/devices.c b/modules/devices.c
index 01021a62..9bed002d 100644
--- a/modules/devices.c
+++ b/modules/devices.c
@@ -465,12 +465,18 @@ gchar *callback_spd()
 gchar *callback_memory()
 {
     return g_strdup_printf("[Memory]\n"
-			   "%s\n"
-			   "[$ShellParam$]\n"
-			   "ViewType=2\n"
-			   "LoadGraphSuffix= kB\n"
-			   "RescanInterval=2000\n"
-			   "%s\n", meminfo, lginterval);
+               "%s\n"
+               "[$ShellParam$]\n"
+               "ViewType=2\n"
+               "LoadGraphSuffix= kB\n"
+               "RescanInterval=2000\n"
+               "ColumnTitle$TextValue=%s\n"
+               "ColumnTitle$Extra1=%s\n"
+               "ColumnTitle$Value=%s\n"
+               "ShowColumnHeaders=true\n"
+               "%s\n", meminfo,
+               _("Field"), _("Description"), _("Value"), /* column labels */
+               lginterval);
 }
 
 gchar *callback_battery()
@@ -494,13 +500,15 @@ gchar *callback_sensors()
                            "[$ShellParam$]\n"
                            "ViewType=2\n"
                            "LoadGraphSuffix=\n"
-                           "ColumnTitle$TextValue=Sensor\n"
-                           "ColumnTitle$Value=Value\n"
-                           "ColumnTitle$Extra1=Type\n"
+                           "ColumnTitle$TextValue=%s\n"
+                           "ColumnTitle$Value=%s\n"
+                           "ColumnTitle$Extra1=%s\n"
                            "ShowColumnHeaders=true\n"
-			   "RescanInterval=5000\n"
-			   "%s",
-                           sensors, lginterval);
+                           "RescanInterval=5000\n"
+                           "%s",
+                           sensors,
+                           _("Sensor"), _("Value"), _("Type"), /* column labels */
+                           lginterval);
 }
 
 gchar *callback_printers()
diff --git a/modules/devices/devmemory.c b/modules/devices/devmemory.c
index a3211895..080e2bbe 100644
--- a/modules/devices/devmemory.c
+++ b/modules/devices/devmemory.c
@@ -65,12 +65,12 @@ void scan_memory_do(void)
         if (tmp)
             tmp_label = _(tmp);
         else
-            tmp_label = newkeys[0];
+            tmp_label = ""; /* or newkeys[0] */
         /* although it doesn't matter... */
 
         moreinfo_add_with_prefix("DEV", newkeys[0], g_strdup(newkeys[1]));
 
-        tmp = g_strconcat(meminfo, newkeys[0], "=", newkeys[1], "\n", NULL);
+        tmp = g_strconcat(meminfo, newkeys[0], "=", newkeys[1], "|", tmp_label, "\n", NULL);
         g_free(meminfo);
         meminfo = tmp;
 
-- 
cgit v1.2.3