diff options
Diffstat (limited to 'h-source/Application/Models')
| -rw-r--r-- | h-source/Application/Models/GenericModel.php | 2 | ||||
| -rw-r--r-- | h-source/Application/Models/HostcontrollersModel.php (renamed from h-source/Application/Models/PcmciaModel.php) | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/h-source/Application/Models/GenericModel.php b/h-source/Application/Models/GenericModel.php index c4c69ab..3a0f8fa 100644 --- a/h-source/Application/Models/GenericModel.php +++ b/h-source/Application/Models/GenericModel.php @@ -90,7 +90,7 @@ class GenericModel extends Model_Tree { { if (!in_array($field,$listArray)) { - $value = getTranslationFunction($field) !== 'gtext' ? gtext(call_user_func(getTranslationFunction($field),$value)) : gtext($value); + $value = call_user_func(getTranslationFunction($field),$value); $html .= "<div class='viewall_popup_menu_status_item'>".$value."</div>\n"; $count++; diff --git a/h-source/Application/Models/PcmciaModel.php b/h-source/Application/Models/HostcontrollersModel.php index 538aa7a..8908052 100644 --- a/h-source/Application/Models/PcmciaModel.php +++ b/h-source/Application/Models/HostcontrollersModel.php @@ -20,10 +20,10 @@ if (!defined('EG')) die('Direct access not allowed!'); -class PcmciaModel extends GenericModel +class HostcontrollersModel extends GenericModel { - public $type = 'PCMCIA-controller'; //device type + public $type = 'host-controller'; //device type public function __construct() { @@ -32,24 +32,25 @@ class PcmciaModel extends GenericModel 'vendor' => 'vendor', 'comm_year' => 'comm_year', 'compatibility' => 'compatibility', - 'interface' => 'interface', + 'subtype' => 'subtype', ); $this->_popupLabels = array( 'vendor' => gtext("vendor"), 'comm_year' => gtext("year"), 'compatibility' => gtext("does it work?"), - 'interface' => gtext("interface"), + 'subtype' => gtext("subtype"), ); $this->setPopupFunctions(); - $this->createPopupWhere('vendor,compatibility,comm_year,interface'); + $this->createPopupWhere('vendor,compatibility,comm_year,subtype'); $this->diffFields = array( 'vendor' => gtext("vendor"), 'model' => gtext('model name'), 'other_names' => gtext('possible other names of the device'), + 'subtype' => gtext('subtype')." (laser, inkjet, ..)", 'pci_id' => gtext("VendorID:ProductID code of the device"), 'comm_year' => gtext('year of commercialization'), 'interface' => gtext("interface"), |