From 4994a90be9200c01a15e8c87305bf7f37d6255fe Mon Sep 17 00:00:00 2001 From: "Roman Schmerold (BNoiZe)" Date: Mon, 14 Apr 2014 09:48:39 +0200 Subject: [PATCH] Removing old languages from database, pushing version to 0.9.32-rc3 Signed-off-by: Roman Schmerold (BNoiZe) --- install/froxlor.sql | 20 +++++-------------- .../updates/froxlor/0.9/update_0.9.inc.php | 12 +++++++++++ lib/tables.inc.php | 2 +- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 4c1d8738..e4756af5 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -529,7 +529,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'phpconfigs_hidestdsubdomain', '0'), ('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_customer', '1'), - ('panel', 'version', '0.9.32-rc2'); + ('panel', 'version', '0.9.32-rc3'); DROP TABLE IF EXISTS `panel_tasks`; @@ -642,20 +642,10 @@ INSERT INTO `panel_languages` (`id`, `language`, `iso`, `file`) VALUES (1, 'Deutsch', 'de', 'lng/german.lng.php'), (2, 'English', 'en', 'lng/english.lng.php'), (3, 'Français', 'fr', 'lng/french.lng.php'), - (4, 'Chinese', 'zh', 'lng/zh-cn.lng.php'), - (5, 'Catalan', 'ca', 'lng/catalan.lng.php'), - (6, 'Español', 'es', 'lng/spanish.lng.php'), - (7, 'Português', 'pt', 'lng/portugues.lng.php'), - (8, 'Russian', 'ru', 'lng/russian.lng.php'), - (9, 'Danish', 'da', 'lng/danish.lng.php'), - (10, 'Italian', 'it', 'lng/italian.lng.php'), - (11, 'Bulgarian', 'bg', 'lng/bulgarian.lng.php'), - (12, 'Slovak', 'sk', 'lng/slovak.lng.php'), - (13, 'Dutch', 'nl', 'lng/dutch.lng.php'), - (14, 'Hungarian', 'hu', 'lng/hungarian.lng.php'), - (15, 'Swedish', 'sv', 'lng/swedish.lng.php'), - (16, 'Czech', 'cz', 'lng/czech.lng.php'), - (17, 'Polski', 'pl', 'lng/polish.lng.php'); + (4, 'Português', 'pt', 'lng/portugues.lng.php'), + (5, 'Italian', 'it', 'lng/italian.lng.php'), + (6, 'Dutch', 'nl', 'lng/dutch.lng.php'), + (7, 'Swedish', 'sv', 'lng/swedish.lng.php'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index a5f86bbc..686f9a12 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2753,3 +2753,15 @@ if (isFroxlorVersion('0.9.32-rc1')) { updateToVersion('0.9.32-rc2'); } + +if (isFroxlorVersion('0.9.32-rc2')) { + showUpdateStep("Updating from 0.9.32-rc2 to 0.9.32-rc3", false); + + showUpdateStep("Removing outdated languages"); + Database::query("DELETE FROM `" . TABLE_PANEL_LANGUAGE . "` WHERE `iso` REGEXP '(bg|ca|cz|da|hu|pl|ru|sk|es|zh)';"); + Database::query("UPDATE `" . TABLE_PANEL_ADMINS . "` SET `def_language` = 'English' WHERE `def_language` NOT REGEXP '(Dutch|English|Français|Deutsch|Italian|Portugu\ês|Swedish)';"); + Database::query("UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET `def_language` = 'English' WHERE `def_language` NOT REGEXP '(Dutch|English|Français|Deutsch|Italian|Português|Swedish)';"); + lastStepStatus(0); + + updateToVersion('0.9.32-rc3'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index f9d37b4d..7b93fdd8 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings'); define('TABLE_DOMAINTOIP', 'panel_domaintoip'); // VERSION INFO -$version = '0.9.32-rc2'; +$version = '0.9.32-rc3'; $dbversion = '2'; $branding = '';