diff --git a/classes/Gender.php b/classes/Gender.php index f3da94ad1..35034c55d 100644 --- a/classes/Gender.php +++ b/classes/Gender.php @@ -44,7 +44,7 @@ class GenderCore extends ObjectModel 'type' => array('type' => self::TYPE_INT, 'required' => true), /* Lang fields */ - 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isString', 'required' => true, 'size' => 20), + 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isCatalogName', 'required' => true, 'size' => 20), ), ); diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index 57a9ef514..7331a9c4c 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -77,7 +77,7 @@ class AdminGendersControllerCore extends AdminController 'list' => array( 0 => $this->l('Male'), 1 => $this->l('Female'), - 2 => $this->l('Neutral') + 2 => $this->l('Other') ), 'filter_key' => 'a!type', 'callback' => 'displayGenderType', @@ -145,7 +145,7 @@ class AdminGendersControllerCore extends AdminController array( 'id' => 'type_neutral', 'value' => 2, - 'label' => $this->l('Neutral') + 'label' => $this->l('Other') ) ) ),