Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1216) +++ branches/2.8.x/CHANGELOG (revision 1217) @@ -11,6 +11,9 @@ ! = Update/Change ------------------------------------- 2.8.1 ------------------------------------- +16-DEC-2009 Manuel Lang (MaGnaL) +# Minor bugfixes: Use localized messages in preference forms on frontend and backend, + correct html/php syntax in upgrade-script.php and NL localization of show_menu2 snippet 14-DEC-2009 Manuel lang (MaGnaL) # Ticket #832: Fix wrong configuration of timezone-handling when saving preferences-form on backend and frontend Index: branches/2.8.x/wb/upgrade-script.php =================================================================== --- branches/2.8.x/wb/upgrade-script.php (revision 1216) +++ branches/2.8.x/wb/upgrade-script.php (revision 1217) @@ -1,28 +1,54 @@ +* Copyright (C) 2009, Website Baker Org. e.V. +* http://start.websitebaker2.org/impressum-datenschutz.php +* Copyright (C) 2004-2009, Ryan Djurovich +* +* About WebsiteBaker +* +* Website Baker is a PHP-based Content Management System (CMS) +* designed with one goal in mind: to enable its users to produce websites +* with ease. +* +***************************************************************************** +* +***************************************************************************** +* WebsiteBaker Extra Information +* +* @author : thorn, Matthias Gallas, doc, Dietrich Roland Pehlke, Manuel Lang +* @platform : WebsiteBaker 2.8 +* +***************************************************************************** +* +***************************************************************************** +* LICENSE INFORMATION +* +* WebsiteBaker is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* WebsiteBaker is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +* See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*****************************************************************************/ -/* - - Website Baker Project - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - @include_once('config.php'); // this function checks the basic configurations of an existing WB intallation @@ -103,7 +129,7 @@

Step 1: Backup your files

It is highly recommended to create a manual backup of the entire /pages folder and the MySQL database before proceeding.
Note: The upgrade script alters some settings of your existing database!!! You need to confirm the disclaimer before proceeding.

-
+

 I confirm that a manual backup of the /pages folder and the MySQL database was created.

Index: branches/2.8.x/wb/admin/preferences/index.php =================================================================== --- branches/2.8.x/wb/admin/preferences/index.php (revision 1216) +++ branches/2.8.x/wb/admin/preferences/index.php (revision 1217) @@ -1,28 +1,54 @@ +* Copyright (C) 2009, Website Baker Org. e.V. +* http://start.websitebaker2.org/impressum-datenschutz.php +* Copyright (C) 2004-2009, Ryan Djurovich +* +* About WebsiteBaker +* +* Website Baker is a PHP-based Content Management System (CMS) +* designed with one goal in mind: to enable its users to produce websites +* with ease. +* +***************************************************************************** +* +***************************************************************************** +* WebsiteBaker Extra Information +* +* @author : Ryan Djurovich, stefan, Matthias Gallas, thorn, Manuel Lang +* @platform : WebsiteBaker 2.8 +* +***************************************************************************** +* +***************************************************************************** +* LICENSE INFORMATION +* +* WebsiteBaker is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* WebsiteBaker is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +* See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*****************************************************************************/ -/* - - Website Baker Project - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - require('../../config.php'); require_once(WB_PATH.'/framework/class.admin.php'); $admin = new admin('Preferences'); @@ -123,7 +149,7 @@ if(TIME_FORMAT == $format AND !isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { $template->set_var('SELECTED', ' selected="selected"'); } elseif($format == 'system_default' AND isset($_SESSION['USE_DEFAULT_TIME_FORMAT'])) { - $template->set_var('SELECTED', 'selected'); + $template->set_var('SELECTED', ' selected="selected"'); } else { $template->set_var('SELECTED', ''); } @@ -157,7 +183,8 @@ 'TEXT_TIME_FORMAT' => $TEXT['TIME_FORMAT'], 'TEXT_CURRENT_PASSWORD' => $TEXT['CURRENT_PASSWORD'], 'TEXT_NEW_PASSWORD' => $TEXT['NEW_PASSWORD'], - 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'] + 'TEXT_RETYPE_NEW_PASSWORD' => $TEXT['RETYPE_NEW_PASSWORD'], + 'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'] ) ); Index: branches/2.8.x/wb/account/preferences_form.php =================================================================== --- branches/2.8.x/wb/account/preferences_form.php (revision 1216) +++ branches/2.8.x/wb/account/preferences_form.php (revision 1217) @@ -1,28 +1,54 @@ +* Copyright (C) 2009, Website Baker Org. e.V. +* http://start.websitebaker2.org/impressum-datenschutz.php +* Copyright (C) 2004-2009, Ryan Djurovich +* +* About WebsiteBaker +* +* Website Baker is a PHP-based Content Management System (CMS) +* designed with one goal in mind: to enable its users to produce websites +* with ease. +* +***************************************************************************** +* +***************************************************************************** +* WebsiteBaker Extra Information (where needed) +* +* @author : Ryan Djurovich, stefan, Matthias Gallas, Manuel Lang +* @platform : WebsiteBaker 2.8 +* +***************************************************************************** +* +***************************************************************************** +* LICENSE INFORMATION +* +* WebsiteBaker is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* WebsiteBaker is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +* See the GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*****************************************************************************/ -/* - - Website Baker Project - Copyright (C) 2004-2009, Ryan Djurovich - - Website Baker is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - Website Baker is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Website Baker; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -*/ - if(!defined('WB_URL')) die(header('Location: ../../index.php')); ?> @@ -89,7 +115,7 @@ : - + {TEXT_TIMEZONE}: - + @@ -50,7 +50,7 @@ {TEXT_TIME_FORMAT}: - + @@ -39,7 +39,7 @@ {TEXT_DATE_FORMAT}: - + Index: branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt =================================================================== --- branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt (revision 1216) +++ branches/2.8.x/wb/templates/argos_theme/templates/preferences.htt (revision 1217) @@ -29,7 +29,7 @@ {TEXT_TIMEZONE}: - + @@ -51,7 +51,7 @@ {TEXT_TIME_FORMAT}: