diff --git a/htdocs/application/config/database.php b/htdocs/application/config/database.php index af6c2fa..1466923 100644 --- a/htdocs/application/config/database.php +++ b/htdocs/application/config/database.php @@ -55,7 +55,7 @@ $db['default']['username'] = $CI->config->item('db_username'); $db['default']['password'] = $CI->config->item('db_password'); $db['default']['database'] = $CI->config->item('db_database'); $db['default']['dbdriver'] = 'mysql'; -$db['default']['dbprefix'] = ''; +$db['default']['dbprefix'] = $CI->config->item('db_prefix'); $db['default']['pconnect'] = TRUE; $db['default']['db_debug'] = TRUE; $db['default']['cache_on'] = FALSE; diff --git a/htdocs/application/config/stikked.php b/htdocs/application/config/stikked.php index c0a8c0c..1701980 100644 --- a/htdocs/application/config/stikked.php +++ b/htdocs/application/config/stikked.php @@ -15,10 +15,20 @@ $config['site_name'] = 'Stikked'; * The database structure will be created automatically * */ -$config['db_hostname'] = '127.0.0.1'; -$config['db_database'] = 'stikked'; -$config['db_username'] = 'stikked'; -$config['db_password'] = 'stikked'; +$config['db_hostname'] = '127.0.0.1'; +$config['db_database'] = 'stikked'; +$config['db_username'] = 'stikked'; +$config['db_password'] = 'stikked'; + +/** + * Table prefix + * Generate table prefix for stikked db, commonly used if the webhoster only have one db. + * Use underscore as suffix to easily see the tables. + * use $config['db_prefix'] = ''; if you dont want to use table prefix. +*/ + +$config['db_prefix'] = 'stikked_'; + /** * Theme @@ -35,7 +45,7 @@ $config['theme'] = 'default'; * * Which language to use * Translate Stikked to your own language, see htdocs/application/language files - * Currently: english, german, swissgerman, spanish + * Currently: english, german, swissgerman, spanish, norwegian * */ $config['language'] = 'english'; diff --git a/htdocs/application/language/norwegian/date_lang.php b/htdocs/application/language/norwegian/date_lang.php new file mode 100644 index 0000000..ac816a4 --- /dev/null +++ b/htdocs/application/language/norwegian/date_lang.php @@ -0,0 +1,61 @@ +