From f10958502572efa46f396f14c7016a6c0ec79104 Mon Sep 17 00:00:00 2001 From: Ian Moore Date: Sat, 8 Aug 2015 18:07:53 -0400 Subject: [PATCH] Fixed "Unknown PHP error" when using English. More language changes --- endpoints/lib/language.php | 4 ++-- panes/toolbar.html | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/endpoints/lib/language.php b/endpoints/lib/language.php index 4e5b6b4..da8241b 100644 --- a/endpoints/lib/language.php +++ b/endpoints/lib/language.php @@ -68,9 +68,9 @@ class __vbox_language { } - self::$langdata = unserialize(file_get_contents(VBOX_BASE_LANG_DIR.'/source/'.$lang.'.dat')); + self::$langdata = unserialize(@file_get_contents(VBOX_BASE_LANG_DIR.'/source/'.$lang.'.dat')); - $xmlObj = simplexml_load_string(file_get_contents(VBOX_BASE_LANG_DIR.'/'.$lang.'.xml')); + $xmlObj = simplexml_load_string(@file_get_contents(VBOX_BASE_LANG_DIR.'/'.$lang.'.xml')); $arrXml = $this->objectsIntoArray($xmlObj); $lang = array(); diff --git a/panes/toolbar.html b/panes/toolbar.html index bdd9a7e..99f2839 100644 --- a/panes/toolbar.html +++ b/panes/toolbar.html @@ -73,19 +73,19 @@ var vboxChooserSettingsMenu = { 'icon' : 'hd' }, 'USB' : { - 'label' : 'USB Devices', + 'label' : 'USB', 'icon' : 'usb' }, 'Network' : { - 'label' : 'Network Adapters...', + 'label' : 'Network', 'icon' : 'nw' }, 'SharedFolders' : { - 'label' : 'Shared Folders...', + 'label' : 'Shared Folders', 'icon' : 'sf' }, 'RemoteDisplay' : { - 'label' : 'Enable Remote Display', + 'label' : 'Remote Display', 'icon' : 'vrdp', 'separator' : true }, @@ -388,7 +388,7 @@ function vboxUpdateSettingsMenu(vm) { } if(dvdDevices.length) { var ul = null; - var li = $('
  • ').html(""+trans('CD/DVD Devices','UIActionPool')+'').addClass('vboxVMSettingsStorage'); + var li = $('
  • ').html(""+trans('Optical Drives','UIActionPool')+'').addClass('vboxVMSettingsStorage'); if(dvdDevices.length == 1) { ul = dvdDevices[0].children('ul').first(); } else {