Merge branch 'wip'

munkireport · Sep 8, 2016 · 90179c3 · 90179c3
2 parents 36f7341 + 79fc016
commit 90179c3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/app/helpers/site_helper.php b/app/helpers/site_helper.php
@@ -1,7 +1,7 @@
 <?php
 
 // Munkireport version (last number is number of commits)
-$GLOBALS['version'] = '2.9.0.2121';
+$GLOBALS['version'] = '2.9.0.2122';
 
 // Return version without commit count
 function get_version()

diff --git a/app/modules/bluetooth/lib/Bt_legacy_support.php b/app/modules/bluetooth/lib/Bt_legacy_support.php
@@ -26,9 +26,9 @@ function toArray()
 		// Translate network strings to db fields
 		$translate = array(
 			'Status = ' => 'bluetooth_power',
-			'Keyboard = ' => 'keyboard',
-			'Mouse = ' => 'mouse',
-			'Trackpad = ' => 'trackpad');
+			'Keyboard = ' => 'apple wireless keyboard',
+			'Mouse = ' => 'apple magic mouse',
+			'Trackpad = ' => 'apple wireless trackpad');
 
 		//clear any previous data we had
 		foreach($translate as $search => $field) {

diff --git a/app/views/listing/bluetooth.php b/app/views/listing/bluetooth.php
@@ -118,7 +118,7 @@
 			var in_device=$('td:eq(4)', nRow).html();
 			var cls = in_device < 15 ? 'danger' : (in_device < 40 ? 'warning' : 'success');
 			$('td:eq(4)', nRow).html('<div class="progress"><div class="progress-bar progress-bar-'+cls+'" style="width: '+in_device+'%;">'+in_device+'%</div></div>');
-			$('td:eq(3)', nRow).html(i18n.t(device_type));
+			$('td:eq(3)', nRow).html(i18n.t('bluetooth.' + device_type));
 		}
 	}
 	} );

diff --git a/assets/js/clients/client_detail.js b/assets/js/clients/client_detail.js
@@ -414,7 +414,7 @@ $(document).on('appReady', function(e, lang) {
 			for (key in data){
 				var rows = ''
 				if (key != 'bluetooth_power'){
-					rows = rows + '<tr><th>'+i18n.t(key)+'</th><td>'+data[key]+'%'+'</td></tr>'
+					rows = rows + '<tr><th>'+i18n.t('bluetooth.'+key)+'</th><td>'+data[key]+'%'+'</td></tr>'
 					$('table.mr-bluetooth-table').append(rows)
 				}
 			}

diff --git a/assets/locales/en.json b/assets/locales/en.json
@@ -74,9 +74,15 @@
 	},
 	"bluetooth": {
 		"all_ok": "No bluetooth devices with low battery",
+		"apple wireless keyboard": "Apple Wireless Keyboard",
+		"apple wireless trackpad": "Apple Wireless Trackpad",
+		"apple magic mouse": "Apple Magic Mouse",
 		"bluetooth": "Bluetooth",
 		"bluetooth_battery_widget": "Bluetooth battery status",
 		"keyboard": "Keyboard Status",
+		"magic keyboard": "Magic Keyboard",
+		"magic trackpad 2": "Magic Trackpad 2",
+		"magic mouse 2": "Magic Mouse 2",
 		"mouse": "Mouse Status",
 		"panel_title": "Bluetooth devices with less than 15% battery life",
 		"status": "Bluetooth Status",