From ca2929a61f38e63dc3de7a5b4f8b421947b0fbed Mon Sep 17 00:00:00 2001
From: Ruben Barkow <rubo77@users.noreply.github.com>
Date: Wed, 25 Jul 2018 22:30:29 +0200
Subject: [PATCH] gluon-web-admin: add site-commit to info page (#1482)

---
 .../files/lib/gluon/config-mode/view/admin/info.html           | 3 ++-
 package/gluon-web-admin/i18n/de.po                             | 3 +++
 package/gluon-web-admin/i18n/fr.po                             | 3 +++
 package/gluon-web-admin/i18n/gluon-web-admin.pot               | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/info.html b/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/info.html
index 28ae88e6..5f3e9191 100644
--- a/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/info.html
+++ b/package/gluon-web-admin/files/lib/gluon/config-mode/view/admin/info.html
@@ -23,7 +23,8 @@
 		{ _('Hostname'), pretty_hostname.get(uci) },
 		{ _('MAC address'), sysconfig.primary_mac },
 		{ _('Hardware model'), platform.get_model() },
-		{ _('Gluon version'), util.trim(util.readfile('/lib/gluon/gluon-version')) },
+		{ _('Gluon version') .. " / " .. _('Site version'), util.trim(util.readfile('/lib/gluon/gluon-version')) 
+			.. " / " .. util.trim(util.readfile('/lib/gluon/site-version')) },
 		{ _('Firmware release'), util.trim(util.readfile('/lib/gluon/release')) },
 		{ _('Site'), site.site_name() },
 		{ _('Public VPN key'), pubkey },
diff --git a/package/gluon-web-admin/i18n/de.po b/package/gluon-web-admin/i18n/de.po
index 95c27e5f..bb2d53b1 100644
--- a/package/gluon-web-admin/i18n/de.po
+++ b/package/gluon-web-admin/i18n/de.po
@@ -50,6 +50,9 @@ msgstr "Firmware-Release"
 msgid "Gluon version"
 msgstr "Gluon-Version"
 
+msgid "Site version"
+msgstr "Site-Version"
+
 msgid "Hardware model"
 msgstr "Hardware-Modell"
 
diff --git a/package/gluon-web-admin/i18n/fr.po b/package/gluon-web-admin/i18n/fr.po
index 2e6b8739..93301edf 100644
--- a/package/gluon-web-admin/i18n/fr.po
+++ b/package/gluon-web-admin/i18n/fr.po
@@ -51,6 +51,9 @@ msgstr "Version de la firmware"
 msgid "Gluon version"
 msgstr "Version de Gluon"
 
+msgid "Site version"
+msgstr "Version de Site"
+
 msgid "Hardware model"
 msgstr "Modèle du Matériel"
 
diff --git a/package/gluon-web-admin/i18n/gluon-web-admin.pot b/package/gluon-web-admin/i18n/gluon-web-admin.pot
index ce44d56b..5000a945 100644
--- a/package/gluon-web-admin/i18n/gluon-web-admin.pot
+++ b/package/gluon-web-admin/i18n/gluon-web-admin.pot
@@ -37,6 +37,9 @@ msgstr ""
 msgid "Gluon version"
 msgstr ""
 
+msgid "Site version"
+msgstr ""
+
 msgid "Hardware model"
 msgstr ""