diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-03-30 05:03:47 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2006-03-30 05:03:47 +0000 |
| commit | 828b2288207a9f24ea264d0456d7ff951b931fe3 (patch) | |
| tree | 1654aca49503078fdef8b94425b461a571c4ea9b | |
| parent | 4243b22ee54bcef23172d45ae0fff57633f7a9ab (diff) | |
| download | ampache-828b2288207a9f24ea264d0456d7ff951b931fe3.tar.gz ampache-828b2288207a9f24ea264d0456d7ff951b931fe3.tar.bz2 ampache-828b2288207a9f24ea264d0456d7ff951b931fe3.zip | |
final commit before beta2 release
| -rw-r--r-- | lib/gettext.php | 6 | ||||
| -rw-r--r-- | modules/init.php | 2 | ||||
| -rw-r--r-- | templates/show_admin_info.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_admin_tools.inc.php | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/lib/gettext.php b/lib/gettext.php index 602f3365..6db831ac 100644 --- a/lib/gettext.php +++ b/lib/gettext.php @@ -29,8 +29,10 @@ function load_gettext() { if (function_exists('bindtextdomain')) { bindtextdomain('messages', conf('prefix') . "/locale/"); textdomain('messages'); - putenv("LANG=" . conf('lang')); - setlocale(LC_ALL, conf('lang')); + $lang = conf('lang'); + putenv("LANG=" . $lang); + /* Try lang, lang + charset and lang + utf-8 */ + setlocale(LC_ALL, $lang,$lang . '_'. conf('site_charset'),$lang . '_UTF-8'); } } // load_gettext diff --git a/modules/init.php b/modules/init.php index d055019d..94f504e3 100644 --- a/modules/init.php +++ b/modules/init.php @@ -80,7 +80,7 @@ if (!$results['allow_stream_playback']) { /** This is the version.... fluf nothing more... **/ -$results['version'] = '3.3.2-Beta2 (Build 010)'; +$results['version'] = '3.3.2-Beta2'; diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index b87a7847..b0414611 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -30,9 +30,6 @@ $total_flagged = $flag->get_total(); $catalog = new Catalog(); $songs = $catalog->get_disabled(10); -/* User Information */ -$users = $GLOBALS['user']->get_recent(10); - ?> <span class="header1"><?php echo _('Information'); ?></span><br /> <div class="text-box"> diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 1dade1f2..ff66675d 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -22,6 +22,7 @@ $web_path = conf('web_path'); $catalog = new Catalog(); $catalogs = $catalog->get_catalogs(); +$users = $GLOBALS['user']->get_recent(10); ?> <span class="header1"><?php echo _('Catalogs'); ?></span> |