diff --git a/dbd/sql/mysql/data/basic_locale_string.sql b/dbd/sql/mysql/data/basic_locale_string.sql index f66c4f1..65301a9 100644 --- a/dbd/sql/mysql/data/basic_locale_string.sql +++ b/dbd/sql/mysql/data/basic_locale_string.sql @@ -1,22 +1,22 @@ -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_logout', 1, 'Logout', 'Ausloggen', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_login', 1, 'Login', 'Einloggen', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_register', 1, 'Register', 'Registrieren', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_username', 1, 'Username', 'Username', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_password', 1, 'Password', 'Passwort', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_email', 1, 'EMail', 'E-Mail2', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_last_active', 1, 'Last active', 'Zuletzt aktiv', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_join_date', 1, 'Joindate', 'Beitrittsdatum', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_locale', 1, 'Locale', 'Sprache', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_admin_rights', 1, 'Admin Rights', 'Admin Rechte', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_cancel', 1, 'Cancel', 'Abbrechen', ''); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_logout', 1, 'Logout', 'Ausloggen'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_login', 1, 'Login', 'Einloggen'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_register', 1, 'Register', 'Registrieren'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_username', 1, 'Username', 'Username'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_password', 1, 'Password', 'Passwort'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_email', 1, 'EMail', 'E-Mail2'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_last_active', 1, 'Last active', 'Zuletzt aktiv'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_join_date', 1, 'Joindate', 'Beitrittsdatum'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_locale', 1, 'Locale', 'Sprache'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_admin_rights', 1, 'Admin Rights', 'Admin Rechte'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_cancel', 1, 'Cancel', 'Abbrechen'); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_text_logout', 1, 'Logout before you leave!', 'Loggen Sie sie sich aus bevor Sie gehen!', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_text_login', 1, 'Login to your Website.', 'Loggen Sie sich in ihre Website ein.', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_text_register', 1, 'Register an Account', 'Register an Account', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_text_password_miss', 1, 'Can\'t really remember your Password?', 'Can\'t really remember your Password?', ''); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_text_logout', 1, 'Logout before you leave!', 'Loggen Sie sie sich aus bevor Sie gehen!'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_text_login', 1, 'Login to your Website.', 'Loggen Sie sich in ihre Website ein.'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_text_register', 1, 'Register an Account', 'Register an Account'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_text_password_miss', 1, 'Can\'t really remember your Password?', 'Can\'t really remember your Password?'); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_placeholder_username', 1, 'peter / peter@world.org', 'peter / peter@world.org', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_placeholder_password', 1, 'my secret123', 'geheim567', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_placeholder_email', 1, 'peter@world.org', 'peter@world.org', ''); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_placeholder_username', 1, 'peter / peter@world.org', 'peter / peter@world.org'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_placeholder_password', 1, 'my secret123', 'geheim567'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_placeholder_email', 1, 'peter@world.org', 'peter@world.org'); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('basic_state_login', 1, 'You are logged in.', 'You are logged in.', ''); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('basic_state_login', 1, 'You are logged in.', 'You are logged in.'); \ No newline at end of file diff --git a/dbd/sql/mysql/data/sai_api.sql b/dbd/sql/mysql/data/sai_api.sql index 9889284..305ba65 100644 --- a/dbd/sql/mysql/data/sai_api.sql +++ b/dbd/sql/mysql/data/sai_api.sql @@ -23,6 +23,10 @@ INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `nam INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (35, 42, 2, 3, 'add', 'id', 'ALL'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (36, 42, 2, 3, 'add', 'category', 'INT'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (37, 42, 2, 3, 'load', 'id', 'LANG'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (38, 42, 2, 3, 'load', 'group', 'INT'); +INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (39, 42, 2, 3, 'singleload', 'id', 'ALL'); + INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (40, 42, 2, 3, 'upload', 'cat', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (41, 42, 2, 3, 'del', 'cat', 'STRING'); INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (42, 42, 2, 3, 'del', 'id', 'STRING'); diff --git a/dbd/sql/mysql/data/sai_error_locale_string.sql b/dbd/sql/mysql/data/sai_error_locale_string.sql index dcb2cce..b432da8 100644 --- a/dbd/sql/mysql/data/sai_error_locale_string.sql +++ b/dbd/sql/mysql/data/sai_error_locale_string.sql @@ -1,8 +1,8 @@ -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_username_short', 43, 'Username is too short', 'Nutzername ist zu kurz', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_username_long', 43, 'Username is too long', 'Nutzername ist zu lang', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_username_miss', 43, 'Username required', 'Nutzername erfoderlich', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_password_miss', 43, 'Password required', 'Passwort erforderlich', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_password_long', 43, 'Password too long', 'Passwort zu lang', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_password_short', 43, 'Password too short', 'Passwort zu kurz', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_password_match', 43, 'Passwords do not match!', 'Passwords do not match!', ''); -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_error_email_wrong', 43, 'Invalid EMail!', 'Invalid EMail!', ''); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_username_short', 43, 'Username is too short', 'Nutzername ist zu kurz'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_username_long', 43, 'Username is too long', 'Nutzername ist zu lang'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_username_miss', 43, 'Username required', 'Nutzername erfoderlich'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_miss', 43, 'Password required', 'Passwort erforderlich'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_long', 43, 'Password too long', 'Passwort zu lang'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_short', 43, 'Password too short', 'Passwort zu kurz'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_password_match', 43, 'Passwords do not match!', 'Passwords do not match!'); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_error_email_wrong', 43, 'Invalid EMail!', 'Invalid EMail!'); \ No newline at end of file diff --git a/dbd/sql/mysql/data/sai_locale_string.sql b/dbd/sql/mysql/data/sai_locale_string.sql index cf3091c..1a85b5e 100644 --- a/dbd/sql/mysql/data/sai_locale_string.sql +++ b/dbd/sql/mysql/data/sai_locale_string.sql @@ -1 +1 @@ -INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`, `huHU`) VALUES ('sai_mod_login_text', 42, 'Please login for developer access (if you are a developer).', 'Please login for developer access (if you are a developer).', ''); +INSERT INTO `system_locale_string` (`id`, `category`, `enUS`, `deDE`) VALUES ('sai_mod_login_text', 42, 'Please login for developer access (if you are a developer).', 'Please login for developer access (if you are a developer).'); \ No newline at end of file diff --git a/sai/page/default_page.php b/sai/page/default_page.php index 111182f..bd9d029 100644 --- a/sai/page/default_page.php +++ b/sai/page/default_page.php @@ -4,7 +4,7 @@ namespace SYSTEM\SAI; class default_page extends \SYSTEM\PAGE\Page { - private function menu_sys(){ + private static function menu_sys(){ $result = ''; $mods = \SYSTEM\SAI\sai::getSysModules(); @@ -16,7 +16,7 @@ class default_page extends \SYSTEM\PAGE\Page { return $result; } - private function menu_proj(){ + private static function menu_proj(){ $result = ''; $mods = \SYSTEM\SAI\sai::getModules(); foreach($mods as $mod){ @@ -27,21 +27,21 @@ class default_page extends \SYSTEM\PAGE\Page { return $result; } - private function menu_start(){ + private static function menu_start(){ $mod = \SYSTEM\SAI\sai::getStartModule(); if(\call_user_func(array($mod, 'right_public')) || \call_user_func(array($mod, 'right_right'))){ return \call_user_func(array($mod, 'html_li_menu'));} throw new \SYSTEM\LOG\ERROR('Your SAI-Start-Module haz a Problem - either it does not exist or it is not public - which is required!');} - private function css(){ + private static function css(){ $result = ''. ''. ''; return $result; } - private function js(){ + private static function js(){ $result = ''. ''. ''. @@ -53,6 +53,19 @@ class default_page extends \SYSTEM\PAGE\Page { ''; return $result; } + + private static function lang_switcher(){ + $result = ''; + $langs = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS); + if(in_array('deDE', $langs)){ + $result .= 'Deutsch '; + } + + if(in_array('enUS', $langs)){ + $result .= 'English'; + } + return $result; + } public function html(){ @@ -60,12 +73,13 @@ class default_page extends \SYSTEM\PAGE\Page { $vars['css'] = $this->css(); $vars['js'] = $this->js(); - $vars['menu_start'] = $this->menu_start(); - $vars['menu_sys'] = $this->menu_sys(); - $vars['menu_proj'] = $this->menu_proj(); + $vars['menu_start'] = self::menu_start(); + $vars['menu_sys'] = self::menu_sys(); + $vars['menu_proj'] = self::menu_proj(); $vars['navimg'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG); - $vars['title'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE); //da_sense | Developer Center - $vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT); //© da_sense, TU Darmstadt 2013 + $vars['title'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE); + $vars['copyright'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT); + $vars['lang_switcher'] = self::lang_switcher(); $vars['PATH_LOCAL_IMG'] = \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/img/'); $vars = array_merge($vars,\SYSTEM\locale::getStrings(\SYSTEM\DBD\system_locale_string::VALUE_CATEGORY_SYSTEM_SAI)); diff --git a/sai/page/sai.tpl b/sai/page/sai.tpl index df4069e..0170944 100644 --- a/sai/page/sai.tpl +++ b/sai/page/sai.tpl @@ -15,8 +15,7 @@ SAI - Deutsch - English + ${lang_switcher}