From dc3c8eac917b37bdd62e73a34b91c7bcc653bcd4 Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Sun, 31 Jul 2016 18:51:57 -0600
Subject: [PATCH] Fix the label for the device vendor function import and add
 the translation to resources/app_languages.php.

---
 app/devices/app_defaults.php            |  2 ++
 app/devices/device_vendor_functions.php |  1 +
 resources/app_languages.php             | 11 ++++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/devices/app_defaults.php b/app/devices/app_defaults.php
index 5326e7aaa7..457ac5a1aa 100644
--- a/app/devices/app_defaults.php
+++ b/app/devices/app_defaults.php
@@ -88,6 +88,7 @@ if ($domains_processed == 1) {
 								$sql .= "(";
 								$sql .= "device_vendor_uuid, ";
 								$sql .= "device_vendor_function_uuid, ";
+								$sql .= "label, ";
 								$sql .= "name, ";
 								$sql .= "value, ";
 								$sql .= "enabled, ";
@@ -97,6 +98,7 @@ if ($domains_processed == 1) {
 								$sql .= "( ";
 								$sql .= "'".$device_vendor_uuid."', ";
 								$sql .= "'".$device_vendor_function_uuid."', ";
+								$sql .= "'".$function['label']."', ";
 								$sql .= "'".$function['name']."', ";
 								$sql .= "'".$function['value']."', ";
 								$sql .= "'true', ";
diff --git a/app/devices/device_vendor_functions.php b/app/devices/device_vendor_functions.php
index 790a930075..bc0ce686bf 100644
--- a/app/devices/device_vendor_functions.php
+++ b/app/devices/device_vendor_functions.php
@@ -33,6 +33,7 @@
 		$sql_search .= "or description like '%".$search."%'";
 		$sql_search .= ")";
 	}
+
 //additional includes
 	require_once "resources/header.php";
 	require_once "resources/paging.php";
diff --git a/resources/app_languages.php b/resources/app_languages.php
index 0a3c0cd2aa..db43893c9b 100644
--- a/resources/app_languages.php
+++ b/resources/app_languages.php
@@ -849,7 +849,16 @@ $text['option-false']['pl'] = "Nie";
 $text['option-false']['sv-se'] = "Falsk";
 $text['option-false']['de-at'] = "Aus";
 
-
+$text['label-label']['en-us'] = "Label";
+$text['label-label']['es-cl'] = "Etiqueta";
+$text['label-label']['pt-pt'] = "Etiqueta";
+$text['label-label']['fr-fr'] = "Label";
+$text['label-label']['pt-br'] = "Etiqueta";
+$text['label-label']['he'] = "תג";
+$text['label-label']['pl'] = "Etykieta";
+$text['label-label']['uk'] = "Назва";
+$text['label-label']['sv-se'] = "Etikett";
+$text['label-label']['de-at'] = "Kennzeichnung";
 
 //description