diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php index 5a738b1a4..87b90967c 100644 --- a/classes/LocalizationPack.php +++ b/classes/LocalizationPack.php @@ -52,6 +52,7 @@ class LocalizationPackCore $res &= $this->installConfiguration($xml); $res &= $this->installModules($xml); $res &= $this->_installLanguages($xml, $install_mode); + $res &= $this->updateDefaultGroupDisplayMethod($xml); if ($res && isset($this->iso_code_lang)) { @@ -240,7 +241,7 @@ class LocalizationPackCore } } } - return $this->updateDefaultGroupDisplayMethod($xml); + return true; } protected function _installCurrencies($xml, $install_mode = false) @@ -388,6 +389,11 @@ class LocalizationPackCore return true; } + + protected function _installGroups($xml) + { + return $this->updateDefaultGroupDisplayMethod($xml); + } protected function updateDefaultGroupDisplayMethod($xml) { diff --git a/classes/Validate.php b/classes/Validate.php index 1b4d31d03..01ee11fd1 100644 --- a/classes/Validate.php +++ b/classes/Validate.php @@ -930,7 +930,7 @@ class ValidateCore */ public static function isLocalizationPackSelection($data) { - return ($data === 'states' || $data === 'taxes' || $data === 'currencies' || $data === 'languages' || $data === 'units'); + return in_array((string)$data, array('states', 'taxes', 'currencies', 'languages', 'units', 'groups')); } /** diff --git a/controllers/admin/AdminLocalizationController.php b/controllers/admin/AdminLocalizationController.php index 98d45bf10..00877cb0d 100644 --- a/controllers/admin/AdminLocalizationController.php +++ b/controllers/admin/AdminLocalizationController.php @@ -236,6 +236,11 @@ class AdminLocalizationControllerCore extends AdminController 'id' => 'units', 'val' => 'units', 'name' => $this->l('Units (e.g. weight, volume, distance)') + ), + array( + 'id' => 'groups', + 'val' => 'groups', + 'name' => $this->l('Change the behavior of the taxes display for the groups') ) );