diff options
| author | Paul Arthur <flowerysong00@yahoo.com> | 2012-03-31 17:01:04 -0400 |
|---|---|---|
| committer | Paul Arthur <paul.arthur@flowerysong.com> | 2012-04-12 21:13:29 -0400 |
| commit | f65076b93d91fe9718cf9bef37638d64290b9f28 (patch) | |
| tree | 40fbc65baffab34971d8c7b685ef9c99e0f4014f | |
| parent | 15457b16f17a141fa76a3b9882892362b601787c (diff) | |
| download | ampache-f65076b93d91fe9718cf9bef37638d64290b9f28.tar.gz ampache-f65076b93d91fe9718cf9bef37638d64290b9f28.tar.bz2 ampache-f65076b93d91fe9718cf9bef37638d64290b9f28.zip | |
Switch from _() to T_()
Even if we move away from php-gettext in the future, it's easy to
write a quick T_() as a simple wrapper; it's not so easy to rewrite
PHP to allow redeclaration of a function.
220 files changed, 1782 insertions, 1782 deletions
diff --git a/admin/access.php b/admin/access.php index cf570524..154d277a 100644 --- a/admin/access.php +++ b/admin/access.php @@ -43,12 +43,12 @@ switch ($_REQUEST['action']) { } Access::delete($_REQUEST['access_id']); $url = Config::get('web_path') . '/admin/access.php'; - show_confirmation(_('Deleted'),_('Your Access List Entry has been removed'),$url); + show_confirmation(T_('Deleted'), T_('Your Access List Entry has been removed'),$url); break; case 'show_delete_record': if (Config::get('demo_mode')) { break; } $access = new Access($_GET['access_id']); - show_confirmation(_('Deletion Request'),_('Are you sure you want to permanently delete') . ' ' . $access->name, + show_confirmation(T_('Deletion Request'), T_('Are you sure you want to permanently delete') . ' ' . $access->name, 'admin/access.php?action=delete_record&access_id=' . $access->id,1,'delete_access'); break; case 'add_host': @@ -107,7 +107,7 @@ switch ($_REQUEST['action']) { if (!Error::occurred()) { $url = Config::get('web_path') . '/admin/access.php'; - show_confirmation(_('Added'),_('Your new Access Control List(s) have been created'),$url); + show_confirmation(T_('Added'), T_('Your new Access Control List(s) have been created'),$url); } else { switch ($_GET['method']) { @@ -127,7 +127,7 @@ switch ($_REQUEST['action']) { $access = new Access($_REQUEST['access_id']); $access->update($_POST); if (!Error::occurred()) { - show_confirmation(_('Updated'),_('Access List Entry updated'), Config::get('web_path').'/admin/access.php'); + show_confirmation(T_('Updated'), T_('Access List Entry updated'), Config::get('web_path').'/admin/access.php'); } else { $access->format(); diff --git a/admin/catalog.php b/admin/catalog.php index 1a847c8d..62c8657b 100644 --- a/admin/catalog.php +++ b/admin/catalog.php @@ -57,7 +57,7 @@ switch ($_REQUEST['action']) { } } $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Catalog Updated'); + $title = T_('Catalog Updated'); $body = ''; show_confirmation($title,$body,$url); toggle_visible('ajax-loading'); @@ -77,7 +77,7 @@ switch ($_REQUEST['action']) { } } $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Catalog Updated'); + $title = T_('Catalog Updated'); $body = ''; show_confirmation($title,$body,$url); toggle_visible('ajax-loading'); @@ -103,7 +103,7 @@ switch ($_REQUEST['action']) { } Catalog::optimize_tables(); $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Catalog Updated'); + $title = T_('Catalog Updated'); $body = ''; show_confirmation($title,$body,$url); toggle_visible('ajax-loading'); @@ -120,13 +120,13 @@ switch ($_REQUEST['action']) { /* Delete the sucker, we don't need to check perms as thats done above */ Catalog::delete($_GET['catalog_id']); $next_url = Config::get('web_path') . '/admin/catalog.php'; - show_confirmation(_('Catalog Deleted'),_('The Catalog and all associated records have been deleted'),$next_url); + show_confirmation(T_('Catalog Deleted'), T_('The Catalog and all associated records have been deleted'),$next_url); break; case 'show_delete_catalog': $catalog_id = scrub_in($_GET['catalog_id']); $next_url = Config::get('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($catalog_id); - show_confirmation(_('Catalog Delete'),_('Confirm Deletion Request'),$next_url,1,'delete_catalog'); + show_confirmation(T_('Catalog Delete'), T_('Confirm Deletion Request'),$next_url,1,'delete_catalog'); break; case 'remove_disabled': if (conf('demo_mode')) { break; } @@ -138,7 +138,7 @@ switch ($_REQUEST['action']) { $body = ngettext('Song Removed', 'Songs Removed', count($song)); } else { - $body = _('No Songs Removed'); + $body = T_('No Songs Removed'); } $url = Config::get('web_path') . '/admin/catalog.php'; $title = ngettext('Disabled Song Processed','Disabled Songs Processed',count($song)); @@ -163,7 +163,7 @@ switch ($_REQUEST['action']) { } $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Catalog Cleaned'); + $title = T_('Catalog Cleaned'); $body = ''; show_confirmation($title,$body,$url); toggle_visible('ajax-loading'); @@ -176,7 +176,7 @@ switch ($_REQUEST['action']) { Catalog::update_settings($_POST); $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Catalog Updated'); + $title = T_('Catalog Updated'); $body = ''; show_confirmation($title,$body,$url); break; @@ -207,14 +207,14 @@ switch ($_REQUEST['action']) { ob_end_flush(); if (!strlen($_POST['path']) || !strlen($_POST['name'])) { - Error::add('general',_('Error: Name and path not specified')); + Error::add('general', T_('Error: Name and path not specified')); } if (substr($_POST['path'],0,7) != 'http://' && $_POST['type'] == 'remote') { - Error::add('general',_('Error: Remote selected, but path is not a URL')); + Error::add('general', T_('Error: Remote selected, but path is not a URL')); } if ($POST['type'] == 'remote' AND (!strlen($POST['remote_username']) OR !strlen($POST['remote_password']))) { - Error::add('general',_('Error: Username and Password Required for Remote Catalogs')); + Error::add('general', T_('Error: Username and Password Required for Remote Catalogs')); } if (!Core::form_verify('add_catalog','post')) { @@ -224,7 +224,7 @@ switch ($_REQUEST['action']) { // Make sure that there isn't a catalog with a directory above this one if (Catalog::get_from_path($_POST['path'])) { - Error::add('general',_('Error: Defined Path is inside an existing catalog')); + Error::add('general', T_('Error: Defined Path is inside an existing catalog')); } // If an error hasn't occured @@ -242,8 +242,8 @@ switch ($_REQUEST['action']) { // Run our initial add $catalog->run_add($_POST); - show_box_top(_('Catalog Created'), 'box box_catalog_created'); - echo "<h2>" . _('Catalog Created') . "</h2>"; + show_box_top(T_('Catalog Created'), 'box box_catalog_created'); + echo "<h2>" . T_('Catalog Created') . "</h2>"; Error::display('general'); Error::display('catalog_add'); show_box_bottom(); @@ -260,7 +260,7 @@ switch ($_REQUEST['action']) { Catalog::clear_stats(); $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Catalog statistics cleared'); + $title = T_('Catalog statistics cleared'); $body = ''; show_confirmation($title,$body,$url); break; @@ -274,7 +274,7 @@ switch ($_REQUEST['action']) { case 'clear_now_playing': if (Config::get('demo_mode')) { access_denied(); break; } Stream::clear_now_playing(); - show_confirmation(_('Now Playing Cleared'),_('All now playing data has been cleared'),Config::get('web_path') . '/admin/catalog.php'); + show_confirmation(T_('Now Playing Cleared'), T_('All now playing data has been cleared'),Config::get('web_path') . '/admin/catalog.php'); break; case 'show_disabled': /* Stop the demo hippies */ @@ -285,7 +285,7 @@ switch ($_REQUEST['action']) { require (conf('prefix') . '/templates/show_disabled_songs.inc.php'); } else { - echo "<div class=\"error\" align=\"center\">" . _('No Disabled songs found') . "</div>"; + echo "<div class=\"error\" align=\"center\">" . T_('No Disabled songs found') . "</div>"; } break; case 'show_delete_catalog': @@ -294,7 +294,7 @@ switch ($_REQUEST['action']) { $catalog = new Catalog($_REQUEST['catalog_id']); $nexturl = Config::get('web_path') . '/admin/catalog.php?action=delete_catalog&catalog_id=' . scrub_out($_REQUEST['catalog_id']); - show_confirmation(_('Delete Catalog'),_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1); + show_confirmation(T_('Delete Catalog'), T_('Do you really want to delete this catalog?') . " -- $catalog->name ($catalog->path)",$nexturl,1); break; case 'show_customize_catalog': $catalog = new Catalog($_REQUEST['catalog_id']); @@ -314,7 +314,7 @@ switch ($_REQUEST['action']) { $catalog->get_art('',1); } $url = Config::get('web_path') . '/admin/catalog.php'; - $title = _('Album Art Search Finished'); + $title = T_('Album Art Search Finished'); $body = ''; show_confirmation($title,$body,$url); break; diff --git a/admin/flag.php b/admin/flag.php index d0201302..6bd87729 100644 --- a/admin/flag.php +++ b/admin/flag.php @@ -84,7 +84,7 @@ switch ($_REQUEST['action']) { if (isset($cleaned['artist']) || isset($cleaned['album'])) { $_SESSION['source'] = Config::get('web_path') . '/index.php'; } - show_confirmation(_('Song Updated'),_('The requested song has been updated'),$_SESSION['source']); + show_confirmation(T_('Song Updated'), T_('The requested song has been updated'),$_SESSION['source']); break; // Show the page for editing a full album case 'show_edit_album': @@ -126,7 +126,7 @@ switch ($_REQUEST['action']) { // Clean out the old album $catalog->clean_albums(); - show_confirmation(_('Album Updated'),'',Config::get('web_path') . '/admin/index.php'); + show_confirmation(T_('Album Updated'),'',Config::get('web_path') . '/admin/index.php'); break; // Show the page for editing a full artist @@ -168,7 +168,7 @@ switch ($_REQUEST['action']) { // Clean out the old artist(s) $catalog->clean_artists(); - show_confirmation(_('Artist Updated'),'',Config::get('web_path') . '/admin/index.php'); + show_confirmation(T_('Artist Updated'),'',Config::get('web_path') . '/admin/index.php'); break; /* Done by 'Select' code passes array of song ids */ @@ -229,7 +229,7 @@ switch ($_REQUEST['action']) { } // end foreach songs // Show a confirmation that this worked - show_confirmation(_('Songs Updated'),'',return_referer()); + show_confirmation(T_('Songs Updated'),'',return_referer()); break; case 'reject_flag': $flag_id = scrub_in($_REQUEST['flag_id']); @@ -237,8 +237,8 @@ switch ($_REQUEST['action']) { $flag->delete_flag(); $flag->format_name(); $url = return_referer(); - $title = _('Flag Removed'); - $body = _('Flag Removed from') . " " . $flag->name; + $title = T_('Flag Removed'); + $body = T_('Flag Removed from') . " " . $flag->name; show_confirmation($title,$body,$url); break; case 'reject_flags': @@ -253,7 +253,7 @@ switch ($_REQUEST['action']) { $flag->approve(); } } // end foreach flags - $title = _('Flags Updated'); + $title = T_('Flags Updated'); show_confirmation($title,'',return_referer()); break; case 'show_edit_song': @@ -272,7 +272,7 @@ switch ($_REQUEST['action']) { $song_obj->update_enabled(0,$song_id); } // end foreach } // end else - show_confirmation(_('Songs Disabled'),_('The requested song(s) have been disabled'),return_referer()); + show_confirmation(T_('Songs Disabled'), T_('The requested song(s) have been disabled'),return_referer()); break; case 'enabled': $song_obj = new Song(); @@ -283,7 +283,7 @@ switch ($_REQUEST['action']) { $song_obj->update_enabled(1,$song_id); } // end foreach } // end else - show_confirmation(_('Songs Enabled'),_('The requested song(s) have been enabled'),return_referer()); + show_confirmation(T_('Songs Enabled'), T_('The requested song(s) have been enabled'),return_referer()); break; case 'show_disabled': $disabled = Flag::get_disabled(); diff --git a/admin/mail.php b/admin/mail.php index 29fb800c..595abab7 100644 --- a/admin/mail.php +++ b/admin/mail.php @@ -64,12 +64,12 @@ switch ($_REQUEST['action']) { } if($mailer->send_to_group($_REQUEST['to'])) { - $title = _('E-mail Sent'); - $body = _('Your E-mail was successfully sent.'); + $title = T_('E-mail Sent'); + $body = T_('Your E-mail was successfully sent.'); } else { - $title = _('E-mail Not Sent'); - $body = _('Your E-mail was not sent.'); + $title = T_('E-mail Not Sent'); + $body = T_('Your E-mail was not sent.'); } $url = Config::get('web_path') . '/admin/mail.php'; show_confirmation($title,$body,$url); diff --git a/admin/modules.php b/admin/modules.php index 846e7b2d..5ca03eb2 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -41,7 +41,7 @@ switch ($_REQUEST['action']) { case 'install_localplay': $localplay = new Localplay($_REQUEST['type']); if (!$localplay->player_loaded()) { - Error::add('general',_('Install Failed, Controller Error')); + Error::add('general', T_('Install Failed, Controller Error')); Error::display('general'); break; } @@ -59,7 +59,7 @@ switch ($_REQUEST['action']) { case 'confirm_uninstall_localplay': $type = scrub_in($_REQUEST['type']); $url = Config::get('web_path') . '/admin/modules.php?action=uninstall_localplay&type=' . $type; - $title = _('Are you sure you want to remove this plugin?'); + $title = T_('Are you sure you want to remove this plugin?'); $body = ''; show_confirmation($title,$body,$url,1); break; @@ -71,7 +71,7 @@ switch ($_REQUEST['action']) { /* Show Confirmation */ $url = Config::get('web_path') . '/admin/modules.php?action=show_localplay'; - $title = _('Plugin Deactivated'); + $title = T_('Plugin Deactivated'); $body = ''; show_confirmation($title,$body,$url); break; @@ -86,7 +86,7 @@ switch ($_REQUEST['action']) { if (!$plugin->install()) { debug_event('plugins','Error: Plugin Install Failed, ' . $_REQUEST['plugin'],'1'); $url = Config::get('web_path') . '/admin/modules.php?action=show_plugins'; - $title = _('Unable to Install Plugin'); + $title = T_('Unable to Install Plugin'); $body = ''; show_confirmation($title,$body,$url); break; @@ -97,14 +97,14 @@ switch ($_REQUEST['action']) { /* Show Confirmation */ $url = Config::get('web_path') . '/admin/modules.php?action=show_plugins'; - $title = _('Plugin Activated'); + $title = T_('Plugin Activated'); $body = ''; show_confirmation($title,$body,$url); break; case 'confirm_uninstall_plugin': $plugin = scrub_in($_REQUEST['plugin']); $url = Config::get('web_path') . '/admin/modules.php?action=uninstall_plugin&plugin=' . $plugin; - $title = _('Are you sure you want to remove this plugin?'); + $title = T_('Are you sure you want to remove this plugin?'); $body = ''; show_confirmation($title,$body,$url,1); break; @@ -123,7 +123,7 @@ switch ($_REQUEST['action']) { /* Show Confirmation */ $url = Config::get('web_path') . '/admin/modules.php?action=show_plugins'; - $title = _('Plugin Deactivated'); + $title = T_('Plugin Deactivated'); $body = ''; show_confirmation($title,$body,$url); break; @@ -138,19 +138,19 @@ switch ($_REQUEST['action']) { $plugin->upgrade(); User::rebuild_all_preferences(); $url = Config::get('web_path') . '/admin/modules.php?action=show_plugins'; - $title = _('Plugin Upgraded'); + $title = T_('Plugin Upgraded'); $body = ''; show_confirmation($title, $body, $url); break; case 'show_plugins': $plugins = Plugin::get_plugins(); - show_box_top(_('Plugins'), 'box box_localplay_plugins'); + show_box_top(T_('Plugins'), 'box box_localplay_plugins'); require_once Config::get('prefix') . '/templates/show_plugins.inc.php'; show_box_bottom(); break; case 'show_localplay': $controllers = Localplay::get_controllers(); - show_box_top(_('Localplay Controllers'), 'box box_localplay_controllers'); + show_box_top(T_('Localplay Controllers'), 'box box_localplay_controllers'); require_once Config::get('prefix') . '/templates/show_localplay_controllers.inc.php'; show_box_bottom(); break; diff --git a/admin/shout.php b/admin/shout.php index 6140b901..53bd8338 100644 --- a/admin/shout.php +++ b/admin/shout.php @@ -40,7 +40,7 @@ switch ($_REQUEST['action']) { case 'edit_shout': $shout_id = $_POST['shout_id']; $update = shoutBox::update($_POST); - show_confirmation(_('Shoutbox Post Updated'),'',Config::get('web_path').'/admin/shout.php'); + show_confirmation(T_('Shoutbox Post Updated'),'',Config::get('web_path').'/admin/shout.php'); break; case 'show_edit': $shout = new shoutBox($_REQUEST['shout_id']); @@ -52,7 +52,7 @@ switch ($_REQUEST['action']) { break; case 'delete': $shout_id = shoutBox::delete($_REQUEST['shout_id']); - show_confirmation(_('Shoutbox Post Deleted'),'',Config::get('web_path').'/admin/shout.php'); + show_confirmation(T_('Shoutbox Post Deleted'),'',Config::get('web_path').'/admin/shout.php'); break; default: $browse = new Browse(); diff --git a/admin/system.php b/admin/system.php index eefc1d7f..d3a2f816 100644 --- a/admin/system.php +++ b/admin/system.php @@ -51,7 +51,7 @@ switch ($_REQUEST['action']) { break; case 'reset_db_charset': Dba::reset_db_charset(); - show_confirmation(_('Database Charset Updated'),_('Your Database and associated tables have been updated to match your currently configured charset'), Config::get('web_path').'/admin/system.php?action=show_debug'); + show_confirmation(T_('Database Charset Updated'), T_('Your Database and associated tables have been updated to match your currently configured charset'), Config::get('web_path').'/admin/system.php?action=show_debug'); break; case 'show_debug': $configuration = Config::get_all(); diff --git a/admin/users.php b/admin/users.php index 16e87351..7c650193 100644 --- a/admin/users.php +++ b/admin/users.php @@ -59,10 +59,10 @@ switch ($_REQUEST['action']) { /* Verify Input */ if (empty($username)) { - Error::add('username',_("Error Username Required")); + Error::add('username', T_("Error Username Required")); } if ($pass1 !== $pass2 && !empty($pass1)) { - Error::add('password',_("Error Passwords don't match")); + Error::add('password', T_("Error Passwords don't match")); } /* If we've got an error then break! */ @@ -87,7 +87,7 @@ switch ($_REQUEST['action']) { $client->update_password($pass1); } - show_confirmation(_('User Updated'), $client->fullname . "(" . $client->username . ")" . _('updated'), Config::get('web_path'). '/admin/users.php'); + show_confirmation(T_('User Updated'), $client->fullname . "(" . $client->username . ")" . T_('updated'), Config::get('web_path'). '/admin/users.php'); break; case 'add_user': if (Config::get('demo_mode')) { break; } @@ -105,23 +105,23 @@ switch ($_REQUEST['action']) { $pass2 = $_POST['password_2']; if ($pass1 !== $pass2 || !strlen($pass1)) { - Error::add('password',_("Error Passwords don't match")); + Error::add('password', T_("Error Passwords don't match")); } if (empty($username)) { - Error::add('username',_('Error Username Required')); + Error::add('username', T_('Error Username Required')); } /* make sure the username doesn't already exist */ if (!User::check_username($username)) { - Error::add('username',_('Error Username already exists')); + Error::add('username', T_('Error Username already exists')); } if (!Error::occurred()) { /* Attempt to create the user */ $user_id = User::create($username, $fullname, $email, $pass1, $access); if (!$user_id) { - Error::add('general',_("Error: Insert Failed")); + Error::add('general', T_("Error: Insert Failed")); } } // if no errors @@ -129,25 +129,25 @@ switch ($_REQUEST['action']) { $_REQUEST['action'] = 'show_add_user'; break; } - if ($access == 5){ $access = _('Guest');} - elseif ($access == 25){ $access = _('User');} - elseif ($access == 100){ $access = _('Admin');} + if ($access == 5){ $access = T_('Guest');} + elseif ($access == 25){ $access = T_('User');} + elseif ($access == 100){ $access = T_('Admin');} /* HINT: %1 Username, %2 Access num */ - show_confirmation(_('New User Added'),sprintf(_('%1$s has been created with an access level of %2$s'), $username, $access), Config::get('web_path').'/admin/users.php'); + show_confirmation(T_('New User Added'),sprintf(T_('%1$s has been created with an access level of %2$s'), $username, $access), Config::get('web_path').'/admin/users.php'); break; case 'enable': $client = new User($_REQUEST['user_id']); $client->enable(); - show_confirmation(_('User Enabled'),$client->fullname . ' (' . $client->username . ')', Config::get('web_path'). '/admin/users.php'); + show_confirmation(T_('User Enabled'),$client->fullname . ' (' . $client->username . ')', Config::get('web_path'). '/admin/users.php'); break; case 'disable': $client = new User($_REQUEST['user_id']); if ($client->disable()) { - show_confirmation(_('User Disabled'),$client->fullname . ' (' . $client->username . ')', Config::get('web_path'). '/admin/users.php'); + show_confirmation(T_('User Disabled'),$client->fullname . ' (' . $client->username . ')', Config::get('web_path'). '/admin/users.php'); } else { - show_confirmation(_('Error'),_('Unable to Disabled last Administrator'), Config::get('web_path').'/admin/users.php'); + show_confirmation(T_('Error'), T_('Unable to Disabled last Administrator'), Config::get('web_path').'/admin/users.php'); } break; case 'show_edit': @@ -163,17 +163,17 @@ switch ($_REQUEST['action']) { } $client = new User($_REQUEST['user_id']); if ($client->delete()) { - show_confirmation(_('User Deleted'), sprintf(_('%s has been Deleted'), $client->username), Config::get('web_path'). "/admin/users.php"); + show_confirmation(T_('User Deleted'), sprintf(T_('%s has been Deleted'), $client->username), Config::get('web_path'). "/admin/users.php"); } else { - show_confirmation(_('Delete Error'), _("Unable to delete last Admin User"), Config::get('web_path')."/admin/users.php"); + show_confirmation(T_('Delete Error'), T_("Unable to delete last Admin User"), Config::get('web_path')."/admin/users.php"); } break; case 'delete': if (Config::get('demo_mode')) { break; } $client = new User($_REQUEST['user_id']); - show_confirmation(_('Deletion Request'), - sprintf(_('Are you sure you want to permanently delete %s?'), $client->fullname), + show_confirmation(T_('Deletion Request'), + sprintf(T_('Are you sure you want to permanently delete %s?'), $client->fullname), Config::get('web_path')."/admin/users.php?action=confirm_delete&user_id=" . $_REQUEST['user_id'],1,'delete_user'); break; /* Show IP History for the Specified User */ @@ -36,14 +36,14 @@ switch ($_REQUEST['action']) { if (!$GLOBALS['user']->has_access('75')) { access_denied(); } $art = new Art($_GET['album_id'],'album'); $art->reset(); - show_confirmation(_('Album Art Cleared'),_('Album Art information has been removed from the database'),"/albums.php?action=show&album=" . $art->uid); + show_confirmation(T_('Album Art Cleared'), T_('Album Art information has been removed from the database'),"/albums.php?action=show&album=" . $art->uid); break; // Upload album art case 'upload_art': // we didn't find anything if (empty($_FILES['file']['tmp_name'])) { - show_confirmation(_('Album Art Not Located'),_('Album Art could not be located at this time. This may be due to write access error, or the file is not received correctly.'),"/albums.php?action=show&album=" . $album->id); + show_confirmation(T_('Album Art Not Located'), T_('Album Art could not be located at this time. This may be due to write access error, or the file is not received correctly.'),"/albums.php?action=show&album=" . $album->id); break; } @@ -56,11 +56,11 @@ switch ($_REQUEST['action']) { if ($image_data) { $art = new Art($album->id,'album'); $art->insert($image_data,$_FILES['file']['type']); - show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&album=" . $album->id); + show_confirmation(T_('Album Art Inserted'),'',"/albums.php?action=show&album=" . $album->id); } // Else it failed else { - show_confirmation(_('Album Art Not Located'),_('Album Art could not be located at this time. This may be due to write access error, or the file is not received correctly.'),"/albums.php?action=show&album=" . $album->id); + show_confirmation(T_('Album Art Not Located'), T_('Album Art could not be located at this time. This may be due to write access error, or the file is not received correctly.'),"/albums.php?action=show&album=" . $album->id); } break; @@ -84,7 +84,7 @@ switch ($_REQUEST['action']) { if ($image_data) { $art->insert($image_data,$upload['0']['mime']); - show_confirmation(_('Album Art Inserted'),'',"/albums.php?action=show&album=" . $_REQUEST['album_id']); + show_confirmation(T_('Album Art Inserted'),'',"/albums.php?action=show&album=" . $_REQUEST['album_id']); break; } // if image data @@ -133,7 +133,7 @@ switch ($_REQUEST['action']) { } // Else nothing else { - show_confirmation(_('Album Art Not Located'),_('Album Art could not be located at this time. This may be due to write access error, or the file is not received correctly.'),"/albums.php?action=show&album=" . $album->id); + show_confirmation(T_('Album Art Not Located'), T_('Album Art could not be located at this time. This may be due to write access error, or the file is not received correctly.'),"/albums.php?action=show&album=" . $album->id); } $albumname = $album->name; diff --git a/artists.php b/artists.php index 7f57df4c..c7a75b73 100644 --- a/artists.php +++ b/artists.php @@ -75,20 +75,20 @@ switch($_REQUEST['action']) { $that_artist->merge($artist->id); $count++; } else - $GLOBALS['error']->add_error('general', sprintf(_('Error: No such artist \'%s\''), $artist_id)); + $GLOBALS['error']->add_error('general', sprintf(T_('Error: No such artist \'%s\''), $artist_id)); } else { - $GLOBALS['error']->add_error('general', sprintf(_('Error: \'%s\' is not a valid ID'), $artist_id)); + $GLOBALS['error']->add_error('general', sprintf(T_('Error: \'%s\' is not a valid ID'), $artist_id)); } } else - $GLOBALS['error']->add_error('general', sprintf(_('Error: No such artist \'%s\''), $_REQUEST['artist'])); + $GLOBALS['error']->add_error('general', sprintf(T_('Error: No such artist \'%s\''), $_REQUEST['artist'])); } else { - $GLOBALS['error']->add_error('general',_("Error: Errenous request")); + $GLOBALS['error']->add_error('general', T_("Error: Errenous request")); } if ($count > 0) { show_confirmation ( - _('Renamed artist(s)'), - sprintf(_('%1$s artists have been merged with %2$s'), $count, $artist->name), + T_('Renamed artist(s)'), + sprintf(T_('%1$s artists have been merged with %2$s'), $count, $artist->name), conf('web_path') . "/artists.php?action=show&artist=" . $artist->id ); } else { @@ -167,8 +167,8 @@ switch($_REQUEST['action']) { // show something other than a blank screen after this if ($ret) { show_confirmation ( - _('Renamed artist'), - sprintf(_('%1$s is now known as %2$s'), $artist->name, $newname), + T_('Renamed artist'), + sprintf(T_('%1$s is now known as %2$s'), $artist->name, $newname), conf('web_path') . "/artists.php?action=show&artist=" . $newid ); } @@ -192,7 +192,7 @@ switch($_REQUEST['action']) { /* Enclose this in the purty box! */ require (conf('prefix') . '/templates/show_box_top.inc.php'); show_alphabet_list('artists','artists.php',$match); - show_alphabet_form($chr,_('Show Artists starting with'),"artists.php?action=match"); + show_alphabet_form($chr, T_('Show Artists starting with'),"artists.php?action=match"); require (conf('prefix') . '/templates/show_box_bottom.inc.php'); if ($match === "Browse") { diff --git a/bin/catalog_update.inc b/bin/catalog_update.inc index e30917ef..2a324bb6 100644 --- a/bin/catalog_update.inc +++ b/bin/catalog_update.inc @@ -42,30 +42,30 @@ $thumbadd =0; $artadd = 0; if (count($_SERVER['argv']) == 1) { - $operations_string = "\n\t". _('- All Catalog Operations'); + $operations_string = "\n\t". T_('- All Catalog Operations'); } if (count($_SERVER['argv']) > 1) { for ($x = 1; $x < count($_SERVER['argv']); $x++) { if ($_SERVER['argv'][$x] == "-c") { - $operations_string .= "\n\t"._('- Catalog Clean'); + $operations_string .= "\n\t" . T_('- Catalog Clean'); $catclean = 1; } elseif ($_SERVER['argv'][$x] == "-v") { - $operations_string .= "\n\t"._('- Catalog Verify'); + $operations_string .= "\n\t" . T_('- Catalog Verify'); $catverify = 1; } elseif ($_SERVER['argv'][$x] == "-a") { - $operations_string .= "\n\t"._('- Catalog Add'); + $operations_string .= "\n\t" . T_('- Catalog Add'); $catadd = 1; } elseif ($_SERVER['argv'][$x] == "-g") { - $operations_string .= "\n\t"._('- Catalog Art Gather'); + $operations_string .= "\n\t" . T_('- Catalog Art Gather'); $artadd = 1; } elseif ($_SERVER['argv'][$x] == '-t') { - $operations_string .= "\n\t"._('- Generate Thumbnails'); + $operations_string .= "\n\t" . T_('- Generate Thumbnails'); $thumbadd = 1; } else { @@ -88,7 +88,7 @@ if ($thumbadd == 0 && $artadd == 0 && $catclean == 0 && $catverify == 0 && $cata $thumbadd = 1; } -echo _("Starting Catalog Operations...") . $operations_string . "\n"; +echo T_("Starting Catalog Operations...") . $operations_string . "\n"; if ($where) $where = "($where) AND catalog_type='local'"; else $where = "catalog_type='local'"; @@ -101,12 +101,12 @@ ob_start("ob_html_strip",'1024',true); while ($row = Dba::fetch_row($db_results)) { $catalog = new Catalog($row['0']); - printf(_('Reading: %s'), $catalog->name); + printf(T_('Reading: %s'), $catalog->name); ob_flush(); echo "\n"; if ($catclean == 1) { // Clean out dead files - echo _("- Starting Clean - "); + echo T_("- Starting Clean - "); echo "\n"; $catalog->clean_catalog(); echo "------------------\n\n"; @@ -114,7 +114,7 @@ while ($row = Dba::fetch_row($db_results)) { if ($catverify == 1) { // Verify Existing - echo _("- Starting Verify - "); + echo T_("- Starting Verify - "); echo "\n"; $catalog->verify_catalog($row['0']); echo "-------------------\n\n"; @@ -122,7 +122,7 @@ while ($row = Dba::fetch_row($db_results)) { if ($catadd == 1) { // Look for new files - echo _("- Starting Add - "); + echo T_("- Starting Add - "); echo "\n"; $catalog->add_to_catalog(); echo "----------------\n\n"; @@ -130,7 +130,7 @@ while ($row = Dba::fetch_row($db_results)) { if ($artadd == 1) { // Look for album art - echo _('Starting Album Art Search'); + echo T_('Starting Album Art Search'); echo "\n"; $catalog->get_art('',1); echo "----------------\n\n"; @@ -138,7 +138,7 @@ while ($row = Dba::fetch_row($db_results)) { if ($thumbadd == 1) { // Generate the thumbnails - echo _('Generating Thumbnails'); + echo T_('Generating Thumbnails'); echo "\n"; $catalog->generate_thumbnails(); echo "----------------\n\n"; @@ -165,21 +165,21 @@ function ob_html_strip($string) { } // ob_html_strip function usage() { - echo _("- Catalog Update -"); + echo T_("- Catalog Update -"); echo "\n"; - echo _("Usage: catalog_update.inc [CATALOG NAME] [-c|-v|-a|-g|-t]"); + echo T_("Usage: catalog_update.inc [CATALOG NAME] [-c|-v|-a|-g|-t]"); echo "\n\t"; - echo _("Default behavior is to do all"); + echo T_("Default behavior is to do all"); echo "\n-c\t"; - echo _('Clean Catalogs'); + echo T_('Clean Catalogs'); echo "\n-v\t"; - echo _('Verify Catalogs'); + echo T_('Verify Catalogs'); echo "\n-a\t"; - echo _('Add to Catalogs'); + echo T_('Add to Catalogs'); echo "\n-g\t"; - echo _('Gather Art'); + echo T_('Gather Art'); echo "\n-t\t"; - echo _('Generate Thumbnails'); + echo T_('Generate Thumbnails'); echo "\n"; echo "----------------------------------------------------------"; echo "\n"; diff --git a/bin/delete_disabled.inc b/bin/delete_disabled.inc index 05b097e7..476ffed4 100644 --- a/bin/delete_disabled.inc +++ b/bin/delete_disabled.inc @@ -40,7 +40,7 @@ $path = dirname(__FILE__); $prefix = realpath($path . '/../'); require_once $prefix . '/lib/init.php'; -if ($debug) { echo _("DEBUG ENABLED WILL NOT DELETE FILES!"); echo "\n"; } +if ($debug) { echo T_("DEBUG ENABLED WILL NOT DELETE FILES!"); echo "\n"; } /* Get a list of filenames */ $sql = "SELECT `id`,`file` FROM song WHERE enabled='0'"; @@ -48,11 +48,11 @@ $db_results = Dba::read($sql); while ($row = Dba::fetch_assoc($db_results)) { if ($debug) { - printf (_('Would Delete: %s'), $row['file']); + printf (T_('Would Delete: %s'), $row['file']); echo "\n"; } else { - printf (_('Deleting: %s'), $row['file']); + printf (T_('Deleting: %s'), $row['file']); echo "\n"; unlink($row['file']); $sql = "DELETE FROM `song` WHERE `id`='" . Dba::escape($row['id']) . "'"; diff --git a/bin/fix_filenames.inc b/bin/fix_filenames.inc index 4333f9e4..86b95539 100644 --- a/bin/fix_filenames.inc +++ b/bin/fix_filenames.inc @@ -45,7 +45,7 @@ ob_end_clean(); //$GLOBALS['i_am_crazy'] = true; if (!function_exists('iconv')) { - echo _("ERROR: Iconv required for this functionality, quiting"); + echo T_("ERROR: Iconv required for this functionality, quiting"); echo "\n"; exit; } @@ -54,19 +54,19 @@ if (!function_exists('iconv')) { $source_encoding = iconv_get_encoding('output_encoding'); // Attempt a simple translation -$string = sprintf(_('%s For the Love of Music'), iconv(Config::get('site_charset'),Config::get('site_charset'))); -echo _('Testing Basic Translation, the two strings below should look the same'); +$string = sprintf(T_('%s For the Love of Music'), iconv(Config::get('site_charset'),Config::get('site_charset'))); +echo T_('Testing Basic Translation, the two strings below should look the same'); echo "\n"; -echo _('Original: For the Love of Music'); +echo T_('Original: For the Love of Music'); echo "\n"; -printf (_('Translated: %s'), $string); +printf (T_('Translated: %s'), $string); echo "\n"; echo "---------------------------------------------------------------------\n"; -printf (_('Input Charset (%s):'), $source_encoding); +printf (T_('Input Charset (%s):'), $source_encoding); $input = trim(fgets(STDIN)); if (strlen($input) > 0) { $source_encoding = trim($input); } -printf (_('Using %s as source character set'), $source_encoding); +printf (T_('Using %s as source character set'), $source_encoding); echo "\n"; $sql = "SELECT * FROM `catalog` WHERE `catalog_type`='local'"; @@ -74,13 +74,13 @@ $db_results = Dba::read($sql); while ($row = Dba::fetch_assoc($db_results)) { - printf(_('Checking %s (%s)'), $row['name'], $row['path']); + printf(T_('Checking %s (%s)'), $row['name'], $row['path']); echo "\n"; charset_directory_correct($row['path']); } // end of the catalogs -echo _('Finished checking filenames for valid chacters'); +echo T_('Finished checking filenames for valid chacters'); echo "\n"; /************************************************** @@ -106,13 +106,13 @@ function charset_directory_correct($path) { $handle = opendir($path); if (!is_resource($handle)) { - printf (_('ERROR: Unable to open %s'), $path); + printf (T_('ERROR: Unable to open %s'), $path); echo "\n"; return false; } if (!chdir($path)) { - printf (_('ERROR: Unable to chdir to %s'), $path); + printf (T_('ERROR: Unable to chdir to %s'), $path); echo "\n"; return false; } @@ -135,24 +135,24 @@ function charset_directory_correct($path) { // Make sure the extension stayed the same if (substr($translated_filename,strlen($translated_filename)-3,3) != substr($full_file,strlen($full_file)-3,3)) { - echo _("Translation failure, stripping non-valid characters"); + echo T_("Translation failure, stripping non-valid characters"); echo "\n"; $translated_filename = iconv($source_encoding,Config::get('site_charset') . '//IGNORE',$full_file); } - printf (_('Attempting to Transcode to %s'), Config::get('site_charset')); + printf (T_('Attempting to Transcode to %s'), Config::get('site_charset')); echo "\n"; echo "--------------------------------------------------------------------------------------------\n"; - printf (_('OLD: %s has invalid chars'), $full_file); + printf (T_('OLD: %s has invalid chars'), $full_file); echo "\n"; - printf (_('NEW: %s'), $translated_filename); + printf (T_('NEW: %s'), $translated_filename); echo "\n"; echo "--------------------------------------------------------------------------------------------\n"; if (!$GLOBALS['i_am_crazy']) { - echo _("Rename File (Y/N):"); + echo T_("Rename File (Y/N):"); $input = trim(fgets(STDIN)); if (strcasecmp($input,'Y') == 0) { charset_rename_file($full_file,$translated_filename); } - else { echo "\n\t"; echo _('Not Renaming...'); echo "\n\n"; } + else { echo "\n\t"; echo T_('Not Renaming...'); echo "\n\n"; } } else { charset_rename_file($full_file,$translated_filename); @@ -184,7 +184,7 @@ function charset_rename_file($full_file,$translated_filename) { echo "\tMaking $path directory\n"; $results = mkdir($path); if (!$results) { - printf (_('Error: Unable to create %s move failed, stopping'), $path); + printf (T_('Error: Unable to create %s move failed, stopping'), $path); echo "\n"; return false; } @@ -196,7 +196,7 @@ function charset_rename_file($full_file,$translated_filename) { $results = copy($full_file,$translated_filename); if (!$results) { - echo _('Error: Copy Failed, not deleteing old file'); + echo T_('Error: Copy Failed, not deleteing old file'); echo "\n"; return false; } @@ -205,16 +205,16 @@ function charset_rename_file($full_file,$translated_filename) { $new_sum = filesize($translated_filename); if ($old_sum != $new_sum OR !$new_sum) { - printf (_('Error: Size Inconsistency, not deleting %s'), $full_file); + printf (T_('Error: Size Inconsistency, not deleting %s'), $full_file); echo "\n"; return false; } $results = unlink($full_file); - if (!$results) { printf (_('Error: Unable to delete %s'), $full_file); echo "\n"; return false; } + if (!$results) { printf (T_('Error: Unable to delete %s'), $full_file); echo "\n"; return false; } - echo _("File Moved..."); + echo T_("File Moved..."); echo "\n\n"; return true; diff --git a/bin/install/add_user.inc b/bin/install/add_user.inc index 7ce2a25b..d7655fc8 100644 --- a/bin/install/add_user.inc +++ b/bin/install/add_user.inc @@ -50,11 +50,11 @@ $email = isset($options['e']) ? $options['e'] : ''; $name = isset($options['n']) ? $options['n'] : ''; if (User::create($username, $name, $email, $password, $access)) { - printf(_('Created %s user %s with password %s'), _($access), $username, $password); + printf(T_('Created %s user %s with password %s'), T_($access), $username, $password); echo "\n"; } else { - echo _('User creation failed'), "\n"; + echo T_('User creation failed'), "\n"; exit(1); } diff --git a/bin/install/install_db.inc b/bin/install/install_db.inc index 5bc7c2d8..328b7d92 100644 --- a/bin/install/install_db.inc +++ b/bin/install/install_db.inc @@ -67,26 +67,26 @@ if (!$db_user || !$db_pass || !$db_host || !$db_name || !$new_db_user || !$new_d // Now let's make sure its not already installed if (!install_check_status($configfile)) { - echo "\n", _('Existing Ampache installation found.'), "\n"; + echo "\n", T_('Existing Ampache installation found.'), "\n"; if ($force) { - echo _('Force specified, proceeding anyway.'), "\n"; + echo T_('Force specified, proceeding anyway.'), "\n"; } else { - echo _('Exiting.'), "\n"; + echo T_('Exiting.'), "\n"; exit(1); } } // Install the database if (!install_insert_db($db_user, $db_pass, $db_host, $db_name, $new_db_user, $new_db_pass)) { - echo _('Database creation failed'), "\n"; + echo T_('Database creation failed'), "\n"; echo Error::get('general'), "\n\n"; exit(1); } // Write the config file if (!install_create_config($webpath, $new_db_user, $new_db_pass, $db_host, $db_name)) { - echo _('Config file creation failed'), "\n"; + echo T_('Config file creation failed'), "\n"; echo Error::get('general') . "\n\n"; exit(1); } diff --git a/bin/install/update_db.inc b/bin/install/update_db.inc index 425c1e0a..d9ea8bc7 100644 --- a/bin/install/update_db.inc +++ b/bin/install/update_db.inc @@ -45,7 +45,7 @@ if (Update::need_update() && $run_update) { } if (Update::need_update()) { - echo _('The following updates need to be performed:'), "\n"; + echo T_('The following updates need to be performed:'), "\n"; } Update::display_update(); diff --git a/bin/migrate_config.inc b/bin/migrate_config.inc index 5f0ea5fe..fef439da 100644 --- a/bin/migrate_config.inc +++ b/bin/migrate_config.inc @@ -53,7 +53,7 @@ $old_config = file_get_contents($prefix . '/config/ampache.cfg.php'); $data = explode("\n",$old_config); -echo _("Parsing old config file..."); +echo T_("Parsing old config file..."); echo "\n"; foreach ($data as $line) { @@ -83,7 +83,7 @@ foreach ($data as $line) { } // end foreach lines -echo _("Parse complete, writing"); +echo T_("Parse complete, writing"); echo "\n"; $handle = fopen($prefix . '/config/ampache.cfg.php','w'); @@ -91,11 +91,11 @@ $handle = fopen($prefix . '/config/ampache.cfg.php','w'); $worked = fwrite($handle,$new_config); if ($worked) { - echo _("Write success, config migrated"); + echo T_("Write success, config migrated"); echo "\n"; } else { - echo _("Access Denied, config migration failed"); + echo T_("Access Denied, config migration failed"); echo "\n"; } diff --git a/bin/print_tags.inc b/bin/print_tags.inc index 5ff0d300..765d12f7 100644 --- a/bin/print_tags.inc +++ b/bin/print_tags.inc @@ -41,13 +41,13 @@ if (count($GLOBALS['argv']) == '1') { } if(!file_exists($filename)) { - print _("File not found."); + print T_("File not found."); print "\n"; usage(); exit; } -printf(_('Reading: %s'), $filename); +printf(T_('Reading: %s'), $filename); print "\n"; /* Attempt to figure out what catalog it comes from */ @@ -62,7 +62,7 @@ $file_pattern = $catalog->rename_pattern; $info = new vainfo($filename, '', '', '', $dir_pattern, $file_pattern); if(isset($dir_pattern) || isset($file_pattern)) { - printf(_('Using: %s AND %s for file pattern matching'), $dir_pattern, $file_pattern); + printf(T_('Using: %s AND %s for file pattern matching'), $dir_pattern, $file_pattern); print "\n"; } $info->get_info(); @@ -79,22 +79,22 @@ if ($send_mail) { } echo "\n"; -echo _('Raw results:'); +echo T_('Raw results:'); echo "\n\n"; print_r($info); echo "\n------------------------------------------------------------------\n"; -printf(_('Final results seen by Ampache using %s:'), implode(' + ', $keys)); +printf(T_('Final results seen by Ampache using %s:'), implode(' + ', $keys)); echo "\n\n"; print_r($ampache_results); function usage() { global $version; - $text = sprintf(_('%s Version %s'), 'print_tags.inc', $version); + $text = sprintf(T_('%s Version %s'), 'print_tags.inc', $version); $text .= "\n\n"; - $text .= _('Usage:'); + $text .= T_('Usage:'); $text .= "\n"; - $text .= _('php print_tags.inc <Filename>'); + $text .= T_('php print_tags.inc <Filename>'); $text .= "\n\n"; return print $text; diff --git a/bin/sort_files.inc b/bin/sort_files.inc index 9acf4cb9..8ac8850b 100644 --- a/bin/sort_files.inc +++ b/bin/sort_files.inc @@ -64,7 +64,7 @@ while ($r = Dba::fetch_row($db_results)) { $catalog = new Catalog($r['0']); $songs = $catalog->get_catalog_files(); - printf (_('Starting Catalog: %s'), stripslashes($catalog->name)); + printf (T_('Starting Catalog: %s'), stripslashes($catalog->name)); echo "\n"; /* Foreach through each file and find it a home! */ @@ -79,11 +79,11 @@ while ($r = Dba::fetch_row($db_results)) { /* Check for Demo Mode */ if ($test_mode) { /* We're just talking here... no work */ - echo _("Moving File..."); + echo T_("Moving File..."); echo "\n\t"; - printf (_('Source: %s'), $song->file); + printf (T_('Source: %s'), $song->file); echo "\n\t"; - printf (_('Dest: %s'), $fullpath); + printf (T_('Dest: %s'), $fullpath); echo "\n"; flush(); } @@ -233,14 +233,14 @@ function sort_move_file($song,$fullname) { if (!is_dir($path)) { if ($GLOBALS['test_mode']) { echo "\t"; - printf (_('Making %s Directory'), $path); + printf (T_('Making %s Directory'), $path); echo "\n"; } else { debug_event('mkdir',"Creating $path directory",'5'); $results = mkdir($path); if (!$results) { - printf (_('Error: Unable to create %s move failed'), $path); + printf (T_('Error: Unable to create %s move failed'), $path); echo "\n"; return false; } @@ -253,7 +253,7 @@ function sort_move_file($song,$fullname) { if ($GLOBALS['test_mode']) { echo "\t"; // HINT: %1$s: file, %2$s: directory - printf (_('Copying %1$s to %2$s'), $file, $directory); + printf (T_('Copying %1$s to %2$s'), $file, $directory); echo "\n"; $sql = "UPDATE song SET file='" . Dba::escape($fullname) . "' WHERE id='" . Dba::escape($song->id) . "'"; echo "\tSQL: $sql\n"; @@ -264,7 +264,7 @@ function sort_move_file($song,$fullname) { /* Check for file existance */ if (file_exists($fullname)) { debug_event('file exists','Error: $fullname already exists','1'); - printf (_('Error: %s already exists'), $filename); + printf (T_('Error: %s already exists'), $filename); echo "\n"; return false; } @@ -285,21 +285,21 @@ function sort_move_file($song,$fullname) { debug_event('copy_art','Copied ' . $old_art . ' to ' . $folder_art,'5'); @copy($old_art,$folder_art); - if (!$results) { printf (_('Error: Unable to copy file to %s'), $fullname); echo "\n"; return false; } + if (!$results) { printf (T_('Error: Unable to copy file to %s'), $fullname); echo "\n"; return false; } /* Check the filesize */ $new_sum = filesize($fullname); $old_sum = filesize($song->file); if ($new_sum != $old_sum OR !$new_sum) { - printf (_('Error: Size Inconsistency, not deleting %s'), $song->file); + printf (T_('Error: Size Inconsistency, not deleting %s'), $song->file); echo "\n"; return false; } // end if sum's don't match /* If we've made it this far it should be safe */ $results = unlink($song->file); - if (!$results) { printf (_('Error: Unable to delete %s'), $song->file); echo "\n"; } + if (!$results) { printf (T_('Error: Unable to delete %s'), $song->file); echo "\n"; } /* Update the catalog */ $sql = "UPDATE song SET file='" . Dba::escape($fullname) . "' WHERE id='" . Dba::escape($song->id) . "'"; diff --git a/bin/write_playlists.inc b/bin/write_playlists.inc index 8ee857fb..b62a217c 100644 --- a/bin/write_playlists.inc +++ b/bin/write_playlists.inc @@ -45,7 +45,7 @@ else { // Make sure the output dir is valid and writeable if (!is_writeable($dirname)) { - printf (_('Error: Directory %s not writeable'), $dirname); + printf (T_('Error: Directory %s not writeable'), $dirname); echo "\n"; } @@ -66,11 +66,11 @@ switch ($type) { /* FUNCTIONS */ function usage() { -$desc1 = _("This will dump a collection of m3u playlists based on type"); -$desc2 = _("Types:"); -$desc3 = _("Dumps all Albums as individual playlists"); -$desc4 = _("Dumps all of your Playlists as m3u's"); -$desc5 = _("Dumps all Artists as individual playlists"); +$desc1 = T_("This will dump a collection of m3u playlists based on type"); +$desc2 = T_("Types:"); +$desc3 = T_("Dumps all Albums as individual playlists"); +$desc4 = T_("Dumps all of your Playlists as m3u's"); +$desc5 = T_("Dumps all Artists as individual playlists"); $string = "write_playlists.php.inc [-h] <DIRNAME> <TYPE> diff --git a/bin/write_tags.inc b/bin/write_tags.inc index 518b49e9..2fe1154d 100644 --- a/bin/write_tags.inc +++ b/bin/write_tags.inc @@ -39,7 +39,7 @@ $prefix = realpath($path . '/../'); require_once $prefix . '/lib/init.php'; // This is all broken currently so just jump ship -echo _("Writting of Tags to files is not currently supported by Getid3() use at your own risk."); +echo T_("Writting of Tags to files is not currently supported by Getid3() use at your own risk."); echo "\n"; flush(); @@ -51,7 +51,7 @@ $flag = new Flag(); $flagged_ids = Flag::get_approved(); if (!count($flagged_ids)) { - echo _("No Flagged Songs Found, exiting..."); + echo T_("No Flagged Songs Found, exiting..."); echo "\n"; exit; } @@ -79,7 +79,7 @@ foreach($flagged_ids as $flagged) { Flag::fill_tags( &$tagWriter, &$song, 'comment' ); break; default: - echo _('No Tag'); + echo T_('No Tag'); } // end switch if ( isset($tagWriter) ) { @@ -88,7 +88,7 @@ foreach($flagged_ids as $flagged) { try { $tagWriter->write(); // HINT: %1$s: title, %2$s: artist_name - printf (_('Updated song %1$s by %2$s'), $song->title, $song->get_artist_name()); + printf (T_('Updated song %1$s by %2$s'), $song->title, $song->get_artist_name()); echo "\n"; flush(); $flag->delete(); @@ -76,7 +76,7 @@ switch($_REQUEST['action']) { $object_ids = $browse->get_saved(); $keys = array_keys($object_ids); Tag::build_cache($keys); - show_box_top(_('Tag Cloud'), 'box box_tag_cloud'); + show_box_top(T_('Tag Cloud'), 'box box_tag_cloud'); $browse2 = new Browse(); $browse2->set_type('song'); $browse2->store(); diff --git a/democratic.php b/democratic.php index 8f85f2f5..f8644dbe 100644 --- a/democratic.php +++ b/democratic.php @@ -60,7 +60,7 @@ switch ($_REQUEST['action']) { Democratic::delete($_REQUEST['democratic_id']); $title = ''; - $text = _('The Requested Playlist has been deleted.'); + $text = T_('The Requested Playlist has been deleted.'); $url = Config::get('web_path') . '/democratic.php?action=manage_playlists'; show_confirmation($title,$text,$url); break; @@ -48,7 +48,7 @@ switch ($action) { $flag_type = scrub_in($_REQUEST['flag_type']); $comment = scrub_in($_REQUEST['comment']); $flag->add($id,$type,$flag_type,$comment); - show_confirmation(_('Item Flagged'),_('The specified item has been flagged'),$_SESSION['source_page']); + show_confirmation(T_('Item Flagged'), T_('The specified item has been flagged'),$_SESSION['source_page']); break; case 'show_flag': /* Store where they came from */ diff --git a/install.php b/install.php index 9c52aad3..4ed840b5 100644 --- a/install.php +++ b/install.php @@ -87,7 +87,7 @@ switch ($_REQUEST['action']) { $charset = $_REQUEST['charset']; // Test and make sure that the values they give us actually work if (!check_database($hostname,$username,$password)) { - Error::add('config',_('Error: Unable to make Database Connection') . mysql_error()); + Error::add('config', T_('Error: Unable to make Database Connection') . mysql_error()); } // Was download pressed? @@ -175,7 +175,7 @@ switch ($_REQUEST['action']) { /* Make sure we've got a valid config file */ if (!check_config_values($results)) { - Error::add('general',_('Error: Config file not found or Unreadable')); + Error::add('general', T_('Error: Config file not found or Unreadable')); require_once Config::get('prefix') . '/templates/show_install_config.inc.php'; break; } diff --git a/lib/class/access.class.php b/lib/class/access.class.php index d2227701..578ba32b 100644 --- a/lib/class/access.class.php +++ b/lib/class/access.class.php @@ -160,17 +160,17 @@ class Access { $end = @inet_pton($data['end']); if (!$start AND $data['start'] != '0.0.0.0' AND $data['start'] != '::') { - Error::add('start',_('Invalid IPv4 / IPv6 Address Entered')); + Error::add('start', T_('Invalid IPv4 / IPv6 Address Entered')); return false; } if (!$end) { - Error::add('end',_('Invalid IPv4 / IPv6 Address Entered')); + Error::add('end', T_('Invalid IPv4 / IPv6 Address Entered')); return false; } if (strlen(bin2hex($start)) != strlen(bin2hex($end))) { - Error::add('start',_('IP Address Version Mismatch')); - Error::add('end',_('IP Address Version Mismatch')); + Error::add('start', T_('IP Address Version Mismatch')); + Error::add('end', T_('IP Address Version Mismatch')); return false; } @@ -207,24 +207,24 @@ class Access { $end = @inet_pton($data['end']); if (!$start AND $data['start'] != '0.0.0.0' AND $data['start'] != '::') { - Error::add('start',_('Invalid IPv4 / IPv6 Address Entered')); + Error::add('start', T_('Invalid IPv4 / IPv6 Address Entered')); return false; } if (!$end) { - Error::add('end',_('Invalid IPv4 / IPv6 Address Entered')); + Error::add('end', T_('Invalid IPv4 / IPv6 Address Entered')); return false; } if (strlen(bin2hex($start)) != strlen(bin2hex($end))) { - Error::add('start',_('IP Address Version Mismatch')); - Error::add('end',_('IP Address Version Mismatch')); + Error::add('start', T_('IP Address Version Mismatch')); + Error::add('end', T_('IP Address Version Mismatch')); return false; } // Check existing ACL's to make sure we're not duplicating values here if (self::exists($data)) { debug_event('ACL Create','Error: An ACL equal to the created one does already exist. Not adding another one: ' . $data['start'] . ' - ' . $data['end'],'1'); - Error::add('general',_('Duplicate ACL defined')); + Error::add('general', T_('Duplicate ACL defined')); return false; } @@ -482,16 +482,16 @@ class Access { public function get_level_name() { if ($this->level >= '75') { - return _('All'); + return T_('All'); } if ($this->level == '5') { - return _('View'); + return T_('View'); } if ($this->level == '25') { - return _('Read'); + return T_('Read'); } if ($this->level == '50') { - return _('Read/Write'); + return T_('Read/Write'); } } // get_level_name @@ -502,7 +502,7 @@ class Access { */ public function get_user_name() { - if ($this->user == '-1') { return _('All'); } + if ($this->user == '-1') { return T_('All'); } $user = new User($this->user); return $user->fullname . " (" . $user->username . ")"; @@ -518,17 +518,17 @@ class Access { switch ($this->type) { case 'xml-rpc': case 'rpc': - return _('API/RPC'); + return T_('API/RPC'); break; case 'network': - return _('Local Network Definition'); + return T_('Local Network Definition'); break; case 'interface': - return _('Web Interface'); + return T_('Web Interface'); break; case 'stream': default: - return _('Stream Access'); + return T_('Stream Access'); break; } // end switch diff --git a/lib/class/album.class.php b/lib/class/album.class.php index dbf0b18e..1c4aa301 100644 --- a/lib/class/album.class.php +++ b/lib/class/album.class.php @@ -246,7 +246,7 @@ class Album extends database_object { $this->f_name_link = "<a href=\"$web_path/albums.php?action=show&album=" . scrub_out($this->id) . "\" title=\"" . scrub_out($this->full_name) . "\">" . scrub_out($this->f_name); // If we've got a disk append it if ($this->disk) { - $this->f_name_link .= " <span class=\"discnb disc" .$this->disk. "\">[" . _('Disk') . " " . $this->disk . "]</span>"; + $this->f_name_link .= " <span class=\"discnb disc" .$this->disk. "\">[" . T_('Disk') . " " . $this->disk . "]</span>"; } $this->f_name_link .="</a>"; @@ -260,8 +260,8 @@ class Album extends database_object { $this->f_artist = $artist; } else { - $this->f_artist_link = "<span title=\"$this->artist_count " . _('Artists') . "\">" . _('Various') . "</span>"; - $this->f_artist = _('Various'); + $this->f_artist_link = "<span title=\"$this->artist_count " . T_('Artists') . "\">" . T_('Various') . "</span>"; + $this->f_artist = T_('Various'); $this->f_artist_name = $this->f_artist; } diff --git a/lib/class/ampacherss.class.php b/lib/class/ampacherss.class.php index 681ae98f..b971b1fb 100644 --- a/lib/class/ampacherss.class.php +++ b/lib/class/ampacherss.class.php @@ -80,10 +80,10 @@ class AmpacheRSS { */ public function get_title() { - $titles = array('now_playing'=>_('Now Playing'), - 'recently_played'=>_('Recently Played'), - 'latest_album'=>_('Newest Albums'), - 'latest_artist'=>_('Newest Artists')); + $titles = array('now_playing' => T_('Now Playing'), + 'recently_played' => T_('Recently Played'), + 'latest_album' => T_('Newest Albums'), + 'latest_artist' => T_('Newest Artists')); return scrub_out(Config::get('site_title')) . ' - ' . $titles[$this->type]; @@ -126,7 +126,7 @@ class AmpacheRSS { // Default to now playing $type = self::validate_type($type); - $string = '<a href="' . Config::get('web_path') . '/rss.php?type=' . $type . '">' . get_user_icon('feed',_('RSS Feed')) . '</a>'; + $string = '<a href="' . Config::get('web_path') . '/rss.php?type=' . $type . '">' . get_user_icon('feed', T_('RSS Feed')) . '</a>'; return $string; @@ -185,7 +185,7 @@ class AmpacheRSS { //FIXME: The time stuff should be centralized, it's currently in two places, lame - $time_unit = array('',_('seconds ago'),_('minutes ago'),_('hours ago'),_('days ago'),_('weeks ago'),_('months ago'),_('years ago')); + $time_unit = array('', T_('seconds ago'), T_('minutes ago'), T_('hours ago'), T_('days ago'), T_('weeks ago'), T_('months ago'), T_('years ago')); $data = Song::get_recently_played(); $results = array(); diff --git a/lib/class/api.class.php b/lib/class/api.class.php index 61b071f6..ff7e2cb3 100644 --- a/lib/class/api.class.php +++ b/lib/class/api.class.php @@ -132,7 +132,7 @@ class Api { if (intval($version) < self::$version) { debug_event('API', 'Login Failed: version too old', 1); - Error::add('api', _('Login Failed: version too old')); + Error::add('api', T_('Login Failed: version too old')); return false; } @@ -140,7 +140,7 @@ class Api { if (($timestamp < (time() - 1800)) || ($timestamp > (time() + 1800))) { debug_event('API', 'Login Failed: timestamp out of range', 1); - Error::add('api', _('Login Failed: timestamp out of range')); + Error::add('api', T_('Login Failed: timestamp out of range')); return false; } @@ -169,7 +169,7 @@ class Api { if (!$row['password']) { debug_event('API', 'Unable to find user with userid of ' . $user_id, 1); - Error::add('api', _('Invalid Username/Password')); + Error::add('api', T_('Invalid Username/Password')); return false; } @@ -232,7 +232,7 @@ class Api { } // end while debug_event('API','Login Failed, unable to match passphrase','1'); - xmlData::error('401',_('Error Invalid Handshake - ') . _('Invalid Username/Password')); + xmlData::error('401', T_('Error Invalid Handshake - ') . T_('Invalid Username/Password')); } // handshake @@ -659,7 +659,7 @@ class Api { break; default: // They are doing it wrong - echo xmlData::error('405',_('Invalid Request')); + echo xmlData::error('405', T_('Invalid Request')); break; } // end switch on command @@ -680,7 +680,7 @@ class Api { $type = 'song'; $media = new $type($input['oid']); if (!$media->id) { - echo xmlData::error('400',_('Media Object Invalid or Not Specified')); + echo xmlData::error('400', T_('Media Object Invalid or Not Specified')); break; } $democratic->vote(array(array('song',$media->id))); @@ -693,7 +693,7 @@ class Api { $type = 'song'; $media = new $type($input['oid']); if (!$media->id) { - echo xmlData::error('400',_('Media Object Invalid or Not Specified')); + echo xmlData::error('400', T_('Media Object Invalid or Not Specified')); } $uid = $democratic->get_uid_from_object_id($media->id,$type); @@ -715,7 +715,7 @@ class Api { echo xmlData::keyed_array($xml_array); break; default: - echo xmlData::error('405',_('Invalid Request')); + echo xmlData::error('405', T_('Invalid Request')); break; } // switch on method diff --git a/lib/class/art.class.php b/lib/class/art.class.php index 647e5163..ad8023ca 100644 --- a/lib/class/art.class.php +++ b/lib/class/art.class.php @@ -1000,7 +1000,7 @@ class Art extends database_object { $handle = opendir($dir); if (!$handle) { - Error::add('general',_('Error: Unable to open') . ' ' . $dir); + Error::add('general', T_('Error: Unable to open') . ' ' . $dir); debug_event('folder_art', "Error: Unable to open $dir for album art read", 2); continue; } diff --git a/lib/class/artist.class.php b/lib/class/artist.class.php index 583cab8c..78459e24 100644 --- a/lib/class/artist.class.php +++ b/lib/class/artist.class.php @@ -376,7 +376,7 @@ class Artist extends database_object { // check for fault if ($client->fault) { debug_event("lyrics", "Can't get lyrics", "1"); - return $results = "<h2>" . _('Fault') . "</h2>" . print_r($result); + return $results = "<h2>" . T_('Fault') . "</h2>" . print_r($result); } else { // check for errors @@ -384,12 +384,12 @@ class Artist extends database_object { if ($err) { debug_event("lyrics", "Getting error: $err", "1"); - return $results = "<h2>" . _('Error') . "</h2>" . $err; + return $results = "<h2>" . T_('Error') . "</h2>" . $err; } else { // if returned "Not found" do not add if($result['lyrics'] == "Not found") { - $sorry = _('Sorry Lyrics Not Found.'); + $sorry = T_('Sorry Lyrics Not Found.'); return $sorry; } else { diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index 83eb2d27..89cf5933 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -137,84 +137,84 @@ class Browse extends Query { // Switch on the type of browsing we're doing switch ($type) { case 'song': - show_box_top(_('Songs') . $match, $class); + show_box_top(T_('Songs') . $match, $class); Song::build_cache($object_ids); require_once Config::get('prefix') . '/templates/show_songs.inc.php'; show_box_bottom(); break; case 'album': - show_box_top(_('Albums') . $match, $class); + show_box_top(T_('Albums') . $match, $class); Album::build_cache($object_ids,'extra'); require_once Config::get('prefix') . '/templates/show_albums.inc.php'; show_box_bottom(); break; case 'user': - show_box_top(_('Manage Users') . $match, $class); + show_box_top(T_('Manage Users') . $match, $class); require_once Config::get('prefix') . '/templates/show_users.inc.php'; show_box_bottom(); break; case 'artist': - show_box_top(_('Artists') . $match, $class); + show_box_top(T_('Artists') . $match, $class); Artist::build_cache($object_ids,'extra'); require_once Config::get('prefix') . '/templates/show_artists.inc.php'; show_box_bottom(); break; case 'live_stream': require_once Config::get('prefix') . '/templates/show_live_stream.inc.php'; - show_box_top(_('Radio Stations') . $match, $class); + show_box_top(T_('Radio Stations') . $match, $class); require_once Config::get('prefix') . '/templates/show_live_streams.inc.php'; show_box_bottom(); break; case 'playlist': Playlist::build_cache($object_ids); - show_box_top(_('Playlists') . $match, $class); + show_box_top(T_('Playlists') . $match, $class); require_once Config::get('prefix') . '/templates/show_playlists.inc.php'; show_box_bottom(); break; case 'playlist_song': - show_box_top(_('Playlist Songs') . $match,$class); + show_box_top(T_('Playlist Songs') . $match,$class); require_once Config::get('prefix') . '/templates/show_playlist_songs.inc.php'; show_box_bottom(); break; case 'playlist_localplay': - show_box_top(_('Current Playlist')); + show_box_top(T_('Current Playlist')); require_once Config::get('prefix') . '/templates/show_localplay_playlist.inc.php'; show_box_bottom(); break; case 'smartplaylist': - show_box_top(_('Smart Playlists') . $match, $class); + show_box_top(T_('Smart Playlists') . $match, $class); require_once Config::get('prefix') . '/templates/show_smartplaylists.inc.php'; show_box_bottom(); break; case 'catalog': - show_box_top(_('Catalogs'), $class); + show_box_top(T_('Catalogs'), $class); require_once Config::get('prefix') . '/templates/show_catalogs.inc.php'; show_box_bottom(); break; case 'shoutbox': - show_box_top(_('Shoutbox Records'),$class); + show_box_top(T_('Shoutbox Records'),$class); require_once Config::get('prefix') . '/templates/show_manage_shoutbox.inc.php'; show_box_bottom(); break; case 'flagged': - show_box_top(_('Flagged Records'),$class); + show_box_top(T_('Flagged Records'),$class); require_once Config::get('prefix') . '/templates/show_flagged.inc.php'; show_box_bottom(); break; case 'tag': Tag::build_cache($tags); - show_box_top(_('Tag Cloud'),$class); + show_box_top(T_('Tag Cloud'),$class); require_once Config::get('prefix') . '/templates/show_tagcloud.inc.php'; show_box_bottom(); break; case 'video': Video::build_cache($object_ids); - show_box_top(_('Videos'),$class); + show_box_top(T_('Videos'),$class); require_once Config::get('prefix') . '/templates/show_videos.inc.php'; show_box_bottom(); break; case 'democratic': - show_box_top(_('Democratic Playlist'),$class); + show_box_top(T_('Democratic Playlist'),$class); require_once Config::get('prefix') . '/templates/show_democratic_playlist.inc.php'; show_box_bottom(); default: diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 52073202..0de562d2 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -170,9 +170,9 @@ class Catalog extends database_object { $this->f_name = truncate_with_ellipsis($this->name,Config::get('ellipse_threshold_title')); $this->f_name_link = '<a href="' . Config::get('web_path') . '/admin/catalog.php?action=show_customize_catalog&catalog_id=' . $this->id . '" title="' . scrub_out($this->name) . '">' . scrub_out($this->f_name) . '</a>'; $this->f_path = truncate_with_ellipsis($this->path,Config::get('ellipse_threshold_title')); - $this->f_update = $this->last_update ? date('d/m/Y h:i',$this->last_update) : _('Never'); - $this->f_add = $this->last_add ? date('d/m/Y h:i',$this->last_add) : _('Never'); - $this->f_clean = $this->last_clean ? date('d/m/Y h:i',$this->last_clean) : _('Never'); + $this->f_update = $this->last_update ? date('d/m/Y h:i',$this->last_update) : T_('Never'); + $this->f_add = $this->last_add ? date('d/m/Y h:i',$this->last_add) : T_('Never'); + $this->f_clean = $this->last_clean ? date('d/m/Y h:i',$this->last_clean) : T_('Never'); } // format @@ -276,7 +276,7 @@ class Catalog extends database_object { // Make sure the path is readable/exists if (!is_readable($data['path']) AND $data['type'] == 'local') { - Error::add('general', sprintf(_('Error: %s is not readable or does not exist'), scrub_out($data['path']))); + Error::add('general', sprintf(T_('Error: %s is not readable or does not exist'), scrub_out($data['path']))); return false; } @@ -285,7 +285,7 @@ class Catalog extends database_object { $db_results = Dba::read($sql); if (Dba::num_rows($db_results)) { - Error::add('general', sprintf(_('Error: Catalog with %s already exists'), $path)); + Error::add('general', sprintf(T_('Error: Catalog with %s already exists'), $path)); return false; } @@ -312,7 +312,7 @@ class Catalog extends database_object { $insert_id = Dba::insert_id(); if (!$insert_id) { - Error::add('general', _('Catalog Insert Failed check debug logs')); + Error::add('general', T_('Catalog Insert Failed check debug logs')); debug_event('catalog','SQL Failed:' . $sql,'3'); return false; } @@ -330,7 +330,7 @@ class Catalog extends database_object { public function run_add($options) { if ($this->catalog_type == 'remote') { - show_box_top(_('Running Remote Sync') . '. . .'); + show_box_top(T_('Running Remote Sync') . '. . .'); $this->get_remote_catalog($type=0); show_box_bottom(); return true; @@ -496,14 +496,14 @@ class Catalog extends database_object { if (!is_resource($handle)) { debug_event('read', "Unable to open $path", 5,'ampache-catalog'); - Error::add('catalog_add', sprintf(_('Error: Unable to open %s'), $path)); + Error::add('catalog_add', sprintf(T_('Error: Unable to open %s'), $path)); return false; } /* Change the dir so is_dir works correctly */ if (!chdir($path)) { debug_event('read', "Unable to chdir $path", 2,'ampache-catalog'); - Error::add('catalog_add', sprintf(_('Error: Unable to change to directory %s'), $path)); + Error::add('catalog_add', sprintf(T_('Error: Unable to change to directory %s'), $path)); return false; } @@ -549,7 +549,7 @@ class Catalog extends database_object { /* Change the dir so is_dir works correctly */ if (!chdir($path)) { debug_event('read',"Unable to chdir $path",'2','ampache-catalog'); - Error::add('catalog_add', sprintf(_('Error: Unable to change to directory %s'), $path)); + Error::add('catalog_add', sprintf(T_('Error: Unable to change to directory %s'), $path)); } /* Skip to the next file */ @@ -586,14 +586,14 @@ class Catalog extends database_object { if (!$file_size) { debug_event('read',"Unable to get filesize for $full_file",'2','ampache-catalog'); /* HINT: FullFile */ - Error::add('catalog_add', sprintf(_('Error: Unable to get filesize for %s'), $full_file)); + Error::add('catalog_add', sprintf(T_('Error: Unable to get filesize for %s'), $full_file)); } // file_size check if (!is_readable($full_file)) { // not readable, warn user debug_event('read',"$full_file is not readable by ampache",'2','ampache-catalog'); /* HINT: FullFile */ - Error::add('catalog_add', sprintf(_('%s is not readable by ampache'), $full_file)); + Error::add('catalog_add', sprintf(T_('%s is not readable by ampache'), $full_file)); continue; } @@ -602,7 +602,7 @@ class Catalog extends database_object { if (strcmp($full_file,iconv(Config::get('site_charset'),Config::get('site_charset'),$full_file)) != '0') { debug_event('read',$full_file . ' has non-' . Config::get('site_charset') . ' characters and can not be indexed, converted filename:' . iconv(Config::get('site_charset'),Config::get('site_charset'),$full_file),'1'); /* HINT: FullFile */ - Error::add('catalog_add', sprintf(_('%s does not match site charset'), $full_file)); + Error::add('catalog_add', sprintf(T_('%s does not match site charset'), $full_file)); continue; } } // end if iconv @@ -1079,14 +1079,14 @@ class Catalog extends database_object { if ($info['change']) { $file = scrub_out($song->file); echo "<dl>\n\t<dd>"; - echo "<strong>$file " . _('Updated') . "</strong>\n"; + echo "<strong>$file " . T_('Updated') . "</strong>\n"; echo $info['text']; echo "\t</dd>\n</dl><hr align=\"left\" width=\"50%\" />"; flush(); } // if change else { echo"<dl>\n\t<dd>"; - echo "<strong>" . scrub_out($song->file) . "</strong><br />" . _('No Update Needed') . "\n"; + echo "<strong>" . scrub_out($song->file) . "</strong><br />" . T_('No Update Needed') . "\n"; echo "\t</dd>\n</dl><hr align=\"left\" width=\"50%\" />"; flush(); } @@ -1221,7 +1221,7 @@ class Catalog extends database_object { public function add_to_catalog() { if ($this->catalog_type == 'remote') { - show_box_top(_('Running Remote Update') . '. . .'); + show_box_top(T_('Running Remote Update') . '. . .'); $this->get_remote_catalog($type=0); show_box_bottom(); return true; @@ -1248,7 +1248,7 @@ class Catalog extends database_object { if ($this->import_m3u($full_file)) { $file = basename($full_file); if ($verbose) { - echo " " . _('Added Playlist From') . " $file . . . .<br />\n"; + echo " " . T_('Added Playlist From') . " $file . . . .<br />\n"; flush(); } } // end if import worked @@ -1277,8 +1277,8 @@ class Catalog extends database_object { } show_box_top(); - echo "\n<br />" . _('Catalog Update Finished') . "... " . _('Total Time') . " [" . date("i:s",$time_diff) . "] " . - _('Total Songs') . " [" . $this->count . "] " . _('Songs Per Seconds') . " [" . $song_per_sec . "]<br /><br />"; + echo "\n<br />" . T_('Catalog Update Finished') . "... " . T_('Total Time') . " [" . date("i:s",$time_diff) . "] " . + T_('Total Songs') . " [" . $this->count . "] " . T_('Songs Per Seconds') . " [" . $song_per_sec . "]<br /><br />"; show_box_bottom(); } // add_to_catalog @@ -1301,7 +1301,7 @@ class Catalog extends database_object { if ($remote_handle->state() != 'CONNECTED') { debug_event('APICLIENT','Error Unable to make API client ready','1'); - Error::add('general',_('Error Connecting to Remote Server')); + Error::add('general', T_('Error Connecting to Remote Server')); Error::display('general'); return false; } @@ -1310,7 +1310,7 @@ class Catalog extends database_object { $remote_catalog_info = $remote_handle->info(); // Tell em what we've found johnny! - printf(_('%u remote catalog(s) found (%u songs)'),$remote_catalog_info['catalogs'],$remote_catalog_info['songs']); + printf(T_('%u remote catalog(s) found (%u songs)'),$remote_catalog_info['catalogs'],$remote_catalog_info['songs']); flush(); // Hardcoded for now @@ -1334,14 +1334,14 @@ class Catalog extends database_object { foreach ($songs as $data) { if (!$this->insert_remote_song($data['song'])) { debug_event('REMOTE_INSERT','Remote Insert failed, see previous log messages -' . $data['song']['self']['id'],'1'); - Error::add('general',_('Unable to Insert Song - %s'),$data['song']['title']); + Error::add('general', T_('Unable to Insert Song - %s'),$data['song']['title']); Error::display('general'); flush(); } } // end foreach } // end while - echo "<p>" . _('Completed updating remote catalog(s)') . ".</p><hr />\n"; + echo "<p>" . T_('Completed updating remote catalog(s)') . ".</p><hr />\n"; flush(); // Update the last update value @@ -1384,7 +1384,7 @@ class Catalog extends database_object { // mount points fail if ($this->catalog_type == 'local' && !is_readable($this->path)) { debug_event('catalog', 'Catalog path:' . $this->path . ' unreadable, clean failed', 1); - Error::add('general',_('Catalog Root unreadable, stopping clean')); + Error::add('general', T_('Catalog Root unreadable, stopping clean')); Error::display('general'); return false; } @@ -1408,7 +1408,7 @@ class Catalog extends database_object { // Never remove everything; it might be a dead mount if ($dead_count >= $total) { debug_event('catalog', 'All files would be removed. Doing nothing.', 1); - Error::add('general', _('All files would be removed. Doing nothing')); + Error::add('general', T_('All files would be removed. Doing nothing')); continue; } if ($dead_count) { @@ -1462,7 +1462,7 @@ class Catalog extends database_object { $file_info = filesize($results['file']); if (!file_exists($results['file']) || $file_info < 1) { debug_event('clean', 'File not found or empty: ' . $results['file'], 5, 'ampache-catalog'); - Error::add('general', sprintf(_('Error File Not Found or 0 Bytes: %s'), $results['file'])); + Error::add('general', sprintf(T_('Error File Not Found or 0 Bytes: %s'), $results['file'])); // Store it in an array we'll delete it later... @@ -1479,7 +1479,7 @@ class Catalog extends database_object { if ($file_info == false) { /* Add Error */ - Error::add('general', sprintf(_('Error Remote File Not Found or 0 Bytes: %s'), $results['file'])); + Error::add('general', sprintf(T_('Error Remote File Not Found or 0 Bytes: %s'), $results['file'])); // Store it in an array we'll delete it later... @@ -1696,7 +1696,7 @@ class Catalog extends database_object { show_box_top(); echo '<strong>'; - printf(_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number); + printf(T_('Catalog Verify Done. %d of %d files updated.'), $total_updated, $number); echo "</strong><br />\n"; show_box_bottom(); ob_flush(); @@ -1737,7 +1737,7 @@ class Catalog extends database_object { } if (!is_readable($row['file'])) { - Error::add('general', sprintf(_('%s does not exist or is not readable'), $row['file'])); + Error::add('general', sprintf(T_('%s does not exist or is not readable'), $row['file'])); debug_event('read', $row['file'] . ' does not exist or is not readable', 5,'ampache-catalog'); continue; } @@ -1835,7 +1835,7 @@ class Catalog extends database_object { /* Ohh no the artist has lost it's mojo! */ if (!$artist) { - $artist = _('Unknown (Orphaned)'); + $artist = T_('Unknown (Orphaned)'); } // Remove the prefix so we can sort it correctly @@ -1890,7 +1890,7 @@ class Catalog extends database_object { $sql = "UPDATE `artist` SET `mbid`='$mbid' WHERE `id`='$artist_id'"; $db_results = Dba::write($sql); if (!$db_results) { - Error::add('general', sprintf(_('Updating Artist: %s'), $artist)); + Error::add('general', sprintf(T_('Updating Artist: %s'), $artist)); } } } @@ -1911,7 +1911,7 @@ class Catalog extends database_object { $artist_id = Dba::insert_id(); if (!$db_results) { - Error::add('general', sprintf(_('Inserting Artist: %s'), $artist)); + Error::add('general', sprintf(T_('Inserting Artist: %s'), $artist)); } } // not found @@ -1943,7 +1943,7 @@ class Catalog extends database_object { /* Ohh no the album has lost its mojo */ if (!$album) { - $album = _('Unknown (Orphaned)'); + $album = T_('Unknown (Orphaned)'); unset($album_year, $album_disk); } @@ -2091,7 +2091,7 @@ class Catalog extends database_object { if (!$db_results) { debug_event('insert',"Unable to insert $file -- $sql" . Dba::error(),'5','ampache-catalog'); - Error::add('catalog_add', sprintf(_('SQL Error Adding %s'), $file)); + Error::add('catalog_add', sprintf(T_('SQL Error Adding %s'), $file)); } $song_id = Dba::insert_id(); @@ -2314,7 +2314,7 @@ class Catalog extends database_object { $playlist_id = Playlist::create($name,'public'); if (!$playlist_id) { - $reason = _('Playlist creation error.'); + $reason = T_('Playlist creation error.'); return false; } diff --git a/lib/class/config.class.php b/lib/class/config.class.php index 78745be8..8ad7189e 100644 --- a/lib/class/config.class.php +++ b/lib/class/config.class.php @@ -110,7 +110,7 @@ class Config { if (isset(self::$_global[$name]) && !$clobber) { debug_event('Config', "Tried to overwrite existing key $name without setting clobber", 5); - Error::add('Config Global', sprintf(_('Trying to clobber \'%s\' without setting clobber'), $name)); + Error::add('Config Global', sprintf(T_('Trying to clobber \'%s\' without setting clobber'), $name)); return false; } diff --git a/lib/class/democratic.class.php b/lib/class/democratic.class.php index a0ea01a5..71699960 100644 --- a/lib/class/democratic.class.php +++ b/lib/class/democratic.class.php @@ -150,24 +150,24 @@ class Democratic extends tmpPlaylist { */ public function format() { - $this->f_cooldown = $this->cooldown . ' ' . _('minutes'); - $this->f_primary = $this->primary ? _('Primary') : ''; + $this->f_cooldown = $this->cooldown . ' ' . T_('minutes'); + $this->f_primary = $this->primary ? T_('Primary') : ''; switch ($this->level) { case '5': - $this->f_level = _('Guest'); + $this->f_level = T_('Guest'); break; case '25': - $this->f_level = _('User'); + $this->f_level = T_('User'); break; case '50': - $this->f_level = _('Content Manager'); + $this->f_level = T_('Content Manager'); break; case '75': - $this->f_level = _('Catalog Manager'); + $this->f_level = T_('Catalog Manager'); break; case '100': - $this->f_level = _('Admin'); + $this->f_level = T_('Admin'); break; } diff --git a/lib/class/flag.class.php b/lib/class/flag.class.php index b3791dbd..bbb3f4a0 100644 --- a/lib/class/flag.class.php +++ b/lib/class/flag.class.php @@ -322,8 +322,8 @@ class Flag extends database_object { */ public function print_status() { - if ($this->approved) { echo _('Approved'); } - else { echo _('Pending'); } + if ($this->approved) { echo T_('Approved'); } + else { echo T_('Pending'); } } // print_status @@ -335,19 +335,19 @@ class Flag extends database_object { switch ($this->flag) { case 'delete': - $name = _('Delete'); + $name = T_('Delete'); break; case 'retag': - $name = _('Re-Tag'); + $name = T_('Re-Tag'); break; case 'reencode': - $name = _('Re-encode'); + $name = T_('Re-encode'); break; case 'other': - $name = _('Other'); + $name = T_('Other'); break; default: - $name = _('Unknown'); + $name = T_('Unknown'); break; } // end switch diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php index ef03b1c3..cebc5bff 100644 --- a/lib/class/localplay.class.php +++ b/lib/class/localplay.class.php @@ -653,16 +653,16 @@ class Localplay { switch ($state) { case 'play': - return _('Now Playing'); + return T_('Now Playing'); break; case 'stop': - return _('Stopped'); + return T_('Stopped'); break; case 'pause': - return _('Paused'); + return T_('Paused'); break; default: - return _('Unknown'); + return T_('Unknown'); break; } // switch on state diff --git a/lib/class/playlist_object.abstract.php b/lib/class/playlist_object.abstract.php index def7b3f2..fd9b0147 100644 --- a/lib/class/playlist_object.abstract.php +++ b/lib/class/playlist_object.abstract.php @@ -39,7 +39,7 @@ abstract class playlist_object extends database_object { public function format() { $this->f_name = truncate_with_ellipsis($this->name,Config::get('ellipse_threshold_title')); - $this->f_type = ($this->type == 'private') ? get_user_icon('lock',_('Private')) : ''; + $this->f_type = ($this->type == 'private') ? get_user_icon('lock', T_('Private')) : ''; $client = new User($this->user); diff --git a/lib/class/query.class.php b/lib/class/query.class.php index 49a978af..1dffd35b 100644 --- a/lib/class/query.class.php +++ b/lib/class/query.class.php @@ -79,7 +79,7 @@ class Query { return true; } - Error::add('browse', _('Browse not found or expired, try reloading the page')); + Error::add('browse', T_('Browse not found or expired, try reloading the page')); return false; } diff --git a/lib/class/radio.class.php b/lib/class/radio.class.php index 46743614..d4be4f76 100644 --- a/lib/class/radio.class.php +++ b/lib/class/radio.class.php @@ -92,11 +92,11 @@ class Radio extends database_object implements media { // Verify the incoming data if (!$data['id']) { - Error::add('general', _('Missing ID')); + Error::add('general', T_('Missing ID')); } if (!$data['name']) { - Error::add('general', _('Name Required')); + Error::add('general', T_('Name Required')); } $allowed_array = array('https','http','mms','mmsh','mmsu','mmst','rtsp'); @@ -104,7 +104,7 @@ class Radio extends database_object implements media { $elements = explode(":",$data['url']); if (!in_array($elements['0'],$allowed_array)) { - Error::add('general', _('Invalid URL must be mms:// , https:// or http://')); + Error::add('general', T_('Invalid URL must be mms:// , https:// or http://')); } if (Error::occurred()) { @@ -136,7 +136,7 @@ class Radio extends database_object implements media { // Make sure we've got a name if (!strlen($data['name'])) { - Error::add('name', _('Name Required')); + Error::add('name', T_('Name Required')); } $allowed_array = array('https','http','mms','mmsh','mmsu','mmst','rtsp'); @@ -144,13 +144,13 @@ class Radio extends database_object implements media { $elements = explode(":",$data['url']); if (!in_array($elements['0'],$allowed_array)) { - Error::add('url', _('Invalid URL must be http:// or https://')); + Error::add('url', T_('Invalid URL must be http:// or https://')); } // Make sure it's a real catalog $catalog = new Catalog($data['catalog']); if (!$catalog->name) { - Error::add('catalog', _('Invalid Catalog')); + Error::add('catalog', T_('Invalid Catalog')); } if (Error::occurred()) { return false; } diff --git a/lib/class/random.class.php b/lib/class/random.class.php index ef6c3037..5dc8b47b 100644 --- a/lib/class/random.class.php +++ b/lib/class/random.class.php @@ -368,16 +368,16 @@ class Random implements media { switch ($type) { case 'album': - return _('Related Album'); + return T_('Related Album'); break; case 'genre': - return _('Related Genre'); + return T_('Related Genre'); break; case 'artist': - return _('Related Artist'); + return T_('Related Artist'); break; default: - return _('Pure Random'); + return T_('Pure Random'); break; } // end switch diff --git a/lib/class/registration.class.php b/lib/class/registration.class.php index 6175b016..bfc49d4b 100644 --- a/lib/class/registration.class.php +++ b/lib/class/registration.class.php @@ -59,9 +59,9 @@ class Registration { // We are the system $mailer->set_default_sender(); - $mailer->subject = sprintf(_("New User Registration at %s"), Config::get('site_title')); + $mailer->subject = sprintf(T_("New User Registration at %s"), Config::get('site_title')); - $mailer->message = sprintf(_("Thank you for registering\n\n + $mailer->message = sprintf(T_("Thank you for registering\n\n Please keep this e-mail for your records. Your account information is as follows: ---------------------- Username: %s @@ -82,7 +82,7 @@ Thank you for registering // Check to see if the admin should be notified if (Config::get('admin_notify_reg')) { - $mailer->message = sprintf(_("A new user has registered + $mailer->message = sprintf(T_("A new user has registered The following values were entered. Username: %s diff --git a/lib/class/search.class.php b/lib/class/search.class.php index fc860ed9..eaa45a97 100644 --- a/lib/class/search.class.php +++ b/lib/class/search.class.php @@ -53,55 +53,55 @@ class Search extends playlist_object { $this->basetypes['numeric'][] = array( 'name' => 'gte', - 'description' => _('is greater than or equal to'), + 'description' => T_('is greater than or equal to'), 'sql' => '>=' ); $this->basetypes['numeric'][] = array( 'name' => 'lte', - 'description' => _('is less than or equal to'), + 'description' => T_('is less than or equal to'), 'sql' => '<=' ); $this->basetypes['numeric'][] = array( 'name' => 'equal', - 'description' => _('is'), + 'description' => T_('is'), 'sql' => '<=>' ); $this->basetypes['numeric'][] = array( 'name' => 'ne', - 'description' => _('is not'), + 'description' => T_('is not'), 'sql' => '<>' ); $this->basetypes['numeric'][] = array( 'name' => 'gt', - 'description' => _('is greater than'), + 'description' => T_('is greater than'), 'sql' => '>' ); $this->basetypes['numeric'][] = array( 'name' => 'lt', - 'description' => _('is less than'), + 'description' => T_('is less than'), 'sql' => '<' ); $this->basetypes['boolean'][] = array( 'name' => 'true', - 'description' => _('is true') + 'description' => T_('is true') ); $this->basetypes['boolean'][] = array( 'name' => 'false', - 'description' => _('is false') + 'description' => T_('is false') ); $this->basetypes['text'][] = array( 'name' => 'contain', - 'description' => _('contains'), + 'description' => T_('contains'), 'sql' => 'LIKE', 'preg_match' => array('/^/','/$/'), 'preg_replace' => array('%', '%') @@ -109,7 +109,7 @@ class Search extends playlist_object { $this->basetypes['text'][] = array( 'name' => 'notcontain', - 'description' => _('does not contain'), + 'description' => T_('does not contain'), 'sql' => 'NOT LIKE', 'preg_match' => array('/^/','/$/'), 'preg_replace' => array('%', '%') @@ -117,7 +117,7 @@ class Search extends playlist_object { $this->basetypes['text'][] = array( 'name' => 'start', - 'description' => _('starts with'), + 'description' => T_('starts with'), 'sql' => 'LIKE', 'preg_match' => '/$/', 'preg_replace' => '%' @@ -125,7 +125,7 @@ class Search extends playlist_object { $this->basetypes['text'][] = array( 'name' => 'end', - 'description' => _('ends with'), + 'description' => T_('ends with'), 'sql' => 'LIKE', 'preg_match' => '/^/', 'preg_replace' => '%' @@ -133,58 +133,58 @@ class Search extends playlist_object { $this->basetypes['text'][] = array( 'name' => 'equal', - 'description' => _('is'), + 'description' => T_('is'), 'sql' => '=' ); $this->basetypes['text'][] = array( 'name' => 'sounds', - 'description' => _('sounds like'), + 'description' => T_('sounds like'), 'sql' => 'SOUNDS LIKE' ); $this->basetypes['text'][] = array( 'name' => 'notsounds', - 'description' => _('does not sound like'), + 'description' => T_('does not sound like'), 'sql' => 'NOT SOUNDS LIKE' ); $this->basetypes['boolean_numeric'][] = array( 'name' => 'equal', - 'description' => _('is'), + 'description' => T_('is'), 'sql' => '<=>' ); $this->basetypes['boolean_numeric'][] = array( 'name' => 'ne', - 'description' => _('is not'), + 'description' => T_('is not'), 'sql' => '<>' ); $this->basetypes['boolean_subsearch'][] = array( 'name' => 'equal', - 'description' => _('is'), + 'description' => T_('is'), 'sql' => '' ); $this->basetypes['boolean_subsearch'][] = array( 'name' => 'ne', - 'description' => _('is not'), + 'description' => T_('is not'), 'sql' => 'NOT' ); $this->basetypes['date'][] = array( 'name' => 'lt', - 'description' => _('before'), + 'description' => T_('before'), 'sql' => '>' ); $this->basetypes['date'][] = array( 'name' => 'gt', - 'description' => _('after'), + 'description' => T_('after'), 'sql' => '>' ); @@ -192,35 +192,35 @@ class Search extends playlist_object { case 'song': $this->types[] = array( 'name' => 'anywhere', - 'label' => _('Any searchable text'), + 'label' => T_('Any searchable text'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'title', - 'label' => _('Title'), + 'label' => T_('Title'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'album', - 'label' => _('Album'), + 'label' => T_('Album'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'artist', - 'label' => _('Artist'), + 'label' => T_('Artist'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'comment', - 'label' => _('Comment'), + 'label' => T_('Comment'), 'type' => 'text', 'widget' => array('input', 'text') ); @@ -228,28 +228,28 @@ class Search extends playlist_object { $this->types[] = array( 'name' => 'tag', - 'label' => _('Tag'), + 'label' => T_('Tag'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'file', - 'label' => _('Filename'), + 'label' => T_('Filename'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'year', - 'label' => _('Year'), + 'label' => T_('Year'), 'type' => 'numeric', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'time', - 'label' => _('Length (in minutes)'), + 'label' => T_('Length (in minutes)'), 'type' => 'numeric', 'widget' => array('input', 'text') ); @@ -257,7 +257,7 @@ class Search extends playlist_object { if (Config::get('ratings')) { $this->types[] = array( 'name' => 'rating', - 'label' => _('Rating'), + 'label' => T_('Rating'), 'type' => 'numeric', 'widget' => array( 'select', @@ -274,7 +274,7 @@ class Search extends playlist_object { $this->types[] = array( 'name' => 'bitrate', - 'label' => _('Bitrate'), + 'label' => T_('Bitrate'), 'type' => 'numeric', 'widget' => array( 'select', @@ -299,21 +299,21 @@ class Search extends playlist_object { $this->types[] = array( 'name' => 'played', - 'label' => _('Played'), + 'label' => T_('Played'), 'type' => 'boolean', 'widget' => array('input', 'hidden') ); $this->types[] = array( 'name' => 'added', - 'label' => _('Added'), + 'label' => T_('Added'), 'type' => 'date', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'updated', - 'label' => _('Updated'), + 'label' => T_('Updated'), 'type' => 'date', 'widget' => array('input', 'text') ); @@ -326,7 +326,7 @@ class Search extends playlist_object { } $this->types[] = array( 'name' => 'catalog', - 'label' => _('Catalog'), + 'label' => T_('Catalog'), 'type' => 'boolean_numeric', 'widget' => array('select', $catalogs) ); @@ -339,7 +339,7 @@ class Search extends playlist_object { } $this->types[] = array( 'name' => 'playlist', - 'label' => _('Playlist'), + 'label' => T_('Playlist'), 'type' => 'boolean_numeric', 'widget' => array('select', $playlists) ); @@ -352,7 +352,7 @@ class Search extends playlist_object { } $this->types[] = array( 'name' => 'smartplaylist', - 'label' => _('Smart Playlist'), + 'label' => T_('Smart Playlist'), 'type' => 'boolean_subsearch', 'widget' => array('select', $playlists) ); @@ -360,14 +360,14 @@ class Search extends playlist_object { case 'album': $this->types[] = array( 'name' => 'title', - 'label' => _('Title'), + 'label' => T_('Title'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'year', - 'label' => _('Year'), + 'label' => T_('Year'), 'type' => 'numeric', 'widget' => array('input', 'text') ); @@ -375,7 +375,7 @@ class Search extends playlist_object { if (Config::get('ratings')) { $this->types[] = array( 'name' => 'rating', - 'label' => _('Rating'), + 'label' => T_('Rating'), 'type' => 'numeric', 'widget' => array( 'select', @@ -398,7 +398,7 @@ class Search extends playlist_object { } $this->types[] = array( 'name' => 'catalog', - 'label' => _('Catalog'), + 'label' => T_('Catalog'), 'type' => 'boolean_numeric', 'widget' => array('select', $catalogs) ); @@ -406,7 +406,7 @@ class Search extends playlist_object { $this->types[] = array( 'name' => 'tag', - 'label' => _('Tag'), + 'label' => T_('Tag'), 'type' => 'text', 'widget' => array('input', 'text') ); @@ -414,7 +414,7 @@ class Search extends playlist_object { case 'video': $this->types[] = array( 'name' => 'filename', - 'label' => _('Filename'), + 'label' => T_('Filename'), 'type' => 'text', 'widget' => array('input', 'text') ); @@ -422,13 +422,13 @@ class Search extends playlist_object { case 'artist': $this->types[] = array( 'name' => 'name', - 'label' => _('Name'), + 'label' => T_('Name'), 'type' => 'text', 'widget' => array('input', 'text') ); $this->types[] = array( 'name' => 'tag', - 'label' => _('Tag'), + 'label' => T_('Tag'), 'type' => 'text', 'widget' => array('input', 'text') ); diff --git a/lib/class/update.class.php b/lib/class/update.class.php index c1a6c3fb..3401436b 100644 --- a/lib/class/update.class.php +++ b/lib/class/update.class.php @@ -417,7 +417,7 @@ class Update { if (!$update_needed) { if (!defined('CLI')) { echo '<p align="center">'; } - echo _('No updates needed.'); + echo T_('No updates needed.'); if (!defined('CLI')) { echo '[<a href="', Config::get('web_path'), '">Return</a>]</p>'; } @@ -446,7 +446,7 @@ class Update { /* Verify that there are no plugins installed //FIXME: provide a link to remove all plugins, otherwise this could turn into a catch 22 if (!$self::plugins_installed()) { - $GLOBALS['error']->add_error('general',_('Plugins detected, please remove all Plugins and try again')); + $GLOBALS['error']->add_error('general', T_('Plugins detected, please remove all Plugins and try again')); return false; } */ diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 4b283d62..09000600 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -408,11 +408,11 @@ class User extends database_object { public function update($data) { if (empty($data['username'])) { - Error::add('username',_('Error Username Required')); + Error::add('username', T_('Error Username Required')); } if ($data['password1'] != $data['password2'] AND !empty($data['password1'])) { - Error::add('password',_("Error Passwords don't match")); + Error::add('password', T_("Error Passwords don't match")); } if (Error::occurred()) { @@ -696,11 +696,11 @@ class User extends database_object { public function format() { /* If they have a last seen date */ - if (!$this->last_seen) { $this->f_last_seen = _('Never'); } + if (!$this->last_seen) { $this->f_last_seen = T_('Never'); } else { $this->f_last_seen = date("m\/d\/Y - H:i",$this->last_seen); } /* If they have a create date */ - if (!$this->create_date) { $this->f_create_date = _('Unknown'); } + if (!$this->create_date) { $this->f_create_date = T_('Unknown'); } else { $this->f_create_date = date("m\/d\/Y - H:i",$this->create_date); } // Base link @@ -722,7 +722,7 @@ class User extends database_object { $this->ip_history = inet_ntop($data['0']['ip']); } else { - $this->ip_history = _('Not Enough Data'); + $this->ip_history = T_('Not Enough Data'); } } // format_user diff --git a/lib/class/video.class.php b/lib/class/video.class.php index 5051fa97..22bafa19 100644 --- a/lib/class/video.class.php +++ b/lib/class/video.class.php @@ -91,7 +91,7 @@ class Video extends database_object implements media { $this->f_codec = $this->video_codec . ' / ' . $this->audio_codec; $this->f_resolution = $this->resolution_x . 'x' . $this->resolution_y; $this->f_tags = ''; - $this->f_length = floor($this->time/60) . ' ' . _('minutes'); + $this->f_length = floor($this->time/60) . ' ' . T_('minutes'); } // format diff --git a/lib/general.lib.php b/lib/general.lib.php index a739c081..2e8d66df 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -238,7 +238,7 @@ function get_languages() { case 'ar_SA'; $name = 'العربية'; break; /* Arabic */ case 'he_IL'; $name = 'עברית'; break; /* Hebrew */ case 'fa_IR'; $name = 'فارسي'; break; /* Farsi */ - default: $name = _('Unknown'); break; + default: $name = T_('Unknown'); break; } // end switch diff --git a/lib/install.lib.php b/lib/install.lib.php index bb26cd47..e99d2438 100644 --- a/lib/install.lib.php +++ b/lib/install.lib.php @@ -75,7 +75,7 @@ function install_check_status($configfile) { if (!file_exists($configfile)) { return true; } else { - Error::add('general',_('Config file already exists, install is probably completed')); + Error::add('general', T_('Config file already exists, install is probably completed')); } /* @@ -86,14 +86,14 @@ function install_check_status($configfile) { $dbh = check_database($results['database_hostname'],$results['database_username'],$results['database_password']); if (!is_resource($dbh)) { - Error::add('general',_('Unable to connect to database, check your ampache config')); + Error::add('general', T_('Unable to connect to database, check your ampache config')); return false; } $select_db = mysql_select_db($results['database_name'],$dbh); if (!$select_db) { - Error::add('general',_('Unable to select database, check your ampache config')); + Error::add('general', T_('Unable to select database, check your ampache config')); return false; } @@ -103,7 +103,7 @@ function install_check_status($configfile) { return true; } else { - Error::add('general',_('Existing Database detected, unable to continue installation')); + Error::add('general', T_('Existing Database detected, unable to continue installation')); return false; } @@ -123,7 +123,7 @@ function install_insert_db($username,$password,$hostname,$database,$dbuser=false $is_valid = preg_match("/([^\d\w\_\-])/",$database,$matches); if (count($matches)) { - Error::add('general',_('Error: Database name invalid must not be a reserved word, and must be Alphanumeric')); + Error::add('general', T_('Error: Database name invalid must not be a reserved word, and must be Alphanumeric')); return false; } @@ -140,7 +140,7 @@ function install_insert_db($username,$password,$hostname,$database,$dbuser=false $dbh = Dba::dbh(); if (!is_resource($dbh)) { - Error::add('general', sprintf(_('Error: Unable to make Database Connection %s'), mysql_error())); + Error::add('general', sprintf(T_('Error: Unable to make Database Connection %s'), mysql_error())); return false; } @@ -151,13 +151,13 @@ function install_insert_db($username,$password,$hostname,$database,$dbuser=false // Rien a faire, we've got the db just blow through } elseif ($db_selected && !$_POST['overwrite_db']) { - Error::add('general',_('Error: Database Already exists and Overwrite not checked')); + Error::add('general', T_('Error: Database Already exists and Overwrite not checked')); return false; } elseif (!$db_selected) { $sql = "CREATE DATABASE `" . Dba::escape($database) . "`"; if (!$db_results = @mysql_query($sql, $dbh)) { - Error::add('general',sprintf(_('Error: Unable to Create Database %s'), mysql_error())); + Error::add('general',sprintf(T_('Error: Unable to Create Database %s'), mysql_error())); return false; } @mysql_select_db($database, $dbh); @@ -167,7 +167,7 @@ function install_insert_db($username,$password,$hostname,$database,$dbuser=false $db_results = @mysql_query($sql,$dbh); $sql = "CREATE DATABASE `" . Dba::escape($database) . "`"; if (!$db_results = @mysql_query($sql, $dbh)) { - Error::add('general', sprintf(_('Error: Unable to Create Database %s'), mysql_error())); + Error::add('general', sprintf(T_('Error: Unable to Create Database %s'), mysql_error())); return false; } @mysql_select_db($database, $dbh); @@ -180,7 +180,7 @@ function install_insert_db($username,$password,$hostname,$database,$dbuser=false $db_pass = $_POST['db_password'] ? $_POST['db_password'] : $dbpass; if (!strlen($db_user) || !strlen($db_pass)) { - Error::add('general',_('Error: Ampache SQL Username or Password missing')); + Error::add('general', T_('Error: Ampache SQL Username or Password missing')); return false; } @@ -189,7 +189,7 @@ function install_insert_db($username,$password,$hostname,$database,$dbuser=false if (!$db_results = @mysql_query($sql, $dbh)) { // HINT: 1: db_user, 2: database, 3: hostname, 4: mysql_error() - Error::add('general', sprintf(_('Error: Unable to Insert %1$s with permissions to %2$s on %3$s %4$s'), $db_user, $database, $hostname, mysql_error())); + Error::add('general', sprintf(T_('Error: Unable to Insert %1$s with permissions to %2$s on %3$s %4$s'), $db_user, $database, $hostname, mysql_error())); return false; } } // end if we are creating a user @@ -258,11 +258,11 @@ function install_create_config($web_path,$username,$password,$hostname,$database */ // Connect to the DB if(!is_resource($dbh)) { - Error::add('general', _("Database Connection Failed Check Hostname, Username and Password")); + Error::add('general', T_("Database Connection Failed Check Hostname, Username and Password")); return false; } if (!@mysql_select_db($database, $dbh)) { - Error::add('general', sprintf(_('Database Selection Failure Check Existance of %s'), $database)); + Error::add('general', sprintf(T_('Database Selection Failure Check Existance of %s'), $database)); return false; } @@ -271,13 +271,13 @@ function install_create_config($web_path,$username,$password,$hostname,$database // Make sure the directory is writable OR the empty config file is if (!$download) { if (!check_config_writable()) { - Error::add('general', _("Config file is not writable")); + Error::add('general', T_("Config file is not writable")); return false; } else { // Given that $final is > 0, we can ignore lazy comparison problems if (!file_put_contents($config_file,$final)) { - Error::add('general', _("Error Writing config file")); + Error::add('general', T_("Error Writing config file")); return false; } } @@ -300,26 +300,26 @@ function install_create_config($web_path,$username,$password,$hostname,$database function install_create_account($username,$password,$password2) { if (!strlen($username) OR !strlen($password)) { - Error::add('general',_('No Username/Password specified')); + Error::add('general', T_('No Username/Password specified')); return false; } if ($password !== $password2) { - Error::add('general',_('Passwords do not match')); + Error::add('general', T_('Passwords do not match')); return false; } $dbh = Dba::dbh(); if (!is_resource($dbh)) { - Error::add('general', sprintf(_('Database Connection Failed: %s'), mysql_error())); + Error::add('general', sprintf(T_('Database Connection Failed: %s'), mysql_error())); return false; } $db_select = @mysql_select_db(Config::get('database_name'),$dbh); if (!$db_select) { - Error::add('general', sprintf(_('Database Select Failed: %s'), mysql_error())); + Error::add('general', sprintf(T_('Database Select Failed: %s'), mysql_error())); return false; } @@ -329,7 +329,7 @@ function install_create_account($username,$password,$password2) { $insert_id = User::create($username,'Administrator','',$password,'100'); if (!$insert_id) { - Error::add('general', sprintf(_('Insert of Base User Failed %s'), mysql_error())); + Error::add('general', sprintf(T_('Insert of Base User Failed %s'), mysql_error())); return false; } diff --git a/lib/javascript/search-data.php b/lib/javascript/search-data.php index 18432454..333d6acc 100644 --- a/lib/javascript/search-data.php +++ b/lib/javascript/search-data.php @@ -47,5 +47,5 @@ echo 'var types = $H(\''; echo arrayToJSON($search->types) . "'.evalJSON());\n"; echo 'var basetypes = $H(\''; echo arrayToJSON($search->basetypes) . "'.evalJSON());\n"; -echo 'removeIcon = \'<a href="javascript: void(0)">' . get_user_icon('disable', _('Remove')) . '</a>\';'; +echo 'removeIcon = \'<a href="javascript: void(0)">' . get_user_icon('disable', T_('Remove')) . '</a>\';'; ?> diff --git a/lib/preferences.php b/lib/preferences.php index a0e21edb..4f9a26b9 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -171,8 +171,8 @@ function create_preference_input($name,$value) { if ($value == '1') { $is_true = "selected=\"selected\""; } else { $is_false = "selected=\"selected\""; } echo "<select name=\"$name\">\n"; - echo "\t<option value=\"1\" $is_true>" . _("Enable") . "</option>\n"; - echo "\t<option value=\"0\" $is_false>" . _("Disable") . "</option>\n"; + echo "\t<option value=\"1\" $is_true>" . T_("Enable") . "</option>\n"; + echo "\t<option value=\"0\" $is_false>" . T_("Disable") . "</option>\n"; echo "</select>\n"; break; case 'play_type': @@ -181,29 +181,29 @@ function create_preference_input($name,$value) { elseif ($value == 'xspf_player') { $is_xspf_player = 'selected="selected"'; } else { $is_stream = "selected=\"selected\""; } echo "<select name=\"$name\">\n"; - echo "\t<option value=\"\">" . _('None') . "</option>\n"; + echo "\t<option value=\"\">" . T_('None') . "</option>\n"; if (Config::get('allow_stream_playback')) { - echo "\t<option value=\"stream\" $is_stream>" . _('Stream') . "</option>\n"; + echo "\t<option value=\"stream\" $is_stream>" . T_('Stream') . "</option>\n"; } if (Config::get('allow_democratic_playback')) { - echo "\t<option value=\"democratic\" $is_vote>" . _('Democratic') . "</option>\n"; + echo "\t<option value=\"democratic\" $is_vote>" . T_('Democratic') . "</option>\n"; } if (Config::get('allow_localplay_playback')) { - echo "\t<option value=\"localplay\" $is_local>" . _('Localplay') . "</option>\n"; + echo "\t<option value=\"localplay\" $is_local>" . T_('Localplay') . "</option>\n"; } - echo "\t<option value=\"xspf_player\" $is_xspf_player>" . _('Flash Player') . "</option>\n"; + echo "\t<option value=\"xspf_player\" $is_xspf_player>" . T_('Flash Player') . "</option>\n"; echo "</select>\n"; break; case 'playlist_type': $var_name = $value . "_type"; ${$var_name} = "selected=\"selected\""; echo "<select name=\"$name\">\n"; - echo "\t<option value=\"m3u\" $m3u_type>" . _('M3U') . "</option>\n"; - echo "\t<option value=\"simple_m3u\" $simple_m3u_type>" . _('Simple M3U') . "</option>\n"; - echo "\t<option value=\"pls\" $pls_type>" . _('PLS') . "</option>\n"; - echo "\t<option value=\"asx\" $asx_type>" . _('Asx') . "</option>\n"; - echo "\t<option value=\"ram\" $ram_type>" . _('RAM') . "</option>\n"; - echo "\t<option value=\"xspf\" $xspf_type>" . _('XSPF') . "</option>\n"; + echo "\t<option value=\"m3u\" $m3u_type>" . T_('M3U') . "</option>\n"; + echo "\t<option value=\"simple_m3u\" $simple_m3u_type>" . T_('Simple M3U') . "</option>\n"; + echo "\t<option value=\"pls\" $pls_type>" . T_('PLS') . "</option>\n"; + echo "\t<option value=\"asx\" $asx_type>" . T_('Asx') . "</option>\n"; + echo "\t<option value=\"ram\" $ram_type>" . T_('RAM') . "</option>\n"; + echo "\t<option value=\"xspf\" $xspf_type>" . T_('XSPF') . "</option>\n"; echo "</select>\n"; break; case 'lang': @@ -219,7 +219,7 @@ function create_preference_input($name,$value) { case 'localplay_controller': $controllers = Localplay::get_controllers(); echo "<select name=\"$name\">\n"; - echo "\t<option value=\"\">" . _('None') . "</option>\n"; + echo "\t<option value=\"\">" . T_('None') . "</option>\n"; foreach ($controllers as $controller) { if (!Localplay::is_enabled($controller)) { continue; } $is_selected = ''; @@ -233,10 +233,10 @@ function create_preference_input($name,$value) { elseif ($value == '100') { $is_admin = 'selected="selected"'; } elseif ($value == '50') { $is_manager = 'selected="selected"'; } echo "<select name=\"$name\">\n"; - echo "<option value=\"0\">" . _('Disabled') . "</option>\n"; - echo "<option value=\"25\" $is_user>" . _('User') . "</option>\n"; - echo "<option value=\"50\" $is_manager>" . _('Manager') . "</option>\n"; - echo "<option value=\"100\" $is_admin>" . _('Admin') . "</option>\n"; + echo "<option value=\"0\">" . T_('Disabled') . "</option>\n"; + echo "<option value=\"25\" $is_user>" . T_('User') . "</option>\n"; + echo "<option value=\"50\" $is_manager>" . T_('Manager') . "</option>\n"; + echo "<option value=\"100\" $is_admin>" . T_('Admin') . "</option>\n"; echo "</select>\n"; break; case 'theme_name': @@ -252,42 +252,42 @@ function create_preference_input($name,$value) { case 'playlist_method': ${$value} = ' selected="selected"'; echo "<select name=\"$name\">\n"; - echo "\t<option value=\"send\"$send>" . _('Send on Add') . "</option>\n"; - echo "\t<option value=\"send_clear\"$send_clear>" . _('Send and Clear on Add') . "</option>\n"; - echo "\t<option value=\"clear\"$clear>" . _('Clear on Send') . "</option>\n"; - echo "\t<option value=\"default\"$default>" . _('Default') . "</option>\n"; + echo "\t<option value=\"send\"$send>" . T_('Send on Add') . "</option>\n"; + echo "\t<option value=\"send_clear\"$send_clear>" . T_('Send and Clear on Add') . "</option>\n"; + echo "\t<option value=\"clear\"$clear>" . T_('Clear on Send') . "</option>\n"; + echo "\t<option value=\"default\"$default>" . T_('Default') . "</option>\n"; echo "</select>\n"; break; case 'bandwidth': ${"bandwidth_$value"} = ' selected="selected"'; echo "<select name=\"$name\">\n"; - echo "\t<option value=\"25\"$bandwidth_25>" . _('Low') . "</option>\n"; - echo "\t<option value=\"50\"$bandwidth_50>" . _('Medium') . "</option>\n"; - echo "\t<option value=\"75\"$bandwidth_75>" . _('High') . "</option>\n"; + echo "\t<option value=\"25\"$bandwidth_25>" . T_('Low') . "</option>\n"; + echo "\t<option value=\"50\"$bandwidth_50>" . T_('Medium') . "</option>\n"; + echo "\t<option value=\"75\"$bandwidth_75>" . T_('High') . "</option>\n"; echo "</select>\n"; break; case 'features': ${"features_$value"} = ' selected="selected"'; echo "<select name=\"$name\">\n"; - echo "\t<option value=\"25\"$features_25>" . _('Low') . "</option>\n"; - echo "\t<option value=\"50\"$features_50>" . _('Medium') . "</option>\n"; - echo "\t<option value=\"75\"$features_75>" . _('High') . "</option>\n"; + echo "\t<option value=\"25\"$features_25>" . T_('Low') . "</option>\n"; + echo "\t<option value=\"50\"$features_50>" . T_('Medium') . "</option>\n"; + echo "\t<option value=\"75\"$features_75>" . T_('High') . "</option>\n"; echo "</select>\n"; break; case 'transcode': ${$value} = ' selected="selected"'; echo "<select name=\"$name\">\n"; - echo "\t<option value=\"never\"$never>" . _('Never') . "</option>\n"; - echo "\t<option value=\"default\"$default>" . _('Default') . "</option>\n"; - echo "\t<option value=\"always\"$always>" . _('Always') . "</option>\n"; + echo "\t<option value=\"never\"$never>" . T_('Never') . "</option>\n"; + echo "\t<option value=\"default\"$default>" . T_('Default') . "</option>\n"; + echo "\t<option value=\"always\"$always>" . T_('Always') . "</option>\n"; echo "</select>\n"; break; case 'show_lyrics': if ($value == '1') { $is_true = "selected=\"selected\""; } else { $is_false = "selected=\"selected\""; } echo "<select name=\"$name\">\n"; - echo "\t<option value=\"1\" $is_true>" . _("Enable") . "</option>\n"; - echo "\t<option value=\"0\" $is_false>" . _("Disable") . "</option>\n"; + echo "\t<option value=\"1\" $is_true>" . T_("Enable") . "</option>\n"; + echo "\t<option value=\"0\" $is_false>" . T_("Disable") . "</option>\n"; echo "</select>\n"; break; default: diff --git a/lib/rating.lib.php b/lib/rating.lib.php index 42bd8d59..3323f6e5 100644 --- a/lib/rating.lib.php +++ b/lib/rating.lib.php @@ -55,26 +55,26 @@ function get_rating_name($score) { switch ($score) { case '0': - return _("Don't Play"); + return T_("Don't Play"); break; case '1': - return _("It's Pretty Bad"); + return T_("It's Pretty Bad"); break; case '2': - return _("It's Ok"); + return T_("It's Ok"); break; case '3': - return _("It's Pretty Good"); + return T_("It's Pretty Good"); break; case '4': - return _("I Love It!"); + return T_("I Love It!"); break; case '5': - return _("It's Insane"); + return T_("It's Insane"); break; // I'm fired default: - return _("Off the Charts!"); + return T_("Off the Charts!"); break; } // end switch diff --git a/lib/ui.lib.php b/lib/ui.lib.php index 756db2fb..ce0a12ed 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -202,68 +202,68 @@ function get_location() { switch ($location['page']) { case 'index.php': - $location['title'] = _('Home'); + $location['title'] = T_('Home'); break; case 'upload.php': - $location['title'] = _('Upload'); + $location['title'] = T_('Upload'); break; case 'localplay.php': - $location['title'] = _('Local Play'); + $location['title'] = T_('Local Play'); break; case 'randomplay.php': - $location['title'] = _('Random Play'); + $location['title'] = T_('Random Play'); break; case 'playlist.php': - $location['title'] = _('Playlist'); + $location['title'] = T_('Playlist'); break; case 'search.php': - $location['title'] = _('Search'); + $location['title'] = T_('Search'); break; case 'preferences.php': - $location['title'] = _('Preferences'); + $location['title'] = T_('Preferences'); break; case 'admin/index.php': - $location['title'] = _('Admin-Catalog'); + $location['title'] = T_('Admin-Catalog'); $location['section'] = 'admin'; break; case 'admin/catalog.php': - $location['title'] = _('Admin-Catalog'); + $location['title'] = T_('Admin-Catalog'); $location['section'] = 'admin'; break; case 'admin/users.php': - $location['title'] = _('Admin-User Management'); + $location['title'] = T_('Admin-User Management'); $location['section'] = 'admin'; break; case 'admin/mail.php': - $location['title'] = _('Admin-Mail Users'); + $location['title'] = T_('Admin-Mail Users'); $location['section'] = 'admin'; break; case 'admin/access.php': - $location['title'] = _('Admin-Manage Access Lists'); + $location['title'] = T_('Admin-Manage Access Lists'); $location['section'] = 'admin'; break; case 'admin/preferences.php': - $location['title'] = _('Admin-Site Preferences'); + $location['title'] = T_('Admin-Site Preferences'); $location['section'] = 'admin'; break; case 'admin/modules.php': - $location['title'] = _('Admin-Manage Modules'); + $location['title'] = T_('Admin-Manage Modules'); $location['section'] = 'admin'; break; case 'browse.php': - $location['title'] = _('Browse Music'); + $location['title'] = T_('Browse Music'); $location['section'] = 'browse'; break; case 'albums.php': - $location['title'] = _('Albums'); + $location['title'] = T_('Albums'); $location['section'] = 'browse'; break; case 'artists.php': - $location['title'] = _('Artists'); + $location['title'] = T_('Artists'); $location['section'] = 'browse'; break; case 'stats.php': - $location['title'] = _('Statistics'); + $location['title'] = T_('Statistics'); break; default: $location['title'] = ''; @@ -317,7 +317,7 @@ function show_album_select($name='album',$album_id=0,$allow_add=0,$song_id=0) { if ($allow_add) { // Append additional option to the end with value=-1 - echo "\t<option value=\"-1\">" . _('Add New') . "...</option>\n"; + echo "\t<option value=\"-1\">" . T_('Add New') . "...</option>\n"; } echo "</select>\n"; @@ -397,7 +397,7 @@ function show_catalog_select($name='catalog',$catalog_id=0,$style='') { function show_user_select($name,$selected='',$style='') { echo "<select name=\"$name\" style=\"$style\">\n"; - echo "\t<option value=\"\">" . _('All') . "</option>\n"; + echo "\t<option value=\"\">" . T_('All') . "</option>\n"; $sql = "SELECT `id`,`username`,`fullname` FROM `user` ORDER BY `fullname`"; $db_results = Dba::read($sql); @@ -424,7 +424,7 @@ function show_user_select($name,$selected='',$style='') { function show_playlist_select($name,$selected='',$style='') { echo "<select name=\"$name\" style=\"$style\">\n"; - echo "\t<option value=\"\">" . _('None') . "</option>\n"; + echo "\t<option value=\"\">" . T_('None') . "</option>\n"; $sql = "SELECT `id`,`name` FROM `playlist` ORDER BY `name`"; $db_results = Dba::read($sql); @@ -480,7 +480,7 @@ function get_user_icon($name,$title='',$id='') { $name = $name['0']; } - if (!$title) { $title = _(ucfirst($name)); } + if (!$title) { $title = T_(ucfirst($name)); } if ($id) { $id = ' id="' . $id . '" '; @@ -747,10 +747,10 @@ function update_text($field, $value) { function print_bool($value) { if ($value) { - $string = '<span class="item_on">' . _('On') . '</span>'; + $string = '<span class="item_on">' . T_('On') . '</span>'; } else { - $string = '<span class="item_off">' . _('Off') . '</span>'; + $string = '<span class="item_off">' . T_('Off') . '</span>'; } return $string; diff --git a/locale/base/TRANSLATIONS b/locale/base/TRANSLATIONS index 43e14519..eb97391d 100644 --- a/locale/base/TRANSLATIONS +++ b/locale/base/TRANSLATIONS @@ -89,7 +89,7 @@ Creating a New Translation: the "create_preference_input" function and add a line for your own language. For example to add en_US support add the following line - echo "\t<option value=\"en_US\" $en_US_lang>" . _("English") . "</option>\n"; + echo "\t<option value=\"en_US\" $en_US_lang>" . T_("English") . "</option>\n"; Make sure that it comes after the <select> statement. This will be fixed for future releases... Sorry :S @@ -90,14 +90,14 @@ if (($_POST['username'] && $_POST['password']) || } else { debug_event('Login', scrub_out($username) . ' attempted to login and failed', '1'); - Error::add('general', _('Error Username or Password incorrect, please try again')); + Error::add('general', T_('Error Username or Password incorrect, please try again')); } $user = User::get_from_username($username); if ($user->disabled) { $auth['success'] = false; - Error::add('general', _('User Disabled please contact Admin')); + Error::add('general', T_('User Disabled please contact Admin')); debug_event('Login', scrub_out($username) . ' is disabled and attempted to login', '1'); } // if user disabled elseif (Config::get('prevent_multiple_logins')) { @@ -105,7 +105,7 @@ if (($_POST['username'] && $_POST['password']) || $current_ip = inet_pton($_SERVER['REMOTE_ADDR']); if ($current_ip && ($current_ip != $session_ip)) { $auth['success'] = false; - Error::add('general',_('User Already Logged in')); + Error::add('general', T_('User Already Logged in')); debug_event('Login', scrub_out($username) . ' is already logged in from ' . $session_ip . ' and attempted to login from ' . $current_ip, '1'); } // if logged in multiple times } // if prevent multiple logins @@ -126,7 +126,7 @@ if (($_POST['username'] && $_POST['password']) || } else { $auth['success'] = false; - Error::add('general', _('Unable to create local account')); + Error::add('general', T_('Unable to create local account')); } } // End if auto_create diff --git a/lostpassword.php b/lostpassword.php index 404bbbe0..a969871c 100644 --- a/lostpassword.php +++ b/lostpassword.php @@ -42,9 +42,9 @@ switch ($action) { $result = send_newpassword($email, $current_ip); } if ($result) { - Error::add('general', _('Password has been sent')); + Error::add('general', T_('Password has been sent')); } else { - Error::add('general', _('Password has not been sent')); + Error::add('general', T_('Password has not been sent')); } require Config::get('prefix') . '/templates/show_login_form.inc.php'; @@ -62,13 +62,13 @@ function send_newpassword($email,$current_ip){ $mailer = new AmpacheMail(); $mailer->set_default_sender(); - $mailer->subject = _("Lost Password"); + $mailer->subject = T_("Lost Password"); $mailer->recipient_name = $client->fullname; $mailer->recipient = $client->email; - $message = sprintf(_("A user from %s has requested a password reset for '%s'."), $current_ip, $client->username); + $message = sprintf(T_("A user from %s has requested a password reset for '%s'."), $current_ip, $client->username); $message .= "\n"; - $message .= sprintf(_("The password has been set to: %s"), $newpassword); + $message .= sprintf(T_("The password has been set to: %s"), $newpassword); $mailer->message = $message; return $mailer->send(); diff --git a/modules/localplay/httpq.controller.php b/modules/localplay/httpq.controller.php index 6f863037..fd3ddfe6 100644 --- a/modules/localplay/httpq.controller.php +++ b/modules/localplay/httpq.controller.php @@ -228,10 +228,10 @@ class AmpacheHttpq extends localplay_controller { */ public function instance_fields() { - $fields['name'] = array('description'=>_('Instance Name'),'type'=>'textbox'); - $fields['host'] = array('description'=>_('Hostname'),'type'=>'textbox'); - $fields['port'] = array('description'=>_('Port'),'type'=>'textbox'); - $fields['password'] = array('description'=>_('Password'),'type'=>'textbox'); + $fields['name'] = array('description' => T_('Instance Name'),'type'=>'textbox'); + $fields['host'] = array('description' => T_('Hostname'),'type'=>'textbox'); + $fields['port'] = array('description' => T_('Port'),'type'=>'textbox'); + $fields['password'] = array('description' => T_('Password'),'type'=>'textbox'); return $fields; @@ -500,11 +500,11 @@ class AmpacheHttpq extends localplay_controller { break; case 'demo_id': $democratic = new Democratic($url_data['demo_id']); - $data['name'] = _('Democratic') . ' - ' . $democratic->name; + $data['name'] = T_('Democratic') . ' - ' . $democratic->name; $data['link'] = ''; break; case 'random': - $data['name'] = _('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); + $data['name'] = T_('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); $data['link'] = ''; break; default: diff --git a/modules/localplay/mpd.controller.php b/modules/localplay/mpd.controller.php index 553082e4..c745988d 100644 --- a/modules/localplay/mpd.controller.php +++ b/modules/localplay/mpd.controller.php @@ -246,10 +246,10 @@ class AmpacheMpd extends localplay_controller { */ public function instance_fields() { - $fields['name'] = array('description'=>_('Instance Name'),'type'=>'textbox'); - $fields['host'] = array('description'=>_('Hostname'),'type'=>'textbox'); - $fields['port'] = array('description'=>_('Port'),'type'=>'textbox'); - $fields['password'] = array('description'=>_('Password'),'type'=>'textbox'); + $fields['name'] = array('description' => T_('Instance Name'),'type'=>'textbox'); + $fields['host'] = array('description' => T_('Hostname'),'type'=>'textbox'); + $fields['port'] = array('description' => T_('Port'),'type'=>'textbox'); + $fields['password'] = array('description' => T_('Password'),'type'=>'textbox'); return $fields; @@ -469,11 +469,11 @@ class AmpacheMpd extends localplay_controller { break; case 'demo_id': $democratic = new Democratic($url_data['demo_id']); - $data['name'] = _('Democratic') . ' - ' . $democratic->name; + $data['name'] = T_('Democratic') . ' - ' . $democratic->name; $data['link'] = ''; break; case 'random': - $data['name'] = _('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); + $data['name'] = T_('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); $data['link'] = ''; break; default: @@ -503,7 +503,7 @@ class AmpacheMpd extends localplay_controller { } // end if results else { - $data['name'] = _('Unknown'); + $data['name'] = T_('Unknown'); $data['link'] = ''; } diff --git a/modules/localplay/shoutcast.controller.php b/modules/localplay/shoutcast.controller.php index 760b228f..fcedcd8f 100644 --- a/modules/localplay/shoutcast.controller.php +++ b/modules/localplay/shoutcast.controller.php @@ -249,10 +249,10 @@ class AmpacheShoutCast extends localplay_controller { */ public function instance_fields() { - $fields['name'] = array('description'=>_('Instance Name'),'type'=>'textbox'); - $fields['pid'] = array('description'=>_('PID File'),'type'=>'textbox'); - $fields['playlist'] = array('description'=>_('Playlist File'),'type'=>'textbox'); - $fields['local_root'] = array('description'=>_('Local Path to Files'),'type'=>'textbox'); + $fields['name'] = array('description' => T_('Instance Name'),'type'=>'textbox'); + $fields['pid'] = array('description' => T_('PID File'),'type'=>'textbox'); + $fields['playlist'] = array('description' => T_('Playlist File'),'type'=>'textbox'); + $fields['local_root'] = array('description' => T_('Local Path to Files'),'type'=>'textbox'); return $fields; diff --git a/modules/localplay/vlc.controller.php b/modules/localplay/vlc.controller.php index 28e99292..1bbd155b 100644 --- a/modules/localplay/vlc.controller.php +++ b/modules/localplay/vlc.controller.php @@ -228,10 +228,10 @@ class AmpacheVlc extends localplay_controller { */ public function instance_fields() { - $fields['name'] = array('description'=>_('Instance Name'),'type'=>'textbox'); - $fields['host'] = array('description'=>_('Hostname'),'type'=>'textbox'); - $fields['port'] = array('description'=>_('Port'),'type'=>'textbox'); - $fields['password'] = array('description'=>_('Password'),'type'=>'textbox'); + $fields['name'] = array('description' => T_('Instance Name'),'type'=>'textbox'); + $fields['host'] = array('description' => T_('Hostname'),'type'=>'textbox'); + $fields['port'] = array('description' => T_('Port'),'type'=>'textbox'); + $fields['password'] = array('description' => T_('Password'),'type'=>'textbox'); return $fields; @@ -532,11 +532,11 @@ class AmpacheVlc extends localplay_controller { break; case 'demo_id': $democratic = new Democratic($url_data['demo_id']); - $data['name'] = _('Democratic') . ' - ' . $democratic->name; + $data['name'] = T_('Democratic') . ' - ' . $democratic->name; $data['link'] = ''; break; case 'random': - $data['name'] = _('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); + $data['name'] = T_('Random') . ' - ' . scrub_out(ucfirst($url_data['type'])); $data['link'] = ''; break; default: diff --git a/playlist.php b/playlist.php index c09e912f..c15918b8 100644 --- a/playlist.php +++ b/playlist.php @@ -69,7 +69,7 @@ switch ($_REQUEST['action']) { $playlist->create($playlist_name,$playlist_type); $_SESSION['data']['playlist_id'] = $playlist->id; - show_confirmation(_('Playlist Created'), sprintf(_('%1$s (%2$s) has been created'), $playlist_name, $playlist_type),'playlist.php'); + show_confirmation(T_('Playlist Created'), sprintf(T_('%1$s (%2$s) has been created'), $playlist_name, $playlist_type),'playlist.php'); break; case 'delete_playlist': // If we made it here, we didn't have sufficient rights. @@ -105,11 +105,11 @@ switch ($_REQUEST['action']) { if($result == false) { $url = Config::get('web_path') . '/playlist.php?action=show_import_playlist'; - $title = _('Playlist Not Imported'); + $title = T_('Playlist Not Imported'); $body = $reason; } else { $url = Config::get('web_path') . '/playlist.php?action=show_playlist&playlist_id='.$playlist_id; - $title = _('Playlist Imported'); + $title = T_('Playlist Imported'); $body = basename($_FILES['filename']['name']); $body .= "<br />"; $body .= $reason; @@ -141,7 +141,7 @@ switch ($_REQUEST['action']) { prune_empty_playlists(); $url = Config::get('web_path') . '/playlist.php'; - $title = _('Empty Playlists Deleted'); + $title = T_('Empty Playlists Deleted'); $body = ''; show_confirmation($title,$body,$url); break; diff --git a/preferences.php b/preferences.php index 47a81be2..7b700883 100644 --- a/preferences.php +++ b/preferences.php @@ -45,7 +45,7 @@ switch($_REQUEST['action']) { if ($_POST['method'] == 'admin') { $user_id = '-1'; $system = true; - $fullname = _('Server'); + $fullname = T_('Server'); $_REQUEST['action'] = 'admin'; } else { @@ -80,7 +80,7 @@ switch($_REQUEST['action']) { access_denied(); exit; } - $fullname= _('Server'); + $fullname= T_('Server'); $preferences = $GLOBALS['user']->get_preferences($_REQUEST['tab'], true); break; case 'user': @@ -112,12 +112,12 @@ switch($_REQUEST['action']) { $_POST['username'] = $GLOBALS['user']->username; if (!$GLOBALS['user']->update($_POST)) { - Error::add('general',_('Error Update Failed')); + Error::add('general', T_('Error Update Failed')); } else { $_REQUEST['action'] = 'confirm'; - $title = _('Updated'); - $text = _('Your Account has been updated'); + $title = T_('Updated'); + $text = T_('Your Account has been updated'); $next_url = Config::get('web_path') . '/preferences.php?tab=account'; } break; @@ -59,7 +59,7 @@ switch ($_REQUEST['action']) { require_once Config::get('prefix') . '/templates/show_add_live_stream.inc.php'; } else { - $body = _('Radio Station Added'); + $body = T_('Radio Station Added'); $title = ''; show_confirmation($title,$body,Config::get('web_path') . '/index.php'); } diff --git a/register.php b/register.php index 10f4a3d5..e37f171f 100644 --- a/register.php +++ b/register.php @@ -77,30 +77,30 @@ switch ($_REQUEST['action']) { if (Config::get('captcha_public_reg')) { $captcha = captcha::solved(); if(!isset ($captcha)) { - Error::add('captcha',_('Error Captcha Required')); + Error::add('captcha', T_('Error Captcha Required')); } if (isset ($captcha)) { if ($captcha) { $msg="SUCCESS"; } else { - Error::add('captcha',_('Error Captcha Failed')); + Error::add('captcha', T_('Error Captcha Failed')); } } // end if we've got captcha } // end if it's enabled if (Config::get('user_agreement')) { if (!$_POST['accept_agreement']) { - Error::add('user_agreement',_("You <U>must</U> accept the user agreement")); + Error::add('user_agreement', T_("You <U>must</U> accept the user agreement")); } } // if they have to agree to something if (!$_POST['username']) { - Error::add('username',_("You did not enter a username")); + Error::add('username', T_("You did not enter a username")); } if(!$fullname) { - Error::add('fullname',_("Please fill in your full name (Firstname Lastname)")); + Error::add('fullname', T_("Please fill in your full name (Firstname Lastname)")); } /* Check the mail for correct address formation. */ @@ -121,21 +121,21 @@ switch ($_REQUEST['action']) { $mmsg = "MAILOK"; } else { - Error::add('email',_("Error Email address not confirmed") + Error::add('email', T_("Error Email address not confirmed") . "<br />$validate_results[1]"); } /* End of mailcheck */ if (!$pass1) { - Error::add('password',_("You must enter a password")); + Error::add('password', T_("You must enter a password")); } if ( $pass1 != $pass2 ) { - Error::add('password',_("Your passwords do not match")); + Error::add('password', T_("Your passwords do not match")); } if (!User::check_username($username)) { - Error::add('duplicate_user',_("Error Username already exists")); + Error::add('duplicate_user', T_("Error Username already exists")); } // If we've hit an error anywhere up there break! @@ -164,7 +164,7 @@ switch ($_REQUEST['action']) { $access, Config::get('admin_enable_required')); if (!$new_user) { - Error::add('duplicate_user',_("Error: Insert Failed")); + Error::add('duplicate_user', T_("Error: Insert Failed")); require_once Config::get('prefix') . '/templates/show_user_registration.inc.php'; break; } @@ -46,7 +46,7 @@ switch ($_REQUEST['action']) { case 'save_as_track': $playlist_id = save_search($_REQUEST); $playlist = new Playlist($playlist_id); - show_confirmation(_('Search Saved'),sprintf(_('Your Search has been saved as a track in %s'), $playlist->name),conf('web_path') . "/search.php"); + show_confirmation(T_('Search Saved'),sprintf(T_('Your Search has been saved as a track in %s'), $playlist->name),conf('web_path') . "/search.php"); break; case 'save_as_smartplaylist': $playlist = new Search(); diff --git a/server/song.ajax.php b/server/song.ajax.php index 291521da..970daac8 100644 --- a/server/song.ajax.php +++ b/server/song.ajax.php @@ -47,7 +47,7 @@ switch ($_REQUEST['action']) { //Return the new Ajax::button $id = 'button_flip_state_' . $song->id; $button = $song->enabled ? 'disable' : 'enable'; - $results[$id] = Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$button,_(ucfirst($button)),'flip_state_' . $song->id); + $results[$id] = Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$button, T_(ucfirst($button)),'flip_state_' . $song->id); break; default: diff --git a/server/xml.server.php b/server/xml.server.php index 957f212b..455c598a 100644 --- a/server/xml.server.php +++ b/server/xml.server.php @@ -46,7 +46,7 @@ header("Content-Disposition: attachment; filename=information.xml"); if (!Config::get('access_control')) { ob_end_clean(); debug_event('Access Control','Error Attempted to use XML API with Access Control turned off','3'); - echo xmlData::error('501',_('Access Control not Enabled')); + echo xmlData::error('501', T_('Access Control not Enabled')); exit; } @@ -57,7 +57,7 @@ if (!Config::get('access_control')) { if (!vauth::session_exists('api', $_REQUEST['auth']) AND $_REQUEST['action'] != 'handshake' AND $_REQUEST['action'] != 'ping') { debug_event('Access Denied','Invalid Session attempt to API [' . $_REQUEST['action'] . ']','3'); ob_end_clean(); - echo xmlData::error('401',_('Session Expired')); + echo xmlData::error('401', T_('Session Expired')); exit(); } @@ -68,7 +68,7 @@ $username = ($_REQUEST['action'] == 'handshake' || $_REQUEST['action'] == 'ping' if (!Access::check_network('init-api',$username,'5')) { debug_event('Access Denied','Unauthorized access attempt to API [' . $_SERVER['REMOTE_ADDR'] . ']', '3'); ob_end_clean(); - echo xmlData::error('403',_('Unauthorized access attempt to API - ACL Error')); + echo xmlData::error('403', T_('Unauthorized access attempt to API - ACL Error')); exit(); } @@ -99,4 +99,4 @@ foreach ($methods as $method) { // If we manage to get here, we still need to hand out an XML document ob_end_clean(); -echo xmlData::error('405',_('Invalid Request')); +echo xmlData::error('405', T_('Invalid Request')); @@ -52,7 +52,7 @@ switch ($_REQUEST['action']) { $object = shoutBox::get_object($_REQUEST['type'],$_REQUEST['id']); if (!$object->id) { - Error::add('general',_('Invalid Object Selected')); + Error::add('general', T_('Invalid Object Selected')); Error::display('general'); break; } @@ -46,7 +46,7 @@ switch ($_REQUEST['action']) { $return = $lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title)); $link = '<a href="http://lyricwiki.org/' . rawurlencode(ucwords($song->f_artist)) . ':' . rawurlencode(ucwords($song->title)) . '" target="_blank">'; /* HINT: Artist, Song Title */ - $link .= sprintf(_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title)); + $link .= sprintf(T_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title)); $link .= "</a><br /><br />"; require_once Config::get('prefix') . '/templates/show_lyrics.inc.php'; } @@ -64,7 +64,7 @@ switch ($_REQUEST['action']) { $return = $lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title)); $link = '<a href="http://lyricwiki.org/' . rawurlencode(ucwords($song->f_artist)) . ':' . rawurlencode(ucwords($song->title)) . '" target="_blank">'; /* HINT: Artist, Song Title */ - $link .= sprintf(_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title)); + $link .= sprintf(T_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title)); $link .= "</a><br /><br />"; require_once Config::get('prefix') . '/templates/show_lyrics.inc.php'; } diff --git a/templates/browse_filters.inc.php b/templates/browse_filters.inc.php index 7fe310d0..c0117c9f 100644 --- a/templates/browse_filters.inc.php +++ b/templates/browse_filters.inc.php @@ -29,49 +29,49 @@ session_start(); $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?> <?php $allowed_filters = Browse::get_allowed_filters($browse->get_type()); ?> -<li><h4><?php echo _('Filters'); ?></h4> +<li><h4><?php echo T_('Filters'); ?></h4> <div class="sb3"> <?php if (in_array('starts_with',$allowed_filters)) { ?> <form id="multi_alpha_filter_form" method="post" action="javascript:void(0);"> - <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo _('Starts With'); ?></label> + <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo T_('Starts With'); ?></label> <input type="text" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php $browse->set_catalog($_SESSION['catalog']); echo scrub_out($browse->get_filter('starts_with'));?>" onKeyUp="delayRun(this, '400', 'ajaxState', '<?php echo $ajax_info; ?>?page=browse&action=browse&browse_id=<?php echo $browse->id; ?>&key=starts_with', 'multi_alpha_filter');"> </form> <?php } // end if alpha_match ?> <?php if (in_array('minimum_count',$allowed_filters)) { ?> <input id="mincountCB" type="checkbox" value="1" /> - <label id="mincountLabel" for="mincountCB"><?php echo _('Minimum Count'); ?></label><br /> + <label id="mincountLabel" for="mincountCB"><?php echo T_('Minimum Count'); ?></label><br /> <?php echo Ajax::observe('mincountCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=min_count&value=1', '')); ?> <?php } ?> <?php if (in_array('rated',$allowed_filters)) { ?> <input id="ratedCB" type="checkbox" value="1" /> - <label id="ratedLabel" for="ratedCB"><?php echo _('Rated'); ?></label><br /> + <label id="ratedLabel" for="ratedCB"><?php echo T_('Rated'); ?></label><br /> <?php echo Ajax::observe('ratedCB', 'click', Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=rated&value=1', '')); ?> <?php } ?> <?php if (in_array('unplayed',$allowed_filters)) { ?> <input id="unplayedCB" type="checkbox" <?php echo $string = $browse->get_filter('unplayed') ? 'checked="checked"' : ''; ?>/> - <label id="unplayedLabel" for="unplayedCB"><?php echo _('Unplayed'); ?></label><br /> + <label id="unplayedLabel" for="unplayedCB"><?php echo T_('Unplayed'); ?></label><br /> <?php } ?> <?php if (in_array('playlist_type',$allowed_filters)) { ?> <input id="show_allplCB" type="checkbox" <?php echo $string = $browse->get_filter('playlist_type') ? 'checked="checked"' : ''; ?>/> - <label id="show_allplLabel" for="showallplCB"><?php echo _('All Playlists'); ?></label><br /> + <label id="show_allplLabel" for="showallplCB"><?php echo T_('All Playlists'); ?></label><br /> <?php echo Ajax::observe('show_allplCB','click',Ajax::action('?page=browse&action=browse&browse_id=' . $browse->id . '&key=playlist_type&value=1','')); ?> <?php } // if playlist_type ?> <?php if (in_array('object_type',$allowed_filters)) { ?> <?php $string = 'otype_' . $browse->get_filter('object_type'); ${$string} = 'selected="selected"'; ?> <input id="typeSongRadio" type="radio" name="object_type" value="1" <?php echo $otype_song; ?>/> - <label id="typeSongLabel" for="typeSongRadio"><?php echo _('Song Title'); ?></label><br /> + <label id="typeSongLabel" for="typeSongRadio"><?php echo T_('Song Title'); ?></label><br /> <?php echo Ajax::observe('typeSongRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=song','')); ?> <input id="typeAlbumRadio" type="radio" name="object_type" value="1" /> - <label id="typeAlbumLabel" for="typeAlbumRadio"><?php echo _('Albums'); ?></label><br /> + <label id="typeAlbumLabel" for="typeAlbumRadio"><?php echo T_('Albums'); ?></label><br /> <?php echo Ajax::observe('typeAlbumRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=album','')); ?> <input id="typeArtistRadio" type="radio" name="object_type" value="1" /> - <label id="typeArtistLabel" for="typeArtistRadio"><?php echo _('Artist'); ?></label><br /> + <label id="typeArtistLabel" for="typeArtistRadio"><?php echo T_('Artist'); ?></label><br /> <?php echo Ajax::observe('typeArtistRadio','click',Ajax::action('?page=tag&action=browse_type&browse_id=' . $browse->id . '&type=artist','')); ?> <?php } ?> <?php if(in_array('catalog',$allowed_filters)) { ?> <form method="post" id="catalog_choice" action="javascript.void(0);"> - <label id="catalogLabel" for="catalog_select"><?php echo _('Catalog'); ?></label><br /> + <label id="catalogLabel" for="catalog_select"><?php echo T_('Catalog'); ?></label><br /> <select id="catalog_select" name="catalog_key"> <option value="0">All</option> <?php @@ -95,7 +95,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); </form> <?php } ?> <?php if (in_array('show_art',$allowed_filters)) { ?> - <?php echo _('Toggle Artwork'); ?> <input id="show_artCB" type="checkbox" <?php echo Art::is_enabled() ? 'checked="checked"' : ''; ?>/> + <?php echo T_('Toggle Artwork'); ?> <input id="show_artCB" type="checkbox" <?php echo Art::is_enabled() ? 'checked="checked"' : ''; ?>/> <?php echo Ajax::observe('show_artCB','click',Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id, '')); ?> <?php } // if show_art ?> </div> diff --git a/templates/error_page.inc.php b/templates/error_page.inc.php index 91c73be5..0ea85359 100644 --- a/templates/error_page.inc.php +++ b/templates/error_page.inc.php @@ -34,7 +34,7 @@ <head> <meta http-equiv="refresh" content="10;URL=<?php echo($redirect_url);?>" /> <link rel="shortcut icon" href="<?php echo $web_path; ?>/favicon.ico" /> -<title><?php echo( _("Ampache error page"));?></title> +<title><?php echo( T_("Ampache error page"));?></title> <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/base.css" type="text/css" media="screen" /> <link rel="stylesheet" href="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/templates/default.css" type="text/css" media="screen" /> </head> @@ -51,9 +51,9 @@ </div> <div> </div> <div id="errormsg"> - <?php echo (_("The folowing error has occured, you will automaticly be redirected after 10 seconds.") ); ?> + <?php echo (T_("The folowing error has occured, you will automaticly be redirected after 10 seconds.") ); ?> <br /><br /> - <?php echo(_("Error messages"));?>:<br /> + <?php echo(T_("Error messages"));?>:<br /> <?php Error::display('general'); ?> </div> </div> diff --git a/templates/footer.inc.php b/templates/footer.inc.php index 21e8fe59..f40c2a75 100644 --- a/templates/footer.inc.php +++ b/templates/footer.inc.php @@ -28,14 +28,14 @@ ?> <div style="clear:both;"></div> <?php if (isset($_SESSION['userdata']['password'])) {?> - <span class="fatalerror"><?php echo _('Using Old Password Encryption, Please Reset your Password'); ?></span> + <span class="fatalerror"><?php echo T_('Using Old Password Encryption, Please Reset your Password'); ?></span> <?php } ?> </div> <!-- end id="content"--> </div> <!-- end id="maincontainer"--> <div id="footer"> <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> Copyright (c) 2001 - 2011 Ampache.org - <?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> + <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo T_('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> </html> diff --git a/templates/header.inc.php b/templates/header.inc.php index 8a7fe98f..86c62046 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -47,8 +47,8 @@ if(!is_file($cssdir.'default-rtl.css')) { <link rel="search" type="application/opensearchdescription+xml" title="<?php echo scrub_out(Config::get('site_title')); ?>" href="<?php echo $web_path; ?>/search.php?action=descriptor" /> <?php if (Config::get('use_rss')) { ?> -<link rel="alternate" type="application/rss+xml" title="<?php echo _('Now Playing'); ?>" href="<?php echo $web_path; ?>/rss.php" /> -<link rel="alternate" type="application/rss+xml" title="<?php echo _('Recently Played'); ?>" href="<?php echo $web_path; ?>/rss.php?type=recently_played" /> +<link rel="alternate" type="application/rss+xml" title="<?php echo T_('Now Playing'); ?>" href="<?php echo $web_path; ?>/rss.php" /> +<link rel="alternate" type="application/rss+xml" title="<?php echo T_('Recently Played'); ?>" href="<?php echo $web_path; ?>/rss.php?type=recently_played" /> <?php } ?> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo Config::get('site_charset'); ?>" /> <title><?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?></title> @@ -73,7 +73,7 @@ if (Config::get('use_rss')) { ?> <?php show_box_top('','box box_headerbox'); ?> <?php require_once Config::get('prefix') . '/templates/show_search_bar.inc.php'; ?> <?php require_once Config::get('prefix') . '/templates/show_playtype_switch.inc.php'; ?> - <span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo _('Log out'); ?>]</a></span> + <span id="loginInfo"><a href="<?php echo Config::get('web_path'); ?>/preferences.php?tab=account"><?php echo $GLOBALS['user']->fullname; ?></a> <a href="<?php echo Config::get('web_path'); ?>/logout.php">[<?php echo T_('Log out'); ?>]</a></span> <?php show_box_bottom(); ?> </div> <!-- End headerbox --> </div><!-- End header --> @@ -89,7 +89,7 @@ if (Config::get('use_rss')) { ?> <div id="content"> <?php if (Config::get('int_config_version') != Config::get('config_version') AND $GLOBALS['user']->has_access(100)) { ?> <div class="fatalerror"> - <?php echo _('Error Config File Out of Date'); ?> - <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a> + <?php echo T_('Error Config File Out of Date'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config'); ?></a> </div> <?php } ?> diff --git a/templates/install_header.inc.php b/templates/install_header.inc.php index 9f91b952..57ee13db 100644 --- a/templates/install_header.inc.php +++ b/templates/install_header.inc.php @@ -41,20 +41,20 @@ $prefix = realpath(dirname(__FILE__). "/../"); <script src="modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> <script src="lib/javascript/base.js" language="javascript" type="text/javascript"></script> <div id="header"> -<h1><?php echo _('Ampache Installation'); ?></h1> +<h1><?php echo T_('Ampache Installation'); ?></h1> <p>For the love of Music</p> </div> <div id="text-box"> <div class="notify"> - <h3><?php echo _('Requirements'); ?></h3> + <h3><?php echo T_('Requirements'); ?></h3> <p> - <?php echo _('This page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following prerequisites:'); ?> + <?php echo T_('This page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following prerequisites:'); ?> </p> <ul> - <li><?php echo _('A MySQL server with a username and password that can create/modify databases'); ?></li> - <li><?php echo sprintf(_('Your webserver has read access to the files %s and %s'),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.php.dist'); ?></li> + <li><?php echo T_('A MySQL server with a username and password that can create/modify databases'); ?></li> + <li><?php echo sprintf(T_('Your webserver has read access to the files %s and %s'),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.php.dist'); ?></li> </ul> <p> -<?php echo sprintf(_("Once you have ensured that the above requirements are met please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your Ampache install at a later date simply edit %s"), $prefix . '/config/ampache.cfg.php'); ?> +<?php echo sprintf(T_("Once you have ensured that the above requirements are met please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your Ampache install at a later date simply edit %s"), $prefix . '/config/ampache.cfg.php'); ?> </p> </div> diff --git a/templates/list_header.inc.php b/templates/list_header.inc.php index 26366a18..ed66bb92 100644 --- a/templates/list_header.inc.php +++ b/templates/list_header.inc.php @@ -106,8 +106,8 @@ if ($pages > 1) { ?> <div class="list-header"> - <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $prev_offset,_('Prev'),'browse_' . $uid . 'prev','','prev'); ?> - <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $next_offset,_('Next'),'browse_' . $uid . 'next','','next'); ?> + <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $prev_offset, T_('Prev'),'browse_' . $uid . 'prev','','prev'); ?> + <?php echo Ajax::text('?page=browse&action=page&browse_id=' . $browse->id . '&start=' . $next_offset, T_('Next'),'browse_' . $uid . 'next','','next'); ?> <?php /* Echo everything below us */ foreach ($page_data['down'] as $page => $offset) { diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index c860b77f..3085a405 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -29,13 +29,13 @@ ?> <ul id="rb_action"> <li> - <?php echo Ajax::button('?page=stream&action=basket','all',_('Play'),'rightbar_play'); ?> + <?php echo Ajax::button('?page=stream&action=basket','all', T_('Play'),'rightbar_play'); ?> </li> <li id="pl_add"> - <?php echo get_user_icon('playlist_add',_('Add to Playlist')); ?> + <?php echo get_user_icon('playlist_add', T_('Add to Playlist')); ?> <ul id="pl_action_additems" class="submenu"> <li> - <?php echo Ajax::text('?page=playlist&action=create',_('Add to New Playlist'),'rb_create_playlist'); ?> + <?php echo Ajax::text('?page=playlist&action=create', T_('Add to New Playlist'),'rb_create_playlist'); ?> </li> <?php $playlists = Playlist::get_users($GLOBALS['user']->id); @@ -53,27 +53,27 @@ <?php if (Access::check_function('batch_download')) { ?> <li> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=tmp_playlist&id=<?php echo $GLOBALS['user']->playlist->id; ?>"> - <?php echo get_user_icon('batch_download',_('Batch Download')); ?> + <?php echo get_user_icon('batch_download', T_('Batch Download')); ?> </a> </li> <?php } ?> <li> - <?php echo Ajax::button('?action=basket&type=clear_all','delete',_('Clear Playlist'),'rb_clear_playlist'); ?> + <?php echo Ajax::button('?action=basket&type=clear_all','delete', T_('Clear Playlist'),'rb_clear_playlist'); ?> </li> <li id="rb_add"> - <?php echo get_user_icon('add',_('Add Dynamic Items')); ?> + <?php echo get_user_icon('add', T_('Add Dynamic Items')); ?> <ul id="rb_action_additems" class="submenu"> <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=default',_('Pure Random'),'rb_add_pure_random'); ?> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=default', T_('Pure Random'),'rb_add_pure_random'); ?> </li> <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=artist',_('Related Artist'),'rb_add_related_artist'); ?> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=artist', T_('Related Artist'),'rb_add_related_artist'); ?> </li> <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=album',_('Related Album'),'rb_add_related_album'); ?> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=album', T_('Related Album'),'rb_add_related_album'); ?> </li> <li> - <?php echo Ajax::text('?action=basket&type=dynamic&random_type=tag',_('Related Tag'),'rb_add_related_tag'); ?> + <?php echo Ajax::text('?action=basket&type=dynamic&random_type=tag', T_('Related Tag'),'rb_add_related_tag'); ?> </li> </ul> </li> @@ -109,14 +109,14 @@ ?> <li class="<?php echo flip_class(); ?>" > <?php echo $object->f_link; ?> - <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete',_('Delete'),'rightbar_delete_' . $uid,'','delitem'); ?> + <?php echo Ajax::button('?action=current_playlist&type=delete&id=' . $uid,'delete', T_('Delete'),'rightbar_delete_' . $uid,'','delitem'); ?> </li> <?php } if (!count($objects)) { ?> - <li class="error"><?php echo _('Not Enough Data'); ?></li> + <li class="error"><?php echo T_('Not Enough Data'); ?></li> <?php } ?> <?php if (isset($truncated)) { ?> <li class="<?php echo flip_class(); ?>"> - <?php echo $truncated . ' ' . _('More'); ?>... + <?php echo $truncated . ' ' . T_('More'); ?>... </li> <?php } ?> </ul> diff --git a/templates/show_access_list.inc.php b/templates/show_access_list.inc.php index 0e1e687d..1840bd99 100644 --- a/templates/show_access_list.inc.php +++ b/templates/show_access_list.inc.php @@ -32,40 +32,40 @@ */ ?> -<?php show_box_top(_('Access Control'), 'box box_access_control'); ?> +<?php show_box_top(T_('Access Control'), 'box box_access_control'); ?> <div id="information_actions" class="left-column"> <ul> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_current"><?php echo get_user_icon('add_user',_('Add Current Host')); ?></a> - <?php echo _('Add Current Host'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_current"><?php echo get_user_icon('add_user', T_('Add Current Host')); ?></a> + <?php echo T_('Add Current Host'); ?> </li> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_rpc"><?php echo get_user_icon('cog',_('Add API / RPC Host')); ?></a> - <?php echo _('Add API / RPC Host'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_rpc"><?php echo get_user_icon('cog', T_('Add API / RPC Host')); ?></a> + <?php echo T_('Add API / RPC Host'); ?> </li> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_local"><?php echo get_user_icon('home',_('Add Local Network Definition')); ?></a> - <?php echo _('Add Local Network Definition'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_local"><?php echo get_user_icon('home', T_('Add Local Network Definition')); ?></a> + <?php echo T_('Add Local Network Definition'); ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_advanced"><?php echo get_user_icon('add_key',_('Advanced Add')); ?></a> - <?php echo _('Advanced Add'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_add_advanced"><?php echo get_user_icon('add_key', T_('Advanced Add')); ?></a> + <?php echo T_('Advanced Add'); ?> </li> </ul> </div> <?php show_box_bottom(); ?> -<?php show_box_top(_('Access Control Entries'), 'box box_access_entries'); ?> +<?php show_box_top(T_('Access Control Entries'), 'box box_access_entries'); ?> <?php Ajax::start_container('browse_content'); ?> <?php if (count($list)) { ?> <table cellspacing="1" cellpadding="3" class="tabledata"> <tr class="table-data"> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Start Address'); ?></th> - <th><?php echo _('End Address'); ?></th> - <th><?php echo _('Level'); ?></th> - <th><?php echo _('User'); ?></th> - <th><?php echo _('Type'); ?></th> - <th><?php echo _('Action'); ?></th> + <th><?php echo T_('Name'); ?></th> + <th><?php echo T_('Start Address'); ?></th> + <th><?php echo T_('End Address'); ?></th> + <th><?php echo T_('Level'); ?></th> + <th><?php echo T_('User'); ?></th> + <th><?php echo T_('Type'); ?></th> + <th><?php echo T_('Action'); ?></th> </tr> <?php /* Start foreach List Item */ @@ -81,8 +81,8 @@ <td><?php echo $access->f_user; ?></td> <td><?php echo $access->f_type; ?></td> <td> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_edit_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('edit', _('Edit')); ?></a> - <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_delete_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('delete', _('Delete')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_edit_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('edit', T_('Edit')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/admin/access.php?action=show_delete_record&access_id=<?php echo scrub_out($access->id); ?>"><?php echo get_user_icon('delete', T_('Delete')); ?></a> </td> </tr> <?php } // end foreach ?> diff --git a/templates/show_account.inc.php b/templates/show_account.inc.php index 1b4035f3..781860c5 100644 --- a/templates/show_account.inc.php +++ b/templates/show_account.inc.php @@ -32,32 +32,32 @@ <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_user" enctype="multipart/form-data"> <table class="tabledata"> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td> <input type="text" name="fullname" size="27" value="<?php echo scrub_out($client->fullname); ?>" /> </td> </tr> <tr> - <td><?php echo _('E-mail'); ?>:</td> + <td><?php echo T_('E-mail'); ?>:</td> <td> <input type="text" name="email" size="27" value="<?php echo scrub_out($client->email); ?>" /> </td> </tr> <tr> - <td><?php echo _('New Password'); ?>:</td> + <td><?php echo T_('New Password'); ?>:</td> <td> <?php Error::display('password'); ?> <input type="password" name="password1" size="27" /> </td> </tr> <tr> - <td><?php echo _('Confirm Password'); ?>:</td> + <td><?php echo T_('Confirm Password'); ?>:</td> <td> <input type="password" name="password2" size="27" /> </td> </tr> <tr> - <td><?php echo _('Clear Stats'); ?>:</td> + <td><?php echo T_('Clear Stats'); ?>:</td> <td> <input type="checkbox" name="clear_stats" value="1" /> </td> @@ -67,5 +67,5 @@ <input type="hidden" name="user_id" value="<?php echo scrub_out($client->id); ?>" /> <?php echo Core::form_register('update_user'); ?> <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> - <input class="button" type="submit" value="<?php echo _('Update Account'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Update Account'); ?>" /> </div> diff --git a/templates/show_add_access.inc.php b/templates/show_add_access.inc.php index 89f01f9a..b458407d 100644 --- a/templates/show_add_access.inc.php +++ b/templates/show_add_access.inc.php @@ -27,65 +27,65 @@ */ ?> -<?php show_box_top(_('Advanced Add'), 'box box_add_access'); ?> +<?php show_box_top(T_('Advanced Add'), 'box box_add_access'); ?> <?php Error::display('general'); ?> <form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=advanced"> <table class="tabledata" cellpadding="5" cellspacing="0"> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td colspan="3"> <input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" /> </td> </tr> <tr> - <td><?php echo _('Level'); ?>:</td> + <td><?php echo T_('Level'); ?>:</td> <td colspan="3"> - <input name="level" type="radio" checked="checked" value="5" /> <?php echo _('View'); ?> - <input name="level" type="radio" value="25" /> <?php echo _('Read'); ?> - <input name="level" type="radio" value="50" /> <?php echo _('Read/Write'); ?> - <input name="level" type="radio" value="75" /> <?php echo _('All'); ?> + <input name="level" type="radio" checked="checked" value="5" /> <?php echo T_('View'); ?> + <input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?> + <input name="level" type="radio" value="50" /> <?php echo T_('Read/Write'); ?> + <input name="level" type="radio" value="75" /> <?php echo T_('All'); ?> </td> </tr> <tr> - <td><?php echo _('User'); ?>:</td> + <td><?php echo T_('User'); ?>:</td> <td colspan="3"> <?php show_user_select('user'); ?> </td> </tr> <tr> - <td><?php echo _('ACL Type'); ?>:</td> + <td><?php echo T_('ACL Type'); ?>:</td> <td colspan="3"> <select name="type"> - <option selected="selected" value="stream"><?php echo _('Stream Access'); ?></option> - <option value="interface"><?php echo _('Web Interface'); ?></option> - <option value="network"><?php echo _('Local Network Definition'); ?></option> - <option value="rpc"><?php echo _('RPC'); ?></option> + <option selected="selected" value="stream"><?php echo T_('Stream Access'); ?></option> + <option value="interface"><?php echo T_('Web Interface'); ?></option> + <option value="network"><?php echo T_('Local Network Definition'); ?></option> + <option value="rpc"><?php echo T_('RPC'); ?></option> </select> </td> </tr> <tr> - <td colspan="4"><h4><?php echo _('RPC Options'); ?></h4></td> + <td colspan="4"><h4><?php echo T_('RPC Options'); ?></h4></td> </tr> <tr> - <td><?php echo _('Remote Key'); ?>:</td> + <td><?php echo T_('Remote Key'); ?>:</td> <td colspan="3"> <input type="text" name="key" value="<?php echo scrub_out($_REQUEST['key']); ?>" maxlength="32" /> </td> </tr> <tr> - <td colspan="4"><h3><?php echo _('IPv4 or IPv6 Addresses'); ?></h3> + <td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3> <span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span> </td> </tr> <tr> - <td><?php echo _('Start'); ?>:</td> + <td><?php echo T_('Start'); ?>:</td> <td> <?php Error::display('start'); ?> <input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" maxlength="15" /> </td> - <td><?php echo _('End'); ?>:</td> + <td><?php echo T_('End'); ?>:</td> <td> <?php Error::display('end'); ?> <input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" maxlength="15" /> @@ -94,7 +94,7 @@ </table> <div class="formValidation"> <?php echo Core::form_register('add_acl'); ?> - <input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_access_current.inc.php b/templates/show_add_access_current.inc.php index ab86ec84..1f1f18db 100644 --- a/templates/show_add_access_current.inc.php +++ b/templates/show_add_access_current.inc.php @@ -27,39 +27,39 @@ */ ?> -<?php show_box_top(_('Add Current Host'), 'box box_add_access_current'); ?> +<?php show_box_top(T_('Add Current Host'), 'box box_add_access_current'); ?> <?php Error::display('general'); ?> <form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=current"> <table class="tabledata" cellpadding="5" cellspacing="0"> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td> <input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" /> </td> </tr> <tr> - <td><?php echo _('IPv4 or IPv6 Addresses'); ?>:</td> + <td><?php echo T_('IPv4 or IPv6 Addresses'); ?>:</td> <td><?php echo scrub_out($_SERVER['REMOTE_ADDR']); ?></td> <tr> - <td><?php echo _('Level'); ?>:</td> + <td><?php echo T_('Level'); ?>:</td> <td> - <input name="level" type="radio" value="5" /> <?php echo _('View'); ?> - <input name="level" type="radio" value="25" /> <?php echo _('Read'); ?> - <input name="level" type="radio" checked="checked" value="50" /> <?php echo _('Read/Write'); ?> - <input name="level" type="radio" value="75" /> <?php echo _('All'); ?> + <input name="level" type="radio" value="5" /> <?php echo T_('View'); ?> + <input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?> + <input name="level" type="radio" checked="checked" value="50" /> <?php echo T_('Read/Write'); ?> + <input name="level" type="radio" value="75" /> <?php echo T_('All'); ?> </td> </tr> <tr> - <td><?php echo _('User'); ?>:</td> + <td><?php echo T_('User'); ?>:</td> <td> <?php show_user_select('user'); ?> </td> </tr> <tr> - <td colspan="2"><h4><?php echo _('RPC Options'); ?></h4></td> + <td colspan="2"><h4><?php echo T_('RPC Options'); ?></h4></td> </tr> <tr> - <td><?php echo _('Remote Key'); ?>:</td> + <td><?php echo T_('Remote Key'); ?>:</td> <td> <input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" maxlength="32" /> </td> @@ -67,7 +67,7 @@ </table> <div class="formValidation"> <?php echo Core::form_register('add_acl'); ?> - <input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_access_local.inc.php b/templates/show_add_access_local.inc.php index 81587b1a..ef204483 100644 --- a/templates/show_add_access_local.inc.php +++ b/templates/show_add_access_local.inc.php @@ -27,62 +27,62 @@ */ ?> -<?php show_box_top(_('Add Local Network Definition'), 'box box_add_access_local'); ?> +<?php show_box_top(T_('Add Local Network Definition'), 'box box_add_access_local'); ?> <?php Error::display('general'); ?> <form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=local"> <table class="tabledata" cellpadding="5" cellspacing="0"> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td colspan="3"> <input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" /> </td> </tr> <tr> - <td><?php echo _('Level'); ?>:</td> + <td><?php echo T_('Level'); ?>:</td> <td colspan="3"> - <input name="level" type="radio" value="5" /> <?php echo _('View'); ?> - <input name="level" type="radio" value="25" /> <?php echo _('Read'); ?> - <input name="level" type="radio" checked="checked" value="50" /> <?php echo _('Read/Write'); ?> - <input name="level" type="radio" value="75" /> <?php echo _('All'); ?> + <input name="level" type="radio" value="5" /> <?php echo T_('View'); ?> + <input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?> + <input name="level" type="radio" checked="checked" value="50" /> <?php echo T_('Read/Write'); ?> + <input name="level" type="radio" value="75" /> <?php echo T_('All'); ?> </td> </tr> <tr> - <td><?php echo _('User'); ?>:</td> + <td><?php echo T_('User'); ?>:</td> <td colspan="3"> <?php show_user_select('user'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('Type'); ?>:</td> + <td valign="top"><?php echo T_('Type'); ?>:</td> <td colspan="3"> - <input type="radio" name="addtype" value="network" /><?php echo _('Local Network Definition'); ?><br /> - <input type="radio" name="addtype" value="streamnetwork" /><?php echo _('Local Network Definition'); ?> + <?php echo _('Stream Access'); ?> + <?php echo _('Web Interface'); ?><br /> - <input type="radio" name="addtype" value="allnetwork" checked="checked" /><?php echo _('Local Network Definition'); ?> + <?php echo _('All'); ?><br /> + <input type="radio" name="addtype" value="network" /><?php echo T_('Local Network Definition'); ?><br /> + <input type="radio" name="addtype" value="streamnetwork" /><?php echo T_('Local Network Definition'); ?> + <?php echo T_('Stream Access'); ?> + <?php echo T_('Web Interface'); ?><br /> + <input type="radio" name="addtype" value="allnetwork" checked="checked" /><?php echo T_('Local Network Definition'); ?> + <?php echo T_('All'); ?><br /> </td> </tr> <tr> - <td colspan="4"><h4><?php echo _('RPC Options'); ?></h4></td> + <td colspan="4"><h4><?php echo T_('RPC Options'); ?></h4></td> </tr> <tr> - <td><?php echo _('Remote Key'); ?>:</td> + <td><?php echo T_('Remote Key'); ?>:</td> <td colspan="3"> <input type="text" name="key" value="<?php echo scrub_out($_REQUEST['end']); ?>" maxlength="32" /> </td> </tr> <tr> - <td colspan="4"><h3><?php echo _('IPv4 or IPv6 Addresses'); ?></h3> + <td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3> <span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span> </td> </tr> <tr> - <td><?php echo _('Start'); ?>:</td> + <td><?php echo T_('Start'); ?>:</td> <td> <?php Error::display('start'); ?> <input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" /> </td> - <td><?php echo _('End'); ?>:</td> + <td><?php echo T_('End'); ?>:</td> <td> <?php Error::display('end'); ?> <input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" /> @@ -91,7 +91,7 @@ </table> <div class="formValidation"> <?php echo Core::form_register('add_acl'); ?> - <input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_access_rpc.inc.php b/templates/show_add_access_rpc.inc.php index e7c2ecd8..ed9d8a8d 100644 --- a/templates/show_add_access_rpc.inc.php +++ b/templates/show_add_access_rpc.inc.php @@ -27,62 +27,62 @@ */ ?> -<?php show_box_top(_('Add API / RPC Host'), 'box box_add_access_rpc'); ?> +<?php show_box_top(T_('Add API / RPC Host'), 'box box_add_access_rpc'); ?> <?php Error::display('general'); ?> <form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=add_host&method=rpc"> <table class="tabledata" cellpadding="5" cellspacing="0"> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td colspan="3"> <input type="text" name="name" value="<?php echo scrub_out($_REQUEST['name']); ?>" size="20" /> </td> </tr> <tr> - <td><?php echo _('Level'); ?>:</td> + <td><?php echo T_('Level'); ?>:</td> <td colspan="3"> - <input name="level" type="radio" value="5" /> <?php echo _('View'); ?> - <input name="level" type="radio" value="25" /> <?php echo _('Read'); ?> - <input name="level" type="radio" checked="checked" value="50" /> <?php echo _('Read/Write'); ?> - <input name="level" type="radio" value="75" /> <?php echo _('All'); ?> + <input name="level" type="radio" value="5" /> <?php echo T_('View'); ?> + <input name="level" type="radio" value="25" /> <?php echo T_('Read'); ?> + <input name="level" type="radio" checked="checked" value="50" /> <?php echo T_('Read/Write'); ?> + <input name="level" type="radio" value="75" /> <?php echo T_('All'); ?> </td> </tr> <tr> - <td><?php echo _('User'); ?>:</td> + <td><?php echo T_('User'); ?>:</td> <td colspan="3"> <?php show_user_select('user'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('Type'); ?>:</td> + <td valign="top"><?php echo T_('Type'); ?>:</td> <td colspan="3"> - <input type="radio" name="addtype" value="rpc" /><?php echo _('RPC'); ?><br /> - <input type="radio" name="addtype" value="streamrpc" checked="checked" /><?php echo _('RPC'); ?> + <?php echo _('Stream Access'); ?><br /> - <input type="radio" name="addtype" value="allrpc" /><?php echo _('RPC'); ?> + <?php echo _('All'); ?> + <input type="radio" name="addtype" value="rpc" /><?php echo T_('RPC'); ?><br /> + <input type="radio" name="addtype" value="streamrpc" checked="checked" /><?php echo T_('RPC'); ?> + <?php echo T_('Stream Access'); ?><br /> + <input type="radio" name="addtype" value="allrpc" /><?php echo T_('RPC'); ?> + <?php echo T_('All'); ?> </td> </tr> <tr> - <td colspan="4"><h4><?php echo _('RPC Options'); ?></h4></td> + <td colspan="4"><h4><?php echo T_('RPC Options'); ?></h4></td> </tr> <tr> - <td><?php echo _('Remote Key'); ?>:</td> + <td><?php echo T_('Remote Key'); ?>:</td> <td colspan="3"> <input type="text" name="key" value="<?php echo scrub_out($_REQUEST['key']); ?>" maxlength="32" /> </td> </tr> <tr> - <td colspan="4"><h3><?php echo _('IPv4 or IPv6 Addresses'); ?></h3> + <td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3> <span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span> </td> </tr> <tr> - <td><?php echo _('Start'); ?>:</td> + <td><?php echo T_('Start'); ?>:</td> <td> <?php Error::display('start'); ?> <input type="text" name="start" value="<?php echo scrub_out($_REQUEST['start']); ?>" size="20" /> </td> - <td><?php echo _('End'); ?>:</td> + <td><?php echo T_('End'); ?>:</td> <td> <?php Error::display('end'); ?> <input type="text" name="end" value="<?php echo scrub_out($_REQUEST['end']); ?>" size="20" /> @@ -91,7 +91,7 @@ </table> <div class="formValidation"> <?php echo Core::form_register('add_acl'); ?> - <input class="button" type="submit" value="<?php echo _('Create ACL'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Create ACL'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_catalog.inc.php b/templates/show_add_catalog.inc.php index 2b352d4b..2bd217b6 100644 --- a/templates/show_add_catalog.inc.php +++ b/templates/show_add_catalog.inc.php @@ -29,70 +29,70 @@ $default_rename = "%a - %T - %t"; $default_sort = "%a/%A"; ?> -<?php show_box_top(_('Add a Catalog'), 'box box_add_catalog'); ?> -<p><?php echo _("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p> +<?php show_box_top(T_('Add a Catalog'), 'box box_add_catalog'); ?> +<p><?php echo T_("In the form below enter either a local path (i.e. /data/music) or the URL to a remote Ampache installation (i.e http://theotherampache.com)"); ?></p> <?php Error::display('general'); ?> <form name="update_catalog" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr> - <td><?php echo _('Catalog Name'); ?>: </td> + <td><?php echo T_('Catalog Name'); ?>: </td> <td><input size="60" type="text" name="name" value="<?php echo scrub_out($_POST['name']); ?>" /></td> <td style="vertical-align:top; font-family: monospace;" rowspan="6" id="patterns_example"> - <strong><?php echo _('Auto-inserted Fields'); ?>:</strong><br /> - %A = <?php echo _('album name'); ?><br /> - %a = <?php echo _('artist name'); ?><br /> - %c = <?php echo _('id3 comment'); ?><br /> - %T = <?php echo _('track number (padded with leading 0)'); ?><br /> - %t = <?php echo _('song title'); ?><br /> - %y = <?php echo _('year'); ?><br /> - %o = <?php echo _('other'); ?><br /> + <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> + %A = <?php echo T_('album name'); ?><br /> + %a = <?php echo T_('artist name'); ?><br /> + %c = <?php echo T_('id3 comment'); ?><br /> + %T = <?php echo T_('track number (padded with leading 0)'); ?><br /> + %t = <?php echo T_('song title'); ?><br /> + %y = <?php echo T_('year'); ?><br /> + %o = <?php echo T_('other'); ?><br /> </td> </tr> <tr> - <td><?php echo _('Path'); ?>: </td> + <td><?php echo T_('Path'); ?>: </td> <td><input size="60" type="text" name="path" value="<?php echo scrub_out($_POST['path']); ?>" /></td> </tr> <tr> - <td><?php echo _('Catalog Type'); ?>: </td> + <td><?php echo T_('Catalog Type'); ?>: </td> <td> <select name="type"> - <option value="local"><?php echo _('Local'); ?></option> - <option value="remote"><?php echo _('Remote'); ?></option> + <option value="local"><?php echo T_('Local'); ?></option> + <option value="remote"><?php echo T_('Remote'); ?></option> </select> </td> </tr> <tr> - <td><?php echo _('Remote Catalog Username'); ?>: </td> - <td><input size="30" type="text" name="remote_username" value="<?php echo scrub_out($_POST['remote_username']); ?>" /><span class="error">*<?php echo _('Required for Remote Catalogs'); ?></span></td> + <td><?php echo T_('Remote Catalog Username'); ?>: </td> + <td><input size="30" type="text" name="remote_username" value="<?php echo scrub_out($_POST['remote_username']); ?>" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo _('Remote Catalog Password'); ?>: </td> - <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo _('Required for Remote Catalogs'); ?></span></td> + <td><?php echo T_('Remote Catalog Password'); ?>: </td> + <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo _('Filename Pattern'); ?>: </td> + <td><?php echo T_('Filename Pattern'); ?>: </td> <td><input size="60" type="text" name="rename_pattern" value="<?php echo $default_rename; ?>" /></td> </tr> <tr> - <td><?php echo _('Folder Pattern'); ?>:<br /><?php echo _("(no leading or ending '/')"); ?></td> + <td><?php echo T_('Folder Pattern'); ?>:<br /><?php echo T_("(no leading or ending '/')"); ?></td> <td valign="top"><input size="60" type="text" name="sort_pattern" value="<?php echo $default_sort; ?>" /></td> </tr> <tr> - <td valign="top"><?php echo _('Gather Album Art'); ?>:</td> + <td valign="top"><?php echo T_('Gather Album Art'); ?>:</td> <td><input type="checkbox" name="gather_art" value="1" /></td> </tr> <tr> - <td valign="top"><?php echo _('Build Playlists from m3u Files'); ?>:</td> + <td valign="top"><?php echo T_('Build Playlists from m3u Files'); ?>:</td> <td><input type="checkbox" name="parse_m3u" value="1" /></td> </tr> </table> <div class="formValidation"> <input type="hidden" name="action" value="add_catalog" /> <?php echo Core::form_register('add_catalog'); ?> - <input class="button" type="submit" value="<?php echo _('Add Catalog'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Add Catalog'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_live_stream.inc.php b/templates/show_add_live_stream.inc.php index 60e0fc4c..ec790ca3 100644 --- a/templates/show_add_live_stream.inc.php +++ b/templates/show_add_live_stream.inc.php @@ -27,44 +27,44 @@ */ ?> -<?php show_box_top(_('Add Radio Station'), 'box box_add_live_stream'); ?> +<?php show_box_top(T_('Add Radio Station'), 'box box_add_live_stream'); ?> <form name="radio" method="post" action="<?php echo Config::get('web_path'); ?>/radio.php?action=create"> <table> <tr> - <td><?php echo _('Name'); ?></td> + <td><?php echo T_('Name'); ?></td> <td> <input type="text" name="name" size="20" value="<?php echo scrub_out($_REQUEST['name']); ?>" /> <?php Error::display('name'); ?> </td> </tr> <tr> - <td><?php echo _('Homepage'); ?></td> + <td><?php echo T_('Homepage'); ?></td> <td> <input type="text" name="site_url" value="<?php echo scrub_out($_REQUEST['site_url']); ?>" /> <?php Error::display('site_url'); ?> </td> </tr> <tr> - <td><?php echo _('Stream URL'); ?></td> + <td><?php echo T_('Stream URL'); ?></td> <td> <input type="text" name="url" value="<?php echo scrub_out($_REQUEST['url']); ?>" /> <?php Error::display('url'); ?> </td> </tr> <tr> - <td><?php echo _('Frequency'); ?></td> + <td><?php echo T_('Frequency'); ?></td> <td> <input type="text" name="frequency" value="<?php echo scrub_out($_REQUEST['frequency']); ?>" /> </td> </tr> <tr> - <td><?php echo _('Callsign'); ?></td> + <td><?php echo T_('Callsign'); ?></td> <td> <input type="text" name="call_sign" value="<?php echo scrub_out($_REQUEST['call_sign']); ?>" /> </td> </tr> <tr> - <td><?php echo _('Catalog'); ?></td> + <td><?php echo T_('Catalog'); ?></td> <td> <?php echo show_catalog_select('catalog',intval($_REQUEST['catalog'])); ?> </td> @@ -72,7 +72,7 @@ </table> <div class="formValidation"> <?php echo Core::form_register('add_radio'); ?> - <input class="button" type="submit" value="<?php echo _('Add'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Add'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php index a2fc25fa..c510b38e 100644 --- a/templates/show_add_playlist.inc.php +++ b/templates/show_add_playlist.inc.php @@ -27,15 +27,15 @@ */ ?> -<?php show_box_top(_('Create a new playlist')); ?> +<?php show_box_top(T_('Create a new playlist')); ?> <form name="songs" method="post" action="<?php echo conf('web_path'); ?>/playlist.php"> <table> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td><input type="text" name="playlist_name" size="20" /></td> </tr> <tr> - <td><?php echo _('Type'); ?>:</td> + <td><?php echo T_('Type'); ?>:</td> <td> <select name="type"> <option value="private"> Private </option> @@ -45,7 +45,7 @@ </tr> </table> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Create'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Create'); ?>" /> <input type="hidden" name="action" value="Create" /> </div> </form> diff --git a/templates/show_add_shout.inc.php b/templates/show_add_shout.inc.php index 99d43390..e0eda1a0 100644 --- a/templates/show_add_shout.inc.php +++ b/templates/show_add_shout.inc.php @@ -27,18 +27,18 @@ */ ?> -<?php show_box_top(_('Post to Shoutbox'), 'box box_add_shout'); ?> +<?php show_box_top(T_('Post to Shoutbox'), 'box box_add_shout'); ?> <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/shout.php?action=add_shout"> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr> - <td><strong><?php echo _('Comment:'); ?></strong> + <td><strong><?php echo T_('Comment:'); ?></strong> </tr> <tr> <td><textarea rows="5" cols="70" name="comment"></textarea></td> </tr> <?php if (Access::check('interface','50')) { ?> <tr> - <td><input type="checkbox" name="sticky" /> <strong><?php echo _('Make Sticky'); ?></strong></td> + <td><input type="checkbox" name="sticky" /> <strong><?php echo T_('Make Sticky'); ?></strong></td> </tr> <?php } ?> <tr> @@ -46,7 +46,7 @@ <?php echo Core::form_register('add_shout'); ?> <input type="hidden" name="object_id" value="<?php echo $object->id; ?>" /> <input type="hidden" name="object_type" value="<?php echo strtolower(get_class($object)); ?>" /> - <input type="submit" value="<?php echo _('Create'); ?>" /> + <input type="submit" value="<?php echo T_('Create'); ?>" /> </td> </tr> </table> diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php index e672876e..5e2daa51 100644 --- a/templates/show_add_user.inc.php +++ b/templates/show_add_user.inc.php @@ -27,13 +27,13 @@ */ ?> -<?php show_box_top(_('Adding a New User'), 'box box_add_user'); ?> +<?php show_box_top(T_('Adding a New User'), 'box box_add_user'); ?> <?php Error::display('general'); ?> <form name="add_user" enctype="multpart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php?action=add_user"; ?>"> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> <td> - <?php echo _('Username'); ?>: + <?php echo T_('Username'); ?>: </td> <td> <input type="text" name="username" size="30" maxlength="128" value="<?php echo scrub_out($_POST['username']); ?>" /> @@ -41,14 +41,14 @@ </td> </tr> <tr> - <td><?php echo _('Full Name'); ?>:</td> + <td><?php echo T_('Full Name'); ?>:</td> <td> <input type="text" name="fullname" size="30" value="<?php echo scrub_out($_POST['fullname']); ?>" /> </td> </tr> <tr> <td> - <?php echo _('E-mail'); ?>: + <?php echo T_('E-mail'); ?>: </td> <td> <input type="text" name="email" size="30" value="<?php echo scrub_out($_POST['email']); ?>" /> @@ -56,7 +56,7 @@ </tr> <tr> <td> - <?php echo _('Password'); ?> : + <?php echo T_('Password'); ?> : </td> <td> <input type="password" name="password_1" size="30" value="" /> @@ -65,7 +65,7 @@ </tr> <tr> <td> - <?php echo _('Confirm Password'); ?>: + <?php echo T_('Confirm Password'); ?>: </td> <td> <input type="password" name="password_2" size="30" value="" /> @@ -73,23 +73,23 @@ </tr> <tr> <td> - <?php echo _('User Access Level'); ?>: + <?php echo T_('User Access Level'); ?>: </td> <td> <?php $var_name = "on_" . $client->access; ${$var_name} = 'selected="selected"'; ?> <select name="access"> - <option value="5" <?php echo $on_5; ?>><?php echo _('Guest'); ?></option> - <option value="25" <?php echo $on_25; ?>><?php echo _('User'); ?></option> - <option value="50" <?php echo $on_50; ?>><?php echo _('Content Manager'); ?></option> - <option value="75" <?php echo $on_75; ?>><?php echo _('Catalog Manager'); ?></option> - <option value="100" <?php echo $on_100; ?>><?php echo _('Admin'); ?></option> + <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> + <option value="25" <?php echo $on_25; ?>><?php echo T_('User'); ?></option> + <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> + <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> + <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> </select> </td> </tr> </table> <div class="formValidation"> <?php echo Core::form_register('add_user'); ?> - <input type="submit" value="<?php echo _('Add User'); ?>" /> + <input type="submit" value="<?php echo T_('Add User'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php index 1da117a2..3cf50cd2 100644 --- a/templates/show_adds_catalog.inc.php +++ b/templates/show_adds_catalog.inc.php @@ -26,11 +26,11 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Starting New Song Search'), 'box box_adds_catalog'); +show_box_top(T_('Starting New Song Search'), 'box box_adds_catalog'); /* HINT: Catalog Name */ -printf(_('Starting New Song Search on %s catalog'), "<strong>[ $this->name ]</strong>"); +printf(T_('Starting New Song Search on %s catalog'), "<strong>[ $this->name ]</strong>"); echo "<br />\n"; -echo _('Found') . ': <span id="add_count_' . $this->id . '">' . _('None') . '</span><br />'; -echo _('Reading') . ':<span id="add_dir_' . $this->id . '"></span><br />'; +echo T_('Found') . ': <span id="add_count_' . $this->id . '">' . T_('None') . '</span><br />'; +echo T_('Reading') . ':<span id="add_dir_' . $this->id . '"></span><br />'; show_box_bottom(); ?> diff --git a/templates/show_admin_info.inc.php b/templates/show_admin_info.inc.php index 09e7e505..71d2bd02 100644 --- a/templates/show_admin_info.inc.php +++ b/templates/show_admin_info.inc.php @@ -35,14 +35,14 @@ $flagged = Flag::get_recent(10); $songs = Catalog::get_disabled(10); ?> -<?php show_box_top(_('Last Ten Flagged Records')); ?> +<?php show_box_top(T_('Last Ten Flagged Records')); ?> <?php require Config::get('prefix') . '/templates/show_flagged.inc.php'; ?> <?php show_box_bottom(); ?> -<?php show_box_top(_('Disabled Songs')); ?> +<?php show_box_top(T_('Disabled Songs')); ?> <!-- Show Last 10 Disabled Songs --> <?php require Config::get('prefix') . '/templates/show_disabled_songs.inc.php'; ?> <div> - <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo _('Show All'); ?>...</a> + <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_disabled"><?php echo T_('Show All'); ?>...</a> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_admin_tools.inc.php b/templates/show_admin_tools.inc.php index 1bff7747..568220b9 100644 --- a/templates/show_admin_tools.inc.php +++ b/templates/show_admin_tools.inc.php @@ -30,15 +30,15 @@ $web_path = Config::get('web_path'); $catalogs = Catalog::get_catalogs(); ?> -<?php show_box_top(_('Catalogs')); ?> +<?php show_box_top(T_('Catalogs')); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_name" /> <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($catalogs as $catalog) { ?> <tr class="<?php echo flip_class(); ?>"> @@ -49,22 +49,22 @@ $catalogs = Catalog::get_catalogs(); </td> <td class="cel_action"> <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo _('Add'); ?></a> | + <?php echo T_('Add'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo _('Verify'); ?></a> | + <?php echo T_('Verify'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo _('Clean'); ?></a> | + <?php echo T_('Clean'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"> - <?php echo _('All'); ?></a> | + <?php echo T_('All'); ?></a> | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"> - <?php echo _('Delete'); ?></a> + <?php echo T_('Delete'); ?></a> </td> </tr> <!-- <tr class="<?php echo flip_class(); ?>"> <td colspan="2"> - <?php echo _('Fast'); ?><input type="checkbox" name="fast" value="1" /> - <?php echo _('Gather Art'); ?><input type="checkbox" name="gather_art" value="1" /> + <?php echo T_('Fast'); ?><input type="checkbox" name="fast" value="1" /> + <?php echo T_('Gather Art'); ?><input type="checkbox" name="gather_art" value="1" /> </td> </tr> --> @@ -72,34 +72,34 @@ $catalogs = Catalog::get_catalogs(); <?php if (!count($catalogs)) { ?> <tr> <td colspan="2"> - <?php echo _('No Catalogs Found'); ?> + <?php echo T_('No Catalogs Found'); ?> </td> </tr> <?php } // end if no catalogs ?> <tr class="th-bottom"> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <div> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a><hr noshade="noshade" size="3" /> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo _('Clear Catalog Stats'); ?></a> -<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather Album Art'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo T_('Clean All'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=update_all_catalogs"><?php echo T_('Verify All'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo T_('Add to All'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service"><?php echo T_('Update All'); ?></a><hr noshade="noshade" size="3" /> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo T_('Add a Catalog'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=show_clear_stats"><?php echo T_('Clear Catalog Stats'); ?></a> +<a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather Album Art'); ?></a> </div> <?php show_box_bottom(); ?> -<?php show_box_top(_('Other Tools')); ?> +<?php show_box_top(T_('Other Tools')); ?> <div> - <a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Show Duplicate Songs'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo _('Generate New Config'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo _('Preferences Permissions'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo _('Export To Itunes DB'); ?></a> - <a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&days=30"><?php echo _('Show Inactive Users'); ?></a> -<!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo _('Check for New Version'); ?></a>--> + <a class="button" href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Show Duplicate Songs'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=generate_config"><?php echo T_('Generate New Config'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/preferences.php?action=show_set_preferences"><?php echo T_('Preferences Permissions'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=export&export=itunes"><?php echo T_('Export To Itunes DB'); ?></a> + <a class="button" href="<?php echo $web_path; ?>/admin/users.php?action=show_inactive&days=30"><?php echo T_('Show Inactive Users'); ?></a> +<!-- <a class="button" href="<?php echo $web_path; ?>/admin/system.php?action=check_version"><?php echo T_('Check for New Version'); ?></a>--> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_album.inc.php b/templates/show_album.inc.php index c91cbf09..82f5a32e 100644 --- a/templates/show_album.inc.php +++ b/templates/show_album.inc.php @@ -32,14 +32,14 @@ $ajax_url = Config::get('ajax_url'); // Title for this album $title = scrub_out($album->name) . ' (' . $album->year . ')'; if ($album->disk) { - $title .= "<span class=\"discnb disc" . $album->disk . "\">, " . _('Disk') . " " . $album->disk . "</span>"; + $title .= "<span class=\"discnb disc" . $album->disk . "\">, " . T_('Disk') . " " . $album->disk . "</span>"; } $title .= ' - ' . $album->f_artist_link; ?> <?php show_box_top($title,'info-box'); ?> <div class="album_art"> <?php - if ($album->name != _('Unknown (Orphaned)')) { + if ($album->name != T_('Unknown (Orphaned)')) { $name = '[' . $album->f_artist . '] ' . scrub_out($album->full_name); $aa_url = $web_path . "/image.php?id=" . $album->id . "&type=popup&sid=" . session_id(); @@ -53,36 +53,36 @@ $title .= ' - ' . $album->f_artist_link; <div style="display:table-cell;" id="rating_<?php echo $album->id; ?>_album"> <?php Rating::show($album->id,'album'); ?> </div> -<h3><?php echo _('Actions'); ?>:</h3> +<h3><?php echo T_('Actions'); ?>:</h3> <ul> <li> - <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Add'),'play_full_' . $album->id); ?> - <?php echo Ajax::text('?action=basket&type=album&id=' . $album->id,_('Add Album'), 'play_full_text_' . $album->id); ?> + <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'play_full_' . $album->id); ?> + <?php echo Ajax::text('?action=basket&type=album&id=' . $album->id, T_('Add Album'), 'play_full_text_' . $album->id); ?> </li> <li> - <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random',_('Random'),'play_random_' . $album->id); ?> - <?php echo Ajax::text('?action=basket&type=album_random&id=' . $album->id,_('Add Random from Album'), 'play_random_text_' . $album->id); ?> + <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'play_random_' . $album->id); ?> + <?php echo Ajax::text('?action=basket&type=album_random&id=' . $album->id, T_('Add Random from Album'), 'play_random_text_' . $album->id); ?> </li> <?php if (Access::check('interface','75')) { ?> <li> - <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('delete',_('Reset Album Art')); ?></a> - <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo _('Reset Album Art'); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('delete', T_('Reset Album Art')); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=clear_art&album_id=<?php echo $album->id; ?>"><?php echo T_('Reset Album Art'); ?></a> </li> <?php } ?> <li> - <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('view',_('Find Album Art')); ?></a> - <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo _('Find Album Art'); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('view', T_('Find Album Art')); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>"><?php echo T_('Find Album Art'); ?></a> </li> <?php if ((Access::check('interface','50'))) { ?> <li> - <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('cog', _('Update from tags')); ?></a> - <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo _('Update from tags'); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo get_user_icon('cog', T_('Update from tags')); ?></a> + <a href="<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>"><?php echo T_('Update from tags'); ?></a> </li> <?php } ?> <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo get_user_icon('batch_download', _('Download')); ?></a> - <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo _('Download'); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo get_user_icon('batch_download', T_('Download')); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=album&id=<?php echo $album->id; ?>"><?php echo T_('Download'); ?></a> </li> <?php } ?> </ul> diff --git a/templates/show_album_art.inc.php b/templates/show_album_art.inc.php index f6e05283..5d968961 100644 --- a/templates/show_album_art.inc.php +++ b/templates/show_album_art.inc.php @@ -31,7 +31,7 @@ $total_images = count($images); $rows = floor($total_images/4); $i = 0; ?> -<?php show_box_top(_('Select New Album Art'), 'box box_album_art'); ?> +<?php show_box_top(T_('Select New Album Art'), 'box box_album_art'); ?> <table class="table-data"> <tr> <?php @@ -45,15 +45,15 @@ while ($i <= $rows) { else { ?> <td align="center"> - <a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="<?php echo _('Album Art'); ?>" border="0" height="175" width="175" /></a> + <a href="<?php echo $image_url; ?>" target="_blank"><img src="<?php echo $image_url; ?>" alt="<?php echo T_('Album Art'); ?>" border="0" height="175" width="175" /></a> <br /> <p align="center"> <?php if (is_array($dimensions)) { ?> [<?php echo intval($dimensions['width']); ?>x<?php echo intval($dimensions['height']); ?>] <?php } else { ?> - <span class="error"><?php echo _('Invalid'); ?></span> + <span class="error"><?php echo T_('Invalid'); ?></span> <?php } ?> - [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&image=<?php echo $key; ?>&album_id=<?php echo intval($_REQUEST['album_id']); ?>"><?php echo _('Select'); ?></a>] + [<a href="<?php echo Config::get('web_path'); ?>/albums.php?action=select_art&image=<?php echo $key; ?>&album_id=<?php echo intval($_REQUEST['album_id']); ?>"><?php echo T_('Select'); ?></a>] </p> </td> <?php diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php index 5ba7e560..9c93c5c1 100644 --- a/templates/show_album_row.inc.php +++ b/templates/show_album_row.inc.php @@ -28,8 +28,8 @@ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Add'),'add_album_' . $album->id); ?> - <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random',_('Random'),'random_album_' . $album->id); ?> + <?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Add'),'add_album_' . $album->id); ?> + <?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random', T_('Random'),'random_album_' . $album->id); ?> </td> <?php if (Art::is_enabled()) { @@ -50,15 +50,15 @@ if (Art::is_enabled()) { <td class="cel_action"> <?php if (Config::get('sociable')) { ?> <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=album&id=<?php echo $album->id; ?>"> - <?php echo get_user_icon('comment',_('Post Shout')); ?> + <?php echo get_user_icon('comment', T_('Post Shout')); ?> </a> <?php } ?> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&id=<?php echo $album->id; ?>"> - <?php echo get_user_icon('batch_download',_('Batch Download')); ?> + <?php echo get_user_icon('batch_download', T_('Batch Download')); ?> </a> <?php } ?> <?php if (Access::check('interface','50')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=album_row&id=' . $album->id,'edit',_('Edit'),'edit_album_' . $album->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=album_row&id=' . $album->id,'edit', T_('Edit'),'edit_album_' . $album->id); ?> <?php } ?> </td> diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php index cafa4c4e..d0d4d0f2 100644 --- a/templates/show_albums.inc.php +++ b/templates/show_albums.inc.php @@ -45,17 +45,17 @@ $ajax_url = Config::get('ajax_url'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> <?php if (Art::is_enabled()) { ?> - <th class="cel_cover"><?php echo _('Cover'); ?></th> + <th class="cel_cover"><?php echo T_('Cover'); ?></th> <?php } ?> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name',_('Album'),'album_sort_name'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist',_('Artist'),'album_sort_artist'); ?></th> - <th class="cel_songs"><?php echo _('Songs'); ?></th> - <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year',_('Year'),'album_sort_year'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="col_rating"><?php echo _('Rating'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', T_('Artist'),'album_sort_artist'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="col_rating"><?php echo T_('Rating'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php if (Config::get('ratings')) { @@ -72,21 +72,21 @@ $ajax_url = Config::get('ajax_url'); <?php } //end foreach ($albums as $album) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="7"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> <?php if (Art::is_enabled()) { ?> - <th class="cel_cover"><?php echo _('Cover'); ?></th> + <th class="cel_cover"><?php echo T_('Cover'); ?></th> <?php } ?> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name',_('Album'),'album_sort_name_bottom'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_songs"><?php echo _('Songs'); ?></th> - <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year',_('Year'),'album_sort_year_bottom'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="col_rating"><?php echo _('Rating'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=name', T_('Album'),'album_sort_name_bottom'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=year', T_('Year'),'album_sort_year_bottom'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="col_rating"><?php echo T_('Rating'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php index 447d31c2..fd139c93 100644 --- a/templates/show_all_popular.inc.php +++ b/templates/show_all_popular.inc.php @@ -30,25 +30,25 @@ <table class="tabledata"> <tr> <td valign="top" > - <?php show_info_box(_('Most Popular Artists'), 'artist', $artists); ?> + <?php show_info_box(T_('Most Popular Artists'), 'artist', $artists); ?> </td> <td valign="top"> - <?php show_info_box(_('Most Popular Albums'), '', $albums); ?> + <?php show_info_box(T_('Most Popular Albums'), '', $albums); ?> </td> <td valign="top"> - <?php show_info_box(_('Most Popular Genres'), '', $genres); ?> + <?php show_info_box(T_('Most Popular Genres'), '', $genres); ?> </td> </tr> <tr><td colspan="2"> </td></tr> <tr> <td valign="top"> - <?php show_info_box(_('Most Popular Songs'), 'song', $songs); ?> + <?php show_info_box(T_('Most Popular Songs'), 'song', $songs); ?> </td> <td valign="top"> - <?php show_info_box(_('Most Popular Live Streams'),'live_stream',$live_streams); ?> + <?php show_info_box(T_('Most Popular Live Streams'),'live_stream',$live_streams); ?> </td> <td valign="top"> - <?php show_info_box(_('Most Popular Tags'),'tags',$tags); ?> + <?php show_info_box(T_('Most Popular Tags'),'tags',$tags); ?> </td> </tr> <tr><td colspan="2"> </td></tr> diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php index 2c1d9fab..60090c29 100644 --- a/templates/show_artist.inc.php +++ b/templates/show_artist.inc.php @@ -39,43 +39,43 @@ if (Config::get('ratings')) { </div> <?php } ?> <div id="information_actions"> -<h3><?php echo _('Actions'); ?>:</h3> +<h3><?php echo T_('Actions'); ?>:</h3> <ul> <li> <?php if ($object_type == 'album') { ?> <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"> - <?php echo get_user_icon('view', _("Show All Songs By %s")); ?> - <?php printf(_("Show All Songs By %s"), $artist->f_name); ?></a> + <?php echo get_user_icon('view', T_("Show All Songs By %s")); ?> + <?php printf(T_("Show All Songs By %s"), $artist->f_name); ?></a> <?php } else { ?> <a href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $artist->id; ?>"> - <?php echo get_user_icon('view', _("Show Albums By %s")); ?> - <?php printf(_("Show Albums By %s"), $artist->f_name); ?></a> + <?php echo get_user_icon('view', T_("Show Albums By %s")); ?> + <?php printf(T_("Show Albums By %s"), $artist->f_name); ?></a> <?php } ?> </li> <li> <?php /* HINT: Artist Fullname */ ?> - <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_' . $artist->id); ?> - <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id,sprintf(_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> + <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_' . $artist->id); ?> + <?php echo Ajax::text('?action=basket&type=artist&id=' . $artist->id,sprintf(T_('Add All Songs By %s'), $artist->f_name),'add_text_' . $artist->id); ?> </li> <li> <?php /* HINT: Artist Fullname */ ?> - <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_' . $artist->id); ?> - <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, sprintf(_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> + <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_' . $artist->id); ?> + <?php echo Ajax::text('?action=basket&type=artist_random&id=' . $artist->id, sprintf(T_('Add Random Songs By %s'), $artist->f_name),'random_text_' . $artist->id); ?> </li> <?php if (Access::check('interface','50')) { ?> <li> - <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('cog', _('Update from tags')); ?></a> - <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo _('Update from tags'); ?></a> + <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo get_user_icon('cog', T_('Update from tags')); ?></a> + <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo T_('Update from tags'); ?></a> </li> <?php } ?> <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo get_user_icon('batch_download', _('Download')); ?></a> - <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo _('Download'); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo get_user_icon('batch_download', T_('Download')); ?></a> + <a href="<?php echo $web_path; ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"><?php echo T_('Download'); ?></a> </li> <?php } ?> <li> - <input type="checkbox" id="show_artist_artCB" <?php echo $string = Art::is_enabled() ? 'checked="checked"' : ''; ?>/> <?php echo _('Show Art'); ?> + <input type="checkbox" id="show_artist_artCB" <?php echo $string = Art::is_enabled() ? 'checked="checked"' : ''; ?>/> <?php echo T_('Show Art'); ?> <?php echo Ajax::observe('show_artist_artCB', 'click', Ajax::action('?page=browse&action=show_art&browse_id=' . $browse->id,'')); ?> </ul> </div> diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php index f5902168..91bf28b2 100644 --- a/templates/show_artist_row.inc.php +++ b/templates/show_artist_row.inc.php @@ -28,8 +28,8 @@ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_artist_' . $artist->id); ?> - <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add', T_('Add'),'add_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random', T_('Random'),'random_artist_' . $artist->id); ?> </td> <td class="cel_artist"><?php echo $artist->f_name_link; ?></td> <td class="cel_songs"><?php echo $artist->songs; ?></td> @@ -40,10 +40,10 @@ <td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&id=<?php echo $artist->id; ?>"> - <?php echo get_user_icon('batch_download','',_('Batch Download')); ?> + <?php echo get_user_icon('batch_download','', T_('Batch Download')); ?> </a> <?php } ?> <?php if (Access::check('interface','50')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=artist_row&id=' . $artist->id,'edit',_('Edit'),'edit_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=artist_row&id=' . $artist->id,'edit', T_('Edit'),'edit_artist_' . $artist->id); ?> <?php } ?> </td> diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php index 2d7b2d02..eba96932 100644 --- a/templates/show_artists.inc.php +++ b/templates/show_artists.inc.php @@ -43,14 +43,14 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name',_('Artist'),'artist_sort_name'); ?></th> - <th class="cel_songs"><?php echo _('Songs'); ?></th> - <th class="cel_albums"><?php echo _('Albums'); ?></th> - <th class="cel_time"><?php echo _('Time'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_rating"> <?php echo _('Rating'); ?> </th> - <th class="cel_action"> <?php echo _('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name', T_('Artist'),'artist_sort_name'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_albums"><?php echo T_('Albums'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> <?php // Cache the ratings we are going to use @@ -67,18 +67,18 @@ foreach ($object_ids as $artist_id) { <?php } //end foreach ($artists as $artist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="5"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="5"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name',_('Artist'),'artist_sort_name_bottom'); ?></th> - <th class="cel_songs"> <?php echo _('Songs'); ?> </th> - <th class="cel_albums"> <?php echo _('Albums'); ?> </th> - <th class="cel_time"> <?php echo _('Time'); ?> </th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_rating"> <?php echo _('Rating'); ?> </th> - <th class="cel_action"> <?php echo _('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=artist&sort=name', T_('Artist'),'artist_sort_name_bottom'); ?></th> + <th class="cel_songs"> <?php echo T_('Songs'); ?> </th> + <th class="cel_albums"> <?php echo T_('Albums'); ?> </th> + <th class="cel_time"> <?php echo T_('Time'); ?> </th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php index d537f072..1efdb14b 100644 --- a/templates/show_big_art.inc.php +++ b/templates/show_big_art.inc.php @@ -33,11 +33,11 @@ $htmllang = str_replace("_","-",Config::get('lang')); <head> <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> -<title><?php echo Config::get('site_title'); ?> - <?php echo _("Album Art"); ?></title> +<title><?php echo Config::get('site_title'); ?> - <?php echo T_("Album Art"); ?></title> </head> <body onload="self.resizeTo(document.images[0].width+30, document.images[0].height+70)"> <?php -echo "<a href=\"javascript:window.close()\" title=\"" . _('Click to close window') . "\">"; +echo "<a href=\"javascript:window.close()\" title=\"" . T_('Click to close window') . "\">"; echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&sid=" . session_id() . "\" border=\"0\" alt=\"\" />"; echo "</a>"; ?> diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php index 0f0ee5cf..b4e70e85 100644 --- a/templates/show_catalog_row.inc.php +++ b/templates/show_catalog_row.inc.php @@ -34,10 +34,10 @@ $web_path = Config::get('web_path'); <td class="cel_lastadd"><?php echo scrub_out($catalog->f_add); ?></td> <td class="cel_lastclean"><?php echo scrub_out($catalog->f_clean); ?></td> <td class="cel_action"> - <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Add'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Update'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Gather Art'); ?></a> - | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"><?php echo _('Delete'); ?></a> + <a href="<?php echo $web_path; ?>/admin/catalog.php?action=add_to_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Add'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Verify'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Clean'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=full_service&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Update'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&catalogs[]=<?php echo $catalog->id; ?>"><?php echo T_('Gather Art'); ?></a> + | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_delete_catalog&catalog_id=<?php echo $catalog->id; ?>"><?php echo T_('Delete'); ?></a> </td> diff --git a/templates/show_catalogs.inc.php b/templates/show_catalogs.inc.php index 5c274da4..4939c488 100644 --- a/templates/show_catalogs.inc.php +++ b/templates/show_catalogs.inc.php @@ -38,12 +38,12 @@ <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_catalog"><?php echo _('Name'); ?></th> - <th class="cel_path"><?php echo _('Path'); ?></th> - <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> - <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> - <th class="cel_lastclean"><?php echo _('Last Clean'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_catalog"><?php echo T_('Name'); ?></th> + <th class="cel_path"><?php echo T_('Path'); ?></th> + <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> + <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php foreach ($object_ids as $catalog_id) { @@ -57,17 +57,17 @@ <tr class="<?php echo flip_class(); ?>"> <td colspan="6"> <?php if (!count($object_ids)) { ?> - <span class="fatalerror"><?php echo _('Not Enough Data'); ?></span> + <span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span> <?php } ?> </td> </tr> <tr class="th-bottom"> - <th class="cel_catalog"><?php echo _('Name'); ?></th> - <th class="cel_path"><?php echo _('Path'); ?></th> - <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> - <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> - <th class="cel_lastclean"><?php echo _('Last Clean'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_catalog"><?php echo T_('Name'); ?></th> + <th class="cel_path"><?php echo T_('Path'); ?></th> + <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> + <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_clean_catalog.inc.php b/templates/show_clean_catalog.inc.php index 23eab269..ad73cd8b 100644 --- a/templates/show_clean_catalog.inc.php +++ b/templates/show_clean_catalog.inc.php @@ -28,9 +28,9 @@ show_box_top(); /* HINT: Catalog Name */ -printf(_('Cleaning the %s Catalog'), "<strong>[ $this->name ]</strong>"); +printf(T_('Cleaning the %s Catalog'), "<strong>[ $this->name ]</strong>"); echo "...<br />"; -echo _('Checking') . ': <span id="clean_count_' . $this->id . '"></span><br />'; -echo _('Reading') . ':<span id="clean_dir_' . $this->id . '"></span><br />'; +echo T_('Checking') . ': <span id="clean_count_' . $this->id . '"></span><br />'; +echo T_('Reading') . ':<span id="clean_dir_' . $this->id . '"></span><br />'; show_box_bottom(); ?> diff --git a/templates/show_confirmation.inc.php b/templates/show_confirmation.inc.php index 0f46556e..74b4044d 100644 --- a/templates/show_confirmation.inc.php +++ b/templates/show_confirmation.inc.php @@ -32,12 +32,12 @@ $confirmation = Core::form_register($form_name); <?php echo $text; ?> <br /> <form method="post" action="<?php echo $path; ?>" style="display:inline;"> - <input type="submit" value="<?php echo _('Continue'); ?>" /> + <input type="submit" value="<?php echo T_('Continue'); ?>" /> <?php echo $confirmation; ?> </form> <?php if ($cancel) { ?> <form method="post" action="<?php echo Config::get('web_path') . '/' . return_referer(); ?>" style="display:inline;"> - <input type="submit" value="<?php echo _('Cancel'); ?>" /> + <input type="submit" value="<?php echo T_('Cancel'); ?>" /> <?php echo $confirmation; ?> </form> <?php } ?> diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php index 757954f5..f84f6ba0 100644 --- a/templates/show_create_democratic.inc.php +++ b/templates/show_create_democratic.inc.php @@ -26,45 +26,45 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Configure Democratic Playlist')); ?> +show_box_top(T_('Configure Democratic Playlist')); ?> <form method="post" action="<?php echo Config::get('web_path'); ?>/democratic.php?action=create" enctype="multipart/form-data"> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> - <td><?php echo _('Name'); ?></td> + <td><?php echo T_('Name'); ?></td> <td><input type="text" name="name" value="<?php echo scrub_out($democratic->name); ?>" /></td> </tr> <tr> - <td><?php echo _('Base Playlist'); ?></td> + <td><?php echo T_('Base Playlist'); ?></td> <td><?php show_playlist_select('democratic',$democratic->base_playlist); ?></td> </tr> <tr> - <td><?php echo _('Cooldown Time'); ?></td> - <td><input type="text" size="4" maxlength="6" name="cooldown" value="<?php echo $democratic->cooldown; ?>" /><?php echo _('minutes'); ?></td> + <td><?php echo T_('Cooldown Time'); ?></td> + <td><input type="text" size="4" maxlength="6" name="cooldown" value="<?php echo $democratic->cooldown; ?>" /><?php echo T_('minutes'); ?></td> </tr> <!-- <tr> - <td><?php echo _('Level'); ?></td> + <td><?php echo T_('Level'); ?></td> <td> <select name="level"> - <option value="25"><?php echo _('User'); ?></option> - <option value="50"><?php echo _('Content Manager'); ?></option> - <option value="75"><?php echo _('Catalog Manager'); ?></option> - <option value="100"><?php echo _('Admin'); ?></option> + <option value="25"><?php echo T_('User'); ?></option> + <option value="50"><?php echo T_('Content Manager'); ?></option> + <option value="75"><?php echo T_('Catalog Manager'); ?></option> + <option value="100"><?php echo T_('Admin'); ?></option> </select> <tr> - <td><?php echo _('Make Default'); ?></td> + <td><?php echo T_('Make Default'); ?></td> <td><input type="checkbox" name="make_default" value="1" /></td> </tr> --> <tr> - <td><?php echo _('Force Democratic Play'); ?></td> + <td><?php echo T_('Force Democratic Play'); ?></td> <td><input type="checkbox" value="1" name="force_democratic" /></td> </tr> </table> <div class="formValidation"> <?php echo Core::form_register('create_democratic'); ?> - <input type="submit" value="<?php echo _('Update'); ?>" /> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_debug.inc.php b/templates/show_debug.inc.php index 3722f2d4..8a3dbfa1 100644 --- a/templates/show_debug.inc.php +++ b/templates/show_debug.inc.php @@ -27,44 +27,44 @@ */ ?> -<?php show_box_top(_('Debug Tools'), 'box box_debug_tools'); ?> +<?php show_box_top(T_('Debug Tools'), 'box box_debug_tools'); ?> <div id="information_actions"> <ul> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo get_user_icon('cog', _('Generate Configuration')); ?></a> - <?php echo _('Generate Configuration'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=generate_config"><?php echo get_user_icon('cog', T_('Generate Configuration')); ?></a> + <?php echo T_('Generate Configuration'); ?> </li> <li> - <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=reset_db_charset"><?php echo get_user_icon('server_lightning', _('Set Database Charset')); ?></a> - <?php echo _('Set Database Charset'); ?> + <a href="<?php echo Config::get('web_path'); ?>/admin/system.php?action=reset_db_charset"><?php echo get_user_icon('server_lightning', T_('Set Database Charset')); ?></a> + <?php echo T_('Set Database Charset'); ?> </li> </ul> </div> <?php show_box_bottom(); ?> -<?php show_box_top(_('PHP Settings'), 'box box_php_settings'); ?> +<?php show_box_top(T_('PHP Settings'), 'box box_php_settings'); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_php_setting"> <col id="col_php_value"> </colgroup> <tr class="th-top"> - <th class="cel_php_setting"><?php echo _('Setting'); ?></th> - <th class="cel_php_value"><?php echo _('Value'); ?></th> + <th class="cel_php_setting"><?php echo T_('Setting'); ?></th> + <th class="cel_php_value"><?php echo T_('Value'); ?></th> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Memory Limit'); ?></td> + <td><?php echo T_('Memory Limit'); ?></td> <td><?php echo ini_get('memory_limit'); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Maximum Execution Time'); ?></td> + <td><?php echo T_('Maximum Execution Time'); ?></td> <td><?php echo ini_get('max_execution_time'); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Override Execution Time'); ?></td> - <td><?php set_time_limit(0); echo ini_get('max_execution_time') ? _('Failed') : _('Succeeded'); ?></td> + <td><?php echo T_('Override Execution Time'); ?></td> + <td><?php set_time_limit(0); echo ini_get('max_execution_time') ? T_('Failed') : T_('Succeeded'); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Safe Mode'); ?></td> + <td><?php echo T_('Safe Mode'); ?></td> <td><?php echo print_bool(ini_get('safe_mode')); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> @@ -72,33 +72,33 @@ <td><?php echo ini_get('open_basedir'); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Zlib Support'); ?></td> + <td><?php echo T_('Zlib Support'); ?></td> <td><?php echo print_bool(function_exists('gzcompress')); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('GD Support'); ?></td> + <td><?php echo T_('GD Support'); ?></td> <td><?php echo print_bool(function_exists('ImageCreateFromString')); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Iconv Support'); ?></td> + <td><?php echo T_('Iconv Support'); ?></td> <td><?php echo print_bool(function_exists('iconv')); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Gettext Support'); ?></td> + <td><?php echo T_('Gettext Support'); ?></td> <td><?php echo print_bool(function_exists('bindtextdomain')); ?></td> </tr> </table> <?php show_box_bottom(); ?> -<?php show_box_top(_('Current Configuration'), 'box box_current_configuration'); ?> +<?php show_box_top(T_('Current Configuration'), 'box box_current_configuration'); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_configuration"> <col id="col_value"> </colgroup> <tr class="th-top"> - <th class="cel_configuration"><?php echo _('Preference'); ?></th> - <th class="cel_value"><?php echo _('Value'); ?></th> + <th class="cel_configuration"><?php echo T_('Preference'); ?></th> + <th class="cel_value"><?php echo T_('Value'); ?></th> </tr> <?php foreach ($configuration as $key=>$value) { if ($key == 'database_password' || $key == 'mysql_password') { $value = '*********'; } diff --git a/templates/show_democratic.inc.php b/templates/show_democratic.inc.php index 0bac3584..3430c042 100644 --- a/templates/show_democratic.inc.php +++ b/templates/show_democratic.inc.php @@ -27,29 +27,29 @@ */ /* HINT: Democratic Name */ -$string = $democratic->is_enabled() ? sprintf(_('%s Playlist') ,$democratic->name) : _('Democratic Playlist'); +$string = $democratic->is_enabled() ? sprintf(T_('%s Playlist') ,$democratic->name) : T_('Democratic Playlist'); show_box_top($string , 'info-box'); ?> <div id="information_actions"> <ul> <?php if ($democratic->is_enabled()) { ?> <li> - <?php echo _('Cooldown'); ?>:<?php echo $democratic->f_cooldown; ?> + <?php echo T_('Cooldown'); ?>:<?php echo $democratic->f_cooldown; ?> </li> <?php } ?> <?php if (Access::check('interface','75')) { ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=manage"><?php echo get_user_icon('server_lightning',_('Configure Democratic Playlist')); ?></a> - <?php echo _('Configure Democratic Playlist'); ?> + <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=manage"><?php echo get_user_icon('server_lightning', T_('Configure Democratic Playlist')); ?></a> + <?php echo T_('Configure Democratic Playlist'); ?> </li> <?php if ($democratic->is_enabled()) { ?> <li> - <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . scrub_out($democratic->id),'all',_('Play'),'play_democratic'); ?> - <?php echo _('Play Democratic Playlist'); ?> + <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . scrub_out($democratic->id),'all', T_('Play'),'play_democratic'); ?> + <?php echo T_('Play Democratic Playlist'); ?> </li> <li> - <?php echo Ajax::button('?page=democratic&action=clear_playlist&democratic_id=' . scrub_out($democratic->id),'delete',_('Clear Playlist'),'clear_democratic'); ?> - <?php echo _('Clear Playlist'); ?> + <?php echo Ajax::button('?page=democratic&action=clear_playlist&democratic_id=' . scrub_out($democratic->id),'delete', T_('Clear Playlist'),'clear_democratic'); ?> + <?php echo T_('Clear Playlist'); ?> </li> <?php } ?> <?php } ?> diff --git a/templates/show_democratic_playlist.inc.php b/templates/show_democratic_playlist.inc.php index 10f21f91..b1b01cf9 100644 --- a/templates/show_democratic_playlist.inc.php +++ b/templates/show_democratic_playlist.inc.php @@ -47,7 +47,7 @@ if (!count($object_ids)) { ?> <tr> <td> - <?php echo _('Playing from base Playlist'); ?>: + <?php echo T_('Playing from base Playlist'); ?>: <a href="<?php echo $web_path; ?>/playlist.php?action=show_playlist&playlist_id=<?php echo $playlist->id; ?>"> <?php echo scrub_out($playlist->name); ?> </a> @@ -59,14 +59,14 @@ if (!count($object_ids)) { else { ?> <tr class="th-top"> - <th class="cel_action"><?php echo _('Action'); ?></th> - <th class="cel_votes"><?php echo _('Votes'); ?></th> - <th class="cel_title"><?php echo _('Title'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_time"><?php echo _('Time'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_votes"><?php echo T_('Votes'); ?></th> + <th class="cel_title"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> <?php if (Access::check('interface','100')) { ?> - <th class="cel_admin"><?php echo _('Admin'); ?></th> + <th class="cel_admin"><?php echo T_('Admin'); ?></th> <?php } ?> </tr> <?php @@ -79,9 +79,9 @@ foreach($object_ids as $row_id=>$data) { <tr class="<?php echo flip_class(); ?>"> <td class="cel_action"> <?php if ($democratic->has_vote($media->id)) { ?> - <?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $row_id,'delete',_('Remove Vote'),'remove_vote_' . $row_id); ?> + <?php echo Ajax::button('?page=democratic&action=delete_vote&row_id=' . $row_id,'delete', T_('Remove Vote'),'remove_vote_' . $row_id); ?> <?php } else { ?> - <?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($data['object_type']),'tick',_('Add Vote'),'remove_vote_' . $row_id); ?> + <?php echo Ajax::button('?page=democratic&action=add_vote&object_id=' . $media->id . '&type=' . scrub_out($data['object_type']),'tick', T_('Add Vote'),'remove_vote_' . $row_id); ?> <?php } ?> </td> <td class="cel_votes" ><?php echo scrub_out($democratic->get_vote($row_id)); ?></td> @@ -91,7 +91,7 @@ foreach($object_ids as $row_id=>$data) { <td class="cel_time"><?php echo $media->f_time; ?></td> <?php if (Access::check('interface','100')) { ?> <td class="cel_admin"> - <?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $row_id,'disable',_('Delete'),'delete_row_' . $row_id); ?> + <?php echo Ajax::button('?page=democratic&action=delete&row_id=' . $row_id,'disable', T_('Delete'),'delete_row_' . $row_id); ?> </td> <?php } ?> </tr> @@ -99,14 +99,14 @@ foreach($object_ids as $row_id=>$data) { } // end foreach ?> <tr class="th-bottom"> - <th class="cel_action"><?php echo _('Action'); ?></th> - <th class="cel_votes"><?php echo _('Votes'); ?></th> - <th class="cel_title"><?php echo _('Title'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_time"><?php echo _('Time'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_votes"><?php echo T_('Votes'); ?></th> + <th class="cel_title"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> <?php if (Access::check('interface','100')) { ?> - <th class="cel_admin"><?php echo _('Admin'); ?></th> + <th class="cel_admin"><?php echo T_('Admin'); ?></th> <?php } ?> </tr> <?php diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php index a92917c3..5b6dbd77 100644 --- a/templates/show_denied.inc.php +++ b/templates/show_denied.inc.php @@ -36,16 +36,16 @@ </head> <body bgcolor="#f0f0f0"> <div id="header"> -<h1>Ampache :: <?php echo _('Access Denied'); ?></h1> -<p><?php echo _('This event has been logged.'); ?></p> +<h1>Ampache :: <?php echo T_('Access Denied'); ?></h1> +<p><?php echo T_('This event has been logged.'); ?></p> </div> <p class="error"> <?php if (!Config::get('demo_mode')) { ?> -<?php echo _('You have been redirected to this page because you do not have access to this function.'); ?></p><p class="error"> -<?php echo _('If you believe this is an error please contact an Ampache administrator.'); ?></p><p class="error"> -<?php echo _('This event has been logged.'); ?> +<?php echo T_('You have been redirected to this page because you do not have access to this function.'); ?></p><p class="error"> +<?php echo T_('If you believe this is an error please contact an Ampache administrator.'); ?></p><p class="error"> +<?php echo T_('This event has been logged.'); ?> <?php } else { ?> -<?php echo _("You have been redirected to this page because you attempted to access a function that is disabled in the demo."); ?> +<?php echo T_("You have been redirected to this page because you attempted to access a function that is disabled in the demo."); ?> <?php } ?> </p> <div id="bottom"> diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php index e914d657..ff60333b 100644 --- a/templates/show_disabled_songs.inc.php +++ b/templates/show_disabled_songs.inc.php @@ -39,12 +39,12 @@ <col id="col_additiontime" /> </colgroup> <tr class="th-top"> - <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th> - <th class="cel_song"><?php echo _('Title'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_filename"><?php echo _('Filename'); ?></th> - <th class="cel_additiontime"><?php echo _('Addition Time'); ?></th> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo T_('Select'); ?></a></th> + <th class="cel_song"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> + <th class="cel_additiontime"><?php echo T_('Addition Time'); ?></th> </tr> <?php foreach ($songs as $song) { ?> <tr class="<?php echo flip_class(); ?>"> @@ -58,20 +58,20 @@ </tr> <?php } if (!count($songs)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="7"><span class="error"><?php echo _('No Records Found'); ?></span></td> + <td colspan="7"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th> - <th class="cel_song"><?php echo _('Title'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_filename"><?php echo _('Filename'); ?></th> - <th class="cel_additiontime"><?php echo _('Addition Time'); ?></th> + <th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo T_('Select'); ?></a></th> + <th class="cel_song"><?php echo T_('Title'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> + <th class="cel_additiontime"><?php echo T_('Addition Time'); ?></th> </tr> </table> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Remove'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Remove'); ?>" /> <input type="hidden" name="action" value="remove_disabled" /> </div> </form> diff --git a/templates/show_duplicate.inc.php b/templates/show_duplicate.inc.php index 6e35cff1..5999e9e2 100644 --- a/templates/show_duplicate.inc.php +++ b/templates/show_duplicate.inc.php @@ -27,26 +27,26 @@ */ ?> -<?php show_box_top(_('Find Duplicates'), 'box box_duplicate'); ?> +<?php show_box_top(T_('Find Duplicates'), 'box box_duplicate'); ?> <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/duplicates.php?action=find_duplicates" method="post" enctype="multipart/form-data" > <table cellspacing="0" cellpadding="3"> <tr> - <td valign="top"><strong><?php echo _('Search Type'); ?>:</strong></td> + <td valign="top"><strong><?php echo T_('Search Type'); ?>:</strong></td> <td> <?php $name = 'check_' . scrub_in($_REQUEST['search_type']); ${$name} = ' checked="checked" '; ?> - <input type="radio" name="search_type" value="title"<?php echo $check_title; ?>/><?php echo _('Title'); ?><br /> - <input type="radio" name="search_type" value="artist_title"<?php echo $check_artist_title; ?>/><?php echo _('Artist and Title'); ?><br /> - <input type="radio" name="search_type" value="artist_album_title"<?php echo $check_artist_album_title; ?>/><?php echo _('Artist, Album and Title'); ?><br /> + <input type="radio" name="search_type" value="title"<?php echo $check_title; ?>/><?php echo T_('Title'); ?><br /> + <input type="radio" name="search_type" value="artist_title"<?php echo $check_artist_title; ?>/><?php echo T_('Artist and Title'); ?><br /> + <input type="radio" name="search_type" value="artist_album_title"<?php echo $check_artist_album_title; ?>/><?php echo T_('Artist, Album and Title'); ?><br /> <?php if ($_REQUEST['search_disabled']) { $disabled_check = ' checked="checked"'; } ?> - <input type="checkbox" name="search_disabled" value="1" <?php echo $disabled_check; ?>/><?php echo _('Search Disabled Songs'); ?><br /> + <input type="checkbox" name="search_disabled" value="1" <?php echo $disabled_check; ?>/><?php echo T_('Search Disabled Songs'); ?><br /> </td> </tr> </table> <div class="formValidation"> - <input type="submit" value="<?php echo _('Find Duplicates'); ?>" /> + <input type="submit" value="<?php echo T_('Find Duplicates'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_duplicates.inc.php b/templates/show_duplicates.inc.php index 0eccaa85..d5305c97 100644 --- a/templates/show_duplicates.inc.php +++ b/templates/show_duplicates.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Duplicate Songs')); ?> +<?php show_box_top(T_('Duplicate Songs')); ?> <form method="post" enctype="multipart/form-data" action="<?php echo $web_path; ?>/admin/flag.php?action=disable"> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> @@ -41,14 +41,14 @@ <col id="col_filename" /> </colgroup> <tr class="th-top"> - <th class="cel_disable"><?php echo _('Disable'); ?></th> - <th class="cel_song"><?php echo _('Song'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_length"><?php echo _('Length'); ?></th> - <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> - <th class="cel_size"><?php echo _('Size'); ?></th> - <th class="cel_filename"><?php echo _('Filename'); ?></th> + <th class="cel_disable"><?php echo T_('Disable'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_length"><?php echo T_('Length'); ?></th> + <th class="cel_bitrate"><?php echo T_('Bitrate'); ?></th> + <th class="cel_size"><?php echo T_('Size'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> </tr> <?php foreach ($duplicates as $item) { @@ -65,7 +65,7 @@ ?> <tr id="<?php echo $row_key; ?>" class="<?php echo $current_class; ?>"> <td class="cel_disable" id="<?php echo($button_flip_state_id); ?>"> - <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id,$button,_(ucfirst($button)),'flip_state_' . $song_id); ?> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song_id,$button, T_(ucfirst($button)),'flip_state_' . $song_id); ?> </td> <td class="cel_song"><?php echo $song->f_link; ?></td> <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> @@ -80,14 +80,14 @@ } // end foreach ($flags as $flag) ?> <tr class="th-bottom"> - <th class="cel_disable"><?php echo _('Disable'); ?></th> - <th class="cel_song"><?php echo _('Song'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_length"><?php echo _('Length'); ?></th> - <th class="cel_bitrate"><?php echo _('Bitrate'); ?></th> - <th class="cel_size"><?php echo _('Size'); ?></th> - <th class="cel_filename"><?php echo _('Filename'); ?></th> + <th class="cel_disable"><?php echo T_('Disable'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_length"><?php echo T_('Length'); ?></th> + <th class="cel_bitrate"><?php echo T_('Bitrate'); ?></th> + <th class="cel_size"><?php echo T_('Size'); ?></th> + <th class="cel_filename"><?php echo T_('Filename'); ?></th> </tr> </table> </form> diff --git a/templates/show_dynamic.inc.php b/templates/show_dynamic.inc.php index ead83af9..89f52ac9 100644 --- a/templates/show_dynamic.inc.php +++ b/templates/show_dynamic.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Advanced Random Rules')); ?> +<?php show_box_top(T_('Advanced Random Rules')); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_field" /> @@ -36,10 +36,10 @@ <col id="col_method" /> </colgroup> <tr class="th-top"> - <th class="col_field"><?php echo _('Field'); ?></th> - <th class="col_operator"><?php echo _('Operator'); ?></th> - <th class="col_value"><?php echo _('Value'); ?></th> - <th class="col_method"><?php echo _('Method'); ?></th> + <th class="col_field"><?php echo T_('Field'); ?></th> + <th class="col_operator"><?php echo T_('Operator'); ?></th> + <th class="col_value"><?php echo T_('Value'); ?></th> + <th class="col_method"><?php echo T_('Method'); ?></th> </tr> <tr> <td valign="top"> @@ -61,7 +61,7 @@ <option value="gte">>=</option> <option value="lt"><</option> <option value="lte"><=</option> - <option value="like"><?php echo _('Like'); ?></option> + <option value="like"><?php echo T_('Like'); ?></option> </select> </td> <td valign="top"> @@ -69,20 +69,20 @@ </td> <td valign="top"> <select name="method"> - <option value="OR"><?php echo _('OR'); ?></option> - <option value="AND"><?php echo _('AND'); ?></option> + <option value="OR"><?php echo T_('OR'); ?></option> + <option value="AND"><?php echo T_('AND'); ?></option> </select> </td> </tr> <tr> <td> - <?php echo Ajax::button('?page=random&action=add_rule','add',_('Add Rule'),'add_random_rule'); ?><?php echo _('Add Rule'); ?> + <?php echo Ajax::button('?page=random&action=add_rule','add', T_('Add Rule'),'add_random_rule'); ?><?php echo T_('Add Rule'); ?> </td> <td> - <?php echo Ajax::button('?page=random&action=save_rules','download',_('Save Rules As'),'save_random_rules'); ?><?php echo _('Save Rules As'); ?> + <?php echo Ajax::button('?page=random&action=save_rules','download', T_('Save Rules As'),'save_random_rules'); ?><?php echo T_('Save Rules As'); ?> </td> <td colspan="2"> - <?php echo Ajax::button('?page=random&action=load_rules','cog',_('Load Saved Rules'),'load_random_rules'); ?><?php echo _('Load Saved Rules'); ?> + <?php echo Ajax::button('?page=random&action=load_rules','cog', T_('Load Saved Rules'),'load_random_rules'); ?><?php echo T_('Load Saved Rules'); ?> </td> </tr> diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php index 767eede5..28bd0f73 100644 --- a/templates/show_edit_access.inc.php +++ b/templates/show_edit_access.inc.php @@ -27,69 +27,69 @@ */ ?> -<?php show_box_top(_('Edit Access Control List')); ?> +<?php show_box_top(T_('Edit Access Control List')); ?> <form name="edit_access" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php?action=update_record&access_id=<?php echo intval($access->id); ?>"> <table class="table-data"> <tr> - <td><?php echo _('Name'); ?>: </td> + <td><?php echo T_('Name'); ?>: </td> <td colspan="3"><input type="text" name="name" value="<?php echo scrub_out($access->name); ?>" /></td> </tr> <tr> - <td><?php echo _('ACL Type'); ?>: </td> + <td><?php echo T_('ACL Type'); ?>: </td> <td colspan="3"> <select name="type"> <?php $name = 'sl_' . $access->type; ${$name} = ' selected="selected"'; ?> - <option value="stream"<?php echo $sl_stream; ?>><?php echo _('Stream Access'); ?></option> - <option value="interface"<?php echo $sl_interface; ?>><?php echo _('Web Interface'); ?></option> - <option value="network"<?php echo $sl_network; ?>><?php echo _('Local Network Definition'); ?></option> - <option value="rpc"<?php echo $sl_rpc; ?>><?php echo _('RPC'); ?></option> + <option value="stream"<?php echo $sl_stream; ?>><?php echo T_('Stream Access'); ?></option> + <option value="interface"<?php echo $sl_interface; ?>><?php echo T_('Web Interface'); ?></option> + <option value="network"<?php echo $sl_network; ?>><?php echo T_('Local Network Definition'); ?></option> + <option value="rpc"<?php echo $sl_rpc; ?>><?php echo T_('RPC'); ?></option> </select> </td> </tr> <tr> - <td colspan="4"><h3><?php echo _('IPv4 or IPv6 Addresses'); ?></h3> + <td colspan="4"><h3><?php echo T_('IPv4 or IPv6 Addresses'); ?></h3> <span class="information">(255.255.255.255) / (ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff)</span> </td> </tr> <tr> - <td><?php echo _('Start'); ?>:</td> + <td><?php echo T_('Start'); ?>:</td> <td> <?php Error::display('start'); ?> <input type="text" name="start" value="<?php echo $access->f_start; ?>" size="20" /> </td> - <td><?php echo _('End'); ?>:</td> + <td><?php echo T_('End'); ?>:</td> <td> <?php Error::display('end'); ?> <input type="text" name="end" value="<?php echo $access->f_end; ?>" size="20" /> </td> </tr> <tr> - <td><?php echo _('User'); ?>:</td> + <td><?php echo T_('User'); ?>:</td> <td colspan="3"> <?php show_user_select('user',$access->user); ?> </td> </tr> <tr> - <td><?php echo _('Remote Key'); ?></td> + <td><?php echo T_('Remote Key'); ?></td> <td colspan="3"> <input type="text" name="key" value="<?php echo scrub_out($access->key); ?>" size="32" maxlength="32" /> </td> </tr> <tr> - <td><?php echo _('Level'); ?>:</td> + <td><?php echo T_('Level'); ?>:</td> <td colspan="3"> <?php $name = 'level_' . $access->level; ${$name} = 'checked="checked"'; ?> - <input type="radio" name="level" value="5" <?php echo $level_5; ?>><?php echo _('View'); ?> - <input type="radio" name="level" value="25" <?php echo $level_25; ?>><?php echo _('Read'); ?> - <input type="radio" name="level" value="50" <?php echo $level_50; ?>><?php echo _('Read/Write'); ?> - <input type="radio" name="level" value="75" <?php echo $level_75; ?>><?php echo _('All'); ?> + <input type="radio" name="level" value="5" <?php echo $level_5; ?>><?php echo T_('View'); ?> + <input type="radio" name="level" value="25" <?php echo $level_25; ?>><?php echo T_('Read'); ?> + <input type="radio" name="level" value="50" <?php echo $level_50; ?>><?php echo T_('Read/Write'); ?> + <input type="radio" name="level" value="75" <?php echo $level_75; ?>><?php echo T_('All'); ?> </td> </tr> </table> <div class="formValidation"> <?php echo Core::form_register('edit_acl'); ?> - <input type="submit" value="<?php echo _('Update'); ?>" /> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index 4b082efd..2830eaf7 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -28,17 +28,17 @@ ?> -<?php show_box_top(_('Edit Album')); ?> +<?php show_box_top(T_('Edit Album')); ?> <form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=edit_album"> <table class="tabledata"> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Name'); ?></td> + <td><?php echo T_('Name'); ?></td> <td> <input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>"> </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Year'); ?></td> + <td><?php echo T_('Year'); ?></td> <td> <input type="text" name="year" value="<?php echo scrub_out($album->year); ?>"> </td> @@ -46,13 +46,13 @@ <tr class="<?php echo flip_class(); ?>"> <td> </td> <td> - <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?> + <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> </td> </tr> </table> <div class="formValidation"> <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> - <input type="submit" value="<?php echo _('Update Album'); ?>" /> + <input type="submit" value="<?php echo T_('Update Album'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php index 95030ebe..5b04a9a6 100644 --- a/templates/show_edit_album_row.inc.php +++ b/templates/show_edit_album_row.inc.php @@ -40,7 +40,7 @@ show_artist_select('artist',$album->artist_id); } else { - echo _('Various'); + echo T_('Various'); } ?> </td> @@ -53,7 +53,7 @@ <td> <input type="hidden" name="id" value="<?php echo $album->id; ?>" /> <input type="hidden" name="type" value="album_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $album->id . '&type=album_row','download',_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $album->id . '&type=album_row','download', T_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index 93801e5e..d5d265e4 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -28,11 +28,11 @@ ?> -<?php show_box_top(_('Edit Artist')); ?> +<?php show_box_top(T_('Edit Artist')); ?> <form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=edit_artist"> <table class="tabledata"> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Name'); ?></td> + <td><?php echo T_('Name'); ?></td> <td> <input type="text" name="name" value="<?php echo scrub_out($artist->name); ?>"> </td> @@ -40,13 +40,13 @@ <tr class="<?php echo flip_class(); ?>"> <td> </td> <td> - <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?> + <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> </td> </tr> </table> <div class="formValidation"> <input type="hidden" name="artist_id" value="<?php echo $artist->id; ?>" /> - <input type="submit" value="<?php echo _('Update Artist'); ?>" /> + <input type="submit" value="<?php echo T_('Update Artist'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php index 2b837949..8779e10d 100644 --- a/templates/show_edit_artist_row.inc.php +++ b/templates/show_edit_artist_row.inc.php @@ -37,7 +37,7 @@ <td> <input type="hidden" name="id" value="<?php echo $artist->id; ?>" /> <input type="hidden" name="type" value="artist_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $artist->id . '&type=artist_row','download',_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $artist->id . '&type=artist_row','download', T_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?> </tr> </table> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index a23ebb2c..02041978 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -27,44 +27,44 @@ */ ?> -<?php /* HINT: Catalog Name */ show_box_top(sprintf(_('Settings for %s') , $catalog->name . ' (' . $catalog->path . ')'), 'box box_edit_catalog'); ?> +<?php /* HINT: Catalog Name */ show_box_top(sprintf(T_('Settings for %s') , $catalog->name . ' (' . $catalog->path . ')'), 'box box_edit_catalog'); ?> <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <table cellspacing="0" cellpadding="0"> <tr> - <td><?php echo _('Name'); ?>:</td> + <td><?php echo T_('Name'); ?>:</td> <td><input size="60" type="text" name="name" value="<?php echo scrub_out($catalog->name); ?>"></input></td> <td style="vertical-align:top; font-family: monospace;" rowspan="5"> - <strong><?php echo _('Auto-inserted Fields'); ?>:</strong><br /> - %A = <?php echo _('album name'); ?><br /> - %a = <?php echo _('artist name'); ?><br /> - %c = <?php echo _('id3 comment'); ?><br /> - %T = <?php echo _('track number (padded with leading 0)'); ?><br /> - %t = <?php echo _('song title'); ?><br /> - %y = <?php echo _('year'); ?><br /> - %o = <?php echo _('other'); ?><br /> + <strong><?php echo T_('Auto-inserted Fields'); ?>:</strong><br /> + %A = <?php echo T_('album name'); ?><br /> + %a = <?php echo T_('artist name'); ?><br /> + %c = <?php echo T_('id3 comment'); ?><br /> + %T = <?php echo T_('track number (padded with leading 0)'); ?><br /> + %t = <?php echo T_('song title'); ?><br /> + %y = <?php echo T_('year'); ?><br /> + %o = <?php echo T_('other'); ?><br /> </td> </tr> <tr> - <td><?php echo _('Catalog Type'); ?></td> + <td><?php echo T_('Catalog Type'); ?></td> <td><?php echo scrub_out(ucfirst($catalog->catalog_type)); ?></td> </tr> <tr> - <td><?php echo _('Remote Catalog Username'); ?>: </td> - <td><input size="30" type="text" name="remote_username" value="<?php echo scrub_out($catalog->remote_username); ?>" /><span class="error">*<?php echo _('Required for Remote Catalogs'); ?></span></td> + <td><?php echo T_('Remote Catalog Username'); ?>: </td> + <td><input size="30" type="text" name="remote_username" value="<?php echo scrub_out($catalog->remote_username); ?>" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo _('Remote Catalog Password'); ?>: </td> - <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo _('Required for Remote Catalogs'); ?></span></td> + <td><?php echo T_('Remote Catalog Password'); ?>: </td> + <td><input size="30" type="password" name="remote_password" value="" /><span class="error">*<?php echo T_('Required for Remote Catalogs'); ?></span></td> </tr> <tr> - <td><?php echo _('Filename pattern'); ?>:</td> + <td><?php echo T_('Filename pattern'); ?>:</td> <td> <input size="60" type="text" name="rename_pattern" value="<?php echo scrub_out($catalog->rename_pattern); ?>" /> </td> </tr> <tr> <td> - <?php echo _('Folder Pattern'); ?>:<br /><?php echo _('(no leading or ending \'/\')'); ?> + <?php echo T_('Folder Pattern'); ?>:<br /><?php echo T_('(no leading or ending \'/\')'); ?> </td> <td> <input size="60" type="text" name="sort_pattern" value="<?php echo scrub_out($catalog->sort_pattern);?>" /> @@ -74,7 +74,7 @@ <div class="formValidation"> <input type="hidden" name="catalog_id" value="<?php echo scrub_out($catalog->id); ?>" /> <input type="hidden" name="action" value="update_catalog_settings" /> - <input class="button" type="submit" value="<?php echo _('Save Catalog Settings'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Save Catalog Settings'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php index 64fe252f..dd1a06b8 100644 --- a/templates/show_edit_live_stream_row.inc.php +++ b/templates/show_edit_live_stream_row.inc.php @@ -31,11 +31,11 @@ <form method="post" id="edit_live_stream_<?php echo $radio->id; ?>"> <table class="inline-edit" cellpadding="3" cellspacing="0"> <tr> - <th><?php echo _('Name'); ?></th> - <th><?php echo _('Stream URL'); ?></th> - <th><?php echo _('Homepage'); ?></th> - <th><?php echo _('Callsign'); ?></th> - <th><?php echo _('Frequency'); ?></th> + <th><?php echo T_('Name'); ?></th> + <th><?php echo T_('Stream URL'); ?></th> + <th><?php echo T_('Homepage'); ?></th> + <th><?php echo T_('Callsign'); ?></th> + <th><?php echo T_('Frequency'); ?></th> <th> </th> </tr> <tr> @@ -57,7 +57,7 @@ <td> <input type="hidden" name="id" value="<?php echo $radio->id; ?>" /> <input type="hidden" name="type" value="live_stream_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream_row','download',_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream_row','download', T_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php index 5b853a75..19abb1f5 100644 --- a/templates/show_edit_playlist_row.inc.php +++ b/templates/show_edit_playlist_row.inc.php @@ -37,13 +37,13 @@ <td> <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo _('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo _('Private'); ?></option> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> </select> <td> <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> <input type="hidden" name="type" value="playlist_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_row','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php index 7efc8086..84bab2aa 100644 --- a/templates/show_edit_playlist_song_row.inc.php +++ b/templates/show_edit_playlist_song_row.inc.php @@ -43,7 +43,7 @@ <td> <input type="hidden" name="id" value="<?php echo $song->id; ?>" /> <input type="hidden" name="type" value="song" /> - <?php echo Ajax::button('?page=playlist&action=save_track&playlist_id=' . $playlist->id . '&track_id=' . $track['id'],'download',_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> + <?php echo Ajax::button('?page=playlist&action=save_track&playlist_id=' . $playlist->id . '&track_id=' . $track['id'],'download', T_('Save Changes'),'save_track_' . $track['id'],'edit_track_' . $track['id']); ?> </td> </tr> </table> diff --git a/templates/show_edit_playlist_title.inc.php b/templates/show_edit_playlist_title.inc.php index dac65ed9..20743262 100644 --- a/templates/show_edit_playlist_title.inc.php +++ b/templates/show_edit_playlist_title.inc.php @@ -36,13 +36,13 @@ <td> <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo _('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo _('Private'); ?></option> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> </select> <td> <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> <input type="hidden" name="type" value="playlist_title" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_title','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_shout.inc.php b/templates/show_edit_shout.inc.php index 6e407623..13ff1cfb 100644 --- a/templates/show_edit_shout.inc.php +++ b/templates/show_edit_shout.inc.php @@ -27,25 +27,25 @@ */ ?> -<?php show_box_top(_('Edit existing Shoutbox Post')); ?> +<?php show_box_top(T_('Edit existing Shoutbox Post')); ?> <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/shout.php?action=edit_shout"> <input type="hidden" name="shout_id" value="<?php echo $shout->id; ?>" /> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr> - <td><strong><?php /* HINT: Client link, Object link */ printf(_('Created by: %s for %s'), $client->f_link, $object->f_link); ?></strong> + <td><strong><?php /* HINT: Client link, Object link */ printf(T_('Created by: %s for %s'), $client->f_link, $object->f_link); ?></strong> <tr> <tr> - <td><strong><?php echo _('Comment:'); ?></strong> + <td><strong><?php echo T_('Comment:'); ?></strong> </tr> <tr> <td><textarea rows="5" cols="70" name="comment"><?php echo $shout->text; ?></textarea></td> </tr> <tr> - <td><input type="checkbox" name="sticky" <?php if ($shout->sticky == "1") { echo "checked"; } ?>/> <strong><?php echo _('Make Sticky'); ?></strong></td> + <td><input type="checkbox" name="sticky" <?php if ($shout->sticky == "1") { echo "checked"; } ?>/> <strong><?php echo T_('Make Sticky'); ?></strong></td> </tr> <tr> <td> - <input type="submit" value="<?php echo _('Update'); ?>" /> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </td> </tr> </table> diff --git a/templates/show_edit_smartplaylist_row.inc.php b/templates/show_edit_smartplaylist_row.inc.php index fadd1bc7..f02fc62a 100644 --- a/templates/show_edit_smartplaylist_row.inc.php +++ b/templates/show_edit_smartplaylist_row.inc.php @@ -30,13 +30,13 @@ <td> <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo _('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo _('Private'); ?></option> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> </select> <td> <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> <input type="hidden" name="type" value="smartplaylist_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_row','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_row','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_smartplaylist_title.inc.php b/templates/show_edit_smartplaylist_title.inc.php index e6451e66..25730ef9 100644 --- a/templates/show_edit_smartplaylist_title.inc.php +++ b/templates/show_edit_smartplaylist_title.inc.php @@ -29,13 +29,13 @@ <td> <?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> <select name="pl_type"> - <option value="public"<?php echo $select_public; ?>><?php echo _('Public'); ?></option> - <option value="private"<?php echo $select_private; ?>><?php echo _('Private'); ?></option> + <option value="public"<?php echo $select_public; ?>><?php echo T_('Public'); ?></option> + <option value="private"<?php echo $select_private; ?>><?php echo T_('Private'); ?></option> </select> <td> <input type="hidden" name="id" value="<?php echo $playlist->id; ?>" /> <input type="hidden" name="type" value="smartplaylist_title" /> - <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_title','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=smartplaylist_title','download', T_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index 09627569..40f3758f 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -28,49 +28,49 @@ ?> -<?php show_box_top(_('Edit Song')); ?> +<?php show_box_top(T_('Edit Song')); ?> <form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php"> <table> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('File'); ?>:</td> + <td><?php echo T_('File'); ?>:</td> <td><?php echo scrub_out($song->file); ?></td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Title'); ?></td> + <td><?php echo T_('Title'); ?></td> <td> <input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" size="45" /> </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Album'); ?></td> + <td><?php echo T_('Album'); ?></td> <td> <?php show_album_select('album',$song->album); ?> - <br /><?php echo _('OR'); ?><br /> + <br /><?php echo T_('OR'); ?><br /> <input type="text" name="album_string" value="<?php echo scrub_out($song->get_album_name()); ?>" /> </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Artist'); ?></td> + <td><?php echo T_('Artist'); ?></td> <td> <?php show_artist_select('artist',$song->artist); ?> - <br /><?php echo _('OR'); ?><br /> + <br /><?php echo T_('OR'); ?><br /> <input type="text" name="artist_string" value="<?php echo scrub_out($song->get_artist_name()); ?>" /> </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Track'); ?></td> + <td><?php echo T_('Track'); ?></td> <td> <input type="text" name="track" value="<?php echo scrub_out($song->track); ?>" size="3" /> </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Year'); ?></td> + <td><?php echo T_('Year'); ?></td> <td> <input type="text" name="year" value="<?php echo scrub_out($song->year); ?>" size="5" /> </td> </tr> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo _('Comment'); ?></td> + <td><?php echo T_('Comment'); ?></td> <td> <input type="text" name="comment" value="<?php echo scrub_out($song->comment); ?>" size="45" /> </td> @@ -78,14 +78,14 @@ <tr class="<?php echo flip_class(); ?>"> <td> </td> <td> - <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo _('Flag for Retagging'); ?> + <input type="checkbox" name="flag" value="1" checked="checked" /> <?php echo T_('Flag for Retagging'); ?> </td> </tr> </table> <div class="formValidation"> <input type="hidden" name="song_id" value="<?php echo $song->id; ?>" /> <input type="hidden" name="action" value="edit_song" /> - <input type="submit" value="<?php echo _('Update Song'); ?>" /> + <input type="submit" value="<?php echo T_('Update Song'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php index 9ddc78a7..9224dfd4 100644 --- a/templates/show_edit_song_row.inc.php +++ b/templates/show_edit_song_row.inc.php @@ -50,7 +50,7 @@ <td> <input type="hidden" name="id" value="<?php echo $song->id; ?>" /> <input type="hidden" name="type" value="song_row" /> - <?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song_row','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> + <?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song_row','download', T_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?> </td> </tr> </table> diff --git a/templates/show_edit_user.inc.php b/templates/show_edit_user.inc.php index 1ff58f06..844ed2b1 100644 --- a/templates/show_edit_user.inc.php +++ b/templates/show_edit_user.inc.php @@ -27,16 +27,16 @@ */ ?> -<?php show_box_top(_('Editing existing User')); ?> +<?php show_box_top(T_('Editing existing User')); ?> <?php Error::display('general'); ?> <form name="update_user" enctype="multipart/form-data" method="post" action="<?php echo Config::get('web_path') . "/admin/users.php"; ?>"> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> - <th colspan="2"><?php echo _('User Properties'); ?></th> + <th colspan="2"><?php echo T_('User Properties'); ?></th> </tr> <tr> <td> - <?php echo _('Username'); ?>: + <?php echo T_('Username'); ?>: </td> <td> <input type="text" name="username" size="30" maxlength="128" value="<?php echo scrub_out($client->username); ?>" /> @@ -44,14 +44,14 @@ </td> </tr> <tr> - <td><?php echo _('Full Name'); ?>:</td> + <td><?php echo T_('Full Name'); ?>:</td> <td> <input type="text" name="fullname" size="30" value="<?php echo scrub_out($client->fullname); ?>" /> </td> </tr> <tr> <td> - <?php echo _('E-mail'); ?>: + <?php echo T_('E-mail'); ?>: </td> <td> <input type="text" name="email" size="30" value="<?php echo scrub_out($client->email); ?>" /> @@ -59,7 +59,7 @@ </tr> <tr> <td> - <?php echo _('Password'); ?> : + <?php echo T_('Password'); ?> : </td> <td> <input type="password" name="password_1" size="30" value="" /> @@ -68,7 +68,7 @@ </tr> <tr> <td> - <?php echo _('Confirm Password'); ?>: + <?php echo T_('Confirm Password'); ?>: </td> <td> <input type="password" name="password_2" size="30" value="" /> @@ -76,42 +76,42 @@ </tr> <tr> <td> - <?php echo _('User Access Level'); ?>: + <?php echo T_('User Access Level'); ?>: </td> <td> <?php $var_name = "on_" . $client->access; ${$var_name} = 'selected="selected"'; ?> <select name="access"> - <option value="5" <?php echo $on_5; ?>><?php echo _('Guest'); ?></option> - <option value="25" <?php echo $on_25; ?>><?php echo _('User'); ?></option> - <option value="50" <?php echo $on_50; ?>><?php echo _('Content Manager'); ?></option> - <option value="75" <?php echo $on_75; ?>><?php echo _('Catalog Manager'); ?></option> - <option value="100" <?php echo $on_100; ?>><?php echo _('Admin'); ?></option> + <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> + <option value="25" <?php echo $on_25; ?>><?php echo T_('User'); ?></option> + <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> + <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> + <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> </select> </td> </tr> <tr> - <th colspan="2"><?php echo _('Other Options'); ?></th> + <th colspan="2"><?php echo T_('Other Options'); ?></th> </tr> <tr> - <td><?php echo _('Config Preset'); ?></td> + <td><?php echo T_('Config Preset'); ?></td> <td> <select name="preset"> <option value=""></option> - <option value="democratic"><?php echo _('Democratic'); ?></option> - <option value="localplay"><?php echo _('Localplay'); ?></option> - <option value="flash"><?php echo _('Flash'); ?></option> - <option value="stream"><?php echo _('Stream'); ?></option> + <option value="democratic"><?php echo T_('Democratic'); ?></option> + <option value="localplay"><?php echo T_('Localplay'); ?></option> + <option value="flash"><?php echo T_('Flash'); ?></option> + <option value="stream"><?php echo T_('Stream'); ?></option> </select> </td> </tr> <tr> - <td><?php echo _('Prevent Preset Override'); ?></td> + <td><?php echo T_('Prevent Preset Override'); ?></td> <td> - <input type="checkbox" value="1" name="prevent_override" /><span class="information"> <?php echo _('This Affects all non-Admin accounts'); ?></span> + <input type="checkbox" value="1" name="prevent_override" /><span class="information"> <?php echo T_('This Affects all non-Admin accounts'); ?></span> </td> </tr> <tr> - <td><?php echo _('Clear Stats'); ?></td> + <td><?php echo T_('Clear Stats'); ?></td> <td> <input type="checkbox" value="1" name="reset_stats" /> </td> @@ -119,7 +119,7 @@ </table> <div class="formValidation"> <input type="hidden" name="action" value="update_user" /> - <input type="submit" value="<?php echo _('Update User'); ?>" /> + <input type="submit" value="<?php echo T_('Update User'); ?>" /> <?php echo Core::form_register('edit_user'); ?> <input type="hidden" name="user_id" value="<?php echo $client->id; ?>" /> </div> diff --git a/templates/show_export.inc.php b/templates/show_export.inc.php index 2ba58b4f..8595253c 100644 --- a/templates/show_export.inc.php +++ b/templates/show_export.inc.php @@ -31,14 +31,14 @@ ${$name} = ' selected="selected"'; $name = 'catalog_' . $_REQUEST['export_catalog']; ${$name} = ' selected="selected"'; -show_box_top(_('Export Catalog'), 'box box_export'); ?> +show_box_top(T_('Export Catalog'), 'box box_export'); ?> <form name="duplicates" action="<?php echo Config::get('web_path'); ?>/admin/export.php?action=export" method="post" enctype="multipart/form-data" > <table class="tableform" cellspacing="0" cellpadding="3"> <tr> - <td valign="top"><strong><?php echo _('Catalog'); ?>:</strong></td> + <td valign="top"><strong><?php echo T_('Catalog'); ?>:</strong></td> <td> <select id="export_catalog" name="export_catalog"> - <option value=""><?php echo _('All'); ?></option> + <option value=""><?php echo T_('All'); ?></option> <?php $catalog_ids = Catalog::get_catalogs(); foreach ($catalog_ids as $catalog_id) { @@ -54,7 +54,7 @@ show_box_top(_('Export Catalog'), 'box box_export'); ?> </td> </tr> <tr> - <td valign="top"><strong><?php echo _('Format'); ?>:</strong></td> + <td valign="top"><strong><?php echo T_('Format'); ?>:</strong></td> <td> <select id="export_format" name="export_format"> <option value="csv" <?php echo $export_csv; ?>>CSV</option> @@ -64,7 +64,7 @@ show_box_top(_('Export Catalog'), 'box box_export'); ?> </tr> </table> <div class="formValidation"> - <input type="submit" value="<?php echo _('Export'); ?>" /> + <input type="submit" value="<?php echo T_('Export'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_flag_row.inc.php b/templates/show_flag_row.inc.php index 3c599d64..a94b2717 100644 --- a/templates/show_flag_row.inc.php +++ b/templates/show_flag_row.inc.php @@ -35,9 +35,9 @@ <td class="cel_status"><?php $flag->print_status(); ?></td> <td class="cel_action"> <?php if ($flag->approved) { ?> - <?php echo Ajax::button('?page=flag&action=reject&flag_id=' . $flag->id,'disable',_('Reject'),'reject_flag_' . $flag->id); ?> + <?php echo Ajax::button('?page=flag&action=reject&flag_id=' . $flag->id,'disable', T_('Reject'),'reject_flag_' . $flag->id); ?> <?php } else { ?> - <?php echo Ajax::button('?page=flag&action=accept&flag_id=' . $flag->id,'enable',_('Enable'),'enable_flag_' . $flag->id); ?> + <?php echo Ajax::button('?page=flag&action=accept&flag_id=' . $flag->id,'enable', T_('Enable'),'enable_flag_' . $flag->id); ?> <?php } ?> </td> </tr> diff --git a/templates/show_flagged.inc.php b/templates/show_flagged.inc.php index cec20187..2f5e9639 100644 --- a/templates/show_flagged.inc.php +++ b/templates/show_flagged.inc.php @@ -38,12 +38,12 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_object"><?php echo _('Object'); ?></th> - <th class="cel_username"><?php echo _('User'); ?></th> - <th class="cel_flag"><?php echo _('Flag'); ?></th> - <th class="cel_comment"><?php echo _('Comment'); ?></th> - <th class="cel_status"><?php echo _('Status'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_flag"><?php echo T_('Flag'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_status"><?php echo T_('Status'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $flag_id) { @@ -53,15 +53,15 @@ foreach ($object_ids as $flag_id) { ?> <?php } if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="7" class="error"><?php echo _('No Records Found'); ?></td> + <td colspan="7" class="error"><?php echo T_('No Records Found'); ?></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_object"><?php echo _('Object'); ?></th> - <th class="cel_username"><?php echo _('User'); ?></th> - <th class="cel_flag"><?php echo _('Flag'); ?></th> - <th class="cel_comment"><?php echo _('Comment'); ?></th> - <th class="cel_status"><?php echo _('Status'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_flag"><?php echo T_('Flag'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_status"><?php echo T_('Status'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php index 424b1792..24b10254 100644 --- a/templates/show_gather_art.inc.php +++ b/templates/show_gather_art.inc.php @@ -26,9 +26,9 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Album Art Search'), 'box box_gather_art'); -echo "<strong>" . _('Starting Album Art Search') . ". . .</strong><br />\n"; -echo _('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . _('None') . "</span><br />"; -echo _('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />"; +show_box_top(T_('Album Art Search'), 'box box_gather_art'); +echo "<strong>" . T_('Starting Album Art Search') . ". . .</strong><br />\n"; +echo T_('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . T_('None') . "</span><br />"; +echo T_('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />"; show_box_bottom(); ?> diff --git a/templates/show_get_albumart.inc.php b/templates/show_get_albumart.inc.php index 46954fb7..d064cce5 100644 --- a/templates/show_get_albumart.inc.php +++ b/templates/show_get_albumart.inc.php @@ -27,12 +27,12 @@ */ ?> -<?php show_box_top(_('Customize Search'), 'box box_get_albumart'); ?> +<?php show_box_top(T_('Customize Search'), 'box box_get_albumart'); ?> <form enctype="multipart/form-data" name="coverart" method="post" action="<?php echo Config::get('web_path'); ?>/albums.php?action=find_art&album_id=<?php echo $album->id; ?>&artist_name=<?php echo urlencode($_REQUEST['artist_name']);?>&album_name=<?php echo urlencode($_REQUEST['album_name']); ?>&cover=<?php echo urlencode($_REQUEST['cover']); ?>" style="Display:inline;"> <table> <tr> <td> - <?php echo _('Artist'); ?> + <?php echo T_('Artist'); ?> </td> <td> <input type="text" size="20" id="artist_name" name="artist_name" value="<?php echo scrub_out(unhtmlentities($artistname)); ?>" /> @@ -40,7 +40,7 @@ </tr> <tr> <td> - <?php echo _('Album'); ?> + <?php echo T_('Album'); ?> </td> <td> <input type="text" size="20" id="album_name" name="album_name" value="<?php echo scrub_out(unhtmlentities($albumname)); ?>" /> @@ -48,7 +48,7 @@ </tr> <tr> <td> - <?php echo _('Direct URL to Image'); ?> + <?php echo T_('Direct URL to Image'); ?> </td> <td> <input type="text" size="40" id="cover" name="cover" value="" /> @@ -56,7 +56,7 @@ </tr> <tr> <td> - <?php echo _('Local Image'); ?> + <?php echo T_('Local Image'); ?> </td> <td> <input type="file" size="40" id="file" name="file" value="" /> @@ -67,7 +67,7 @@ <input type="hidden" name="action" value="find_art" /> <input type="hidden" name="album_id" value="<?php echo $album->id; ?>" /> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo Config::get('max_upload_size'); ?>" /> - <input type="submit" value="<?php echo _('Get Art'); ?>" /> + <input type="submit" value="<?php echo T_('Get Art'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_import_playlist.inc.php b/templates/show_import_playlist.inc.php index bb5bd7c6..f1bcbe5f 100644 --- a/templates/show_import_playlist.inc.php +++ b/templates/show_import_playlist.inc.php @@ -27,18 +27,18 @@ */ ?> -<?php show_box_top(_('Importing a Playlist from a File'), 'box box_import_playlist'); ?> +<?php show_box_top(T_('Importing a Playlist from a File'), 'box box_import_playlist'); ?> <form method="post" name="import_playlist" action="<?php echo Config::get('web_path'); ?>/playlist.php" enctype="multipart/form-data"> <table cellpadding="0" cellspacing="0"> <tr> <td> - <?php echo _('Filename'); ?>: + <?php echo T_('Filename'); ?>: </td> <td><input type="file" name="filename" value="<?php echo scrub_out($_REQUEST['filename']); ?>" size="45" /></td> </tr> <tr> <td> - <?php echo _('Playlist Type'); ?> + <?php echo T_('Playlist Type'); ?> </td> <td> <select name="playlist_type"> @@ -50,7 +50,7 @@ </table> <div class="formValidation"> <input type="hidden" name="action" value="import_playlist" /> - <input type="submit" value="<?php echo _('Import Playlist'); ?>" /> + <input type="submit" value="<?php echo T_('Import Playlist'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_index.inc.php b/templates/show_index.inc.php index 17927f7d..b6588d76 100644 --- a/templates/show_index.inc.php +++ b/templates/show_index.inc.php @@ -36,7 +36,7 @@ if (Art::is_enabled()) { echo Ajax::observe('window','load',Ajax::action('?page=index&action=random_albums','random_albums')); ?> <div id="random_selection"> - <?php show_box_top(_('Albums of the Moment')); echo _('Loading...'); show_box_bottom(); ?> + <?php show_box_top(T_('Albums of the Moment')); echo T_('Loading...'); show_box_bottom(); ?> </div> <?php } ?> <!-- Recently Played --> diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 598be729..195da699 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -30,57 +30,57 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?> <div class="content"> - <strong><?php echo _('Step 1 - Create the Ampache database'); ?></strong><br /> + <strong><?php echo T_('Step 1 - Create the Ampache database'); ?></strong><br /> <dl> - <dd><?php echo _('This step creates and inserts the Ampache database, so please provide a MySQL account with database creation rights. This step may take some time on slower computers.'); ?></dd> + <dd><?php echo T_('This step creates and inserts the Ampache database, so please provide a MySQL account with database creation rights. This step may take some time on slower computers.'); ?></dd> </dl> - <?php echo _('Step 2 - Create ampache.cfg.php'); ?><br /> - <?php echo _('Step 3 - Set up the initial account'); ?><br /> + <?php echo T_('Step 2 - Create ampache.cfg.php'); ?><br /> + <?php echo T_('Step 3 - Set up the initial account'); ?><br /> <br /> <?php Error::display('general'); ?> <br /> - <span class="header2"><?php echo _('Insert Ampache Database'); ?></span> + <span class="header2"><?php echo T_('Insert Ampache Database'); ?></span> <form method="post" action="<?php echo WEB_PATH . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> - <td class="align"><?php echo _("Desired Database Name"); ?></td> + <td class="align"><?php echo T_("Desired Database Name"); ?></td> <td><input type="text" name="local_db" value="ampache" /></td> </tr> <tr> - <td class="align"><?php echo _("MySQL Hostname"); ?></td> + <td class="align"><?php echo T_("MySQL Hostname"); ?></td> <td><input type="text" name="local_host" value="localhost" /></td> </tr> <tr> - <td class="align"><?php echo _("MySQL Administrative Username"); ?></td> + <td class="align"><?php echo T_("MySQL Administrative Username"); ?></td> <td><input type="text" name="local_username" value="root" /></td> </tr> <tr> - <td class="align"><?php echo _("MySQL Administrative Password"); ?></td> + <td class="align"><?php echo T_("MySQL Administrative Password"); ?></td> <td><input type="password" name="local_pass" /></td> </tr> <tr> - <td class="align"><?php echo _("Create Database User for New Database"); ?>? </td> + <td class="align"><?php echo T_("Create Database User for New Database"); ?>? </td> <td><input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');" /></td> </tr> <tr> - <td class="align"><?php echo _("Ampache Database Username"); ?></td> + <td class="align"><?php echo T_("Ampache Database Username"); ?></td> <td><input type="text" id="db_username" name="db_username" value="ampache" /></td> </tr> <tr> - <td class="align"><?php echo _("Ampache Database User Password"); ?></td> + <td class="align"><?php echo T_("Ampache Database User Password"); ?></td> <td><input type="password" id="db_password" name="db_password" value="" /></td> </tr> <tr> - <td class="align"><?php echo _('Overwrite Existing'); ?></td> + <td class="align"><?php echo T_('Overwrite Existing'); ?></td> <td><input type="checkbox" name="overwrite_db" value="1" /></td> </tr> <tr> - <td class="align"><?php echo _('Use Existing Database'); ?></td> + <td class="align"><?php echo T_('Use Existing Database'); ?></td> <td><input type="checkbox" name="existing_db" value="1" /></td> </tr> <tr> <td> </td> - <td><input type="submit" value="<?php echo _("Insert Database"); ?>" /></td> + <td><input type="submit" value="<?php echo T_("Insert Database"); ?>" /></td> </tr> </table> </form> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index fb0b4f7c..a2f16de6 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -30,32 +30,32 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?> <div class="content"> - <?php echo _('Step 1 - Create the Ampache database'); ?><br /> - <?php echo _('Step 2 - Create ampache.cfg.php'); ?><br /> - <strong><?php echo _('Step 3 - Set up the initial account'); ?></strong><br /> + <?php echo T_('Step 1 - Create the Ampache database'); ?><br /> + <?php echo T_('Step 2 - Create ampache.cfg.php'); ?><br /> + <strong><?php echo T_('Step 3 - Set up the initial account'); ?></strong><br /> <dl> - <dd><?php echo _('This step creates your initial Ampache admin account. Once your admin account has been created you will be redirected to the login page.'); ?></dd> + <dd><?php echo T_('This step creates your initial Ampache admin account. Once your admin account has been created you will be redirected to the login page.'); ?></dd> </dl> <?php Error::display('general'); ?> <br /> - <span class="header2"><?php echo _('Create Admin Account'); ?></span> + <span class="header2"><?php echo T_('Create Admin Account'); ?></span> <form method="post" action="<?php echo WEB_PATH . "?action=create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> - <td class="align"><?php echo _('Username'); ?></td> + <td class="align"><?php echo T_('Username'); ?></td> <td><input type="text" name="local_username" value="admin" /></td> </tr> <tr> - <td class="align"><?php echo _('Password'); ?></td> + <td class="align"><?php echo T_('Password'); ?></td> <td><input type="password" name="local_pass" value="" /></td> </tr> <tr> - <td class="align"><?php echo _('Confirm Password'); ?></td> + <td class="align"><?php echo T_('Confirm Password'); ?></td> <td><input type="password" name="local_pass2" value="" /></td> </tr> <tr> <td> </td> - <td><input type="submit" value="<?php echo _('Create Account'); ?>" /></td> + <td><input type="submit" value="<?php echo T_('Create Account'); ?>" /></td> </tr> </table> </form> diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php index 95334f57..f405aa55 100644 --- a/templates/show_install_check.inc.php +++ b/templates/show_install_check.inc.php @@ -28,15 +28,15 @@ ?> <?php if (!defined('INSTALL')) { exit; } ?> -<h4><?php echo _('Required'); ?></h4> +<h4><?php echo T_('Required'); ?></h4> <table border="0" cellspacing="0" cellpadding="3"> <tr> -<td><?php echo sprintf(_("%s is readable"),"ampache.cfg.php.dist"); ?></td> +<td><?php echo sprintf(T_("%s is readable"),"ampache.cfg.php.dist"); ?></td> <td> <?php if (!is_readable($prefix . '/config/ampache.cfg.php.dist')) { echo debug_result('',false); - Error::add('install',sprintf(_("%s is readable"),"ampache.cfg.php.dist")); + Error::add('install',sprintf(T_("%s is readable"),"ampache.cfg.php.dist")); } else { echo debug_result('',true); @@ -45,12 +45,12 @@ </td> </tr> <tr> -<td><?php echo sprintf(_('%s is readable'), 'ampache.sql'); ?></td> +<td><?php echo sprintf(T_('%s is readable'), 'ampache.sql'); ?></td> <td> <?php if (!is_readable($prefix . '/sql/ampache.sql')) { echo debug_result('', false); - Error::add('install', sprintf(_('%s is readable'), 'ampache.sql')); + Error::add('install', sprintf(T_('%s is readable'), 'ampache.sql')); } else { echo debug_result('', true); @@ -59,7 +59,7 @@ </td> </tr> <tr> -<td><?php echo _('PHP Version'); ?>:</td> +<td><?php echo T_('PHP Version'); ?>:</td> <td> <?php if(!check_php_ver()) { @@ -70,9 +70,9 @@ else { $version_string = phpversion() . " "; } - $string = $version_string . _('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)); + $string = $version_string . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)); echo debug_result($string,false); - Error::add('install',_('PHP Version')); + Error::add('install', T_('PHP Version')); } else { echo debug_result(phpversion(),true); @@ -80,12 +80,12 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP MySQL Support'); ?>:</td> +<td><?php echo T_('PHP MySQL Support'); ?>:</td> <td> <?php if (!check_php_mysql()) { echo debug_result('',false); - Error::add('install', _('PHP MySQL Support')); + Error::add('install', T_('PHP MySQL Support')); } else { echo debug_result(mysql_get_client_info(),true); @@ -93,12 +93,12 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP Session Support'); ?>:</td> +<td><?php echo T_('PHP Session Support'); ?>:</td> <td> <?php if (!check_php_session()) { echo debug_result('',false); - Error::add('install',_('PHP Session Support')); + Error::add('install', T_('PHP Session Support')); } else { echo debug_result('',true); @@ -106,12 +106,12 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP iconv Support'); ?>:</td> +<td><?php echo T_('PHP iconv Support'); ?>:</td> <td> <?php if (!check_php_iconv()) { echo debug_result('',false); - Error::add('install', _('PHP iconv Support')); + Error::add('install', T_('PHP iconv Support')); } else { echo debug_result('',true); @@ -119,12 +119,12 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP PCRE Support'); ?>:</td> +<td><?php echo T_('PHP PCRE Support'); ?>:</td> <td> <?php if (!check_php_pcre()) { echo debug_result('',false); - Error::add('install',_('PHP PCRE Support')); + Error::add('install', T_('PHP PCRE Support')); } else { echo debug_result('',true); @@ -132,13 +132,13 @@ ?> </td> </tr><tr> -<th colspan="2"><h4><?php echo _('Optional'); ?></h4></th> +<th colspan="2"><h4><?php echo T_('Optional'); ?></h4></th> </tr><tr> -<td><?php echo _('PHP gettext Support'); ?>:</td> +<td><?php echo T_('PHP gettext Support'); ?>:</td> <td> <?php if (!check_gettext()) { - echo debug_result(_('gettext emulation will be used'), false); + echo debug_result(T_('gettext emulation will be used'), false); } else { echo debug_result('',true); @@ -146,11 +146,11 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP mbstring Support'); ?>:</td> +<td><?php echo T_('PHP mbstring Support'); ?>:</td> <td> <?php if (!check_mbstring()) { - echo debug_result(_('Multibyte character encodings may not be autodetected correctly'), false); + echo debug_result(T_('Multibyte character encodings may not be autodetected correctly'), false); } else { echo debug_result('',true); @@ -158,23 +158,23 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP Safe Mode'); ?>:</td> +<td><?php echo T_('PHP Safe Mode'); ?>:</td> <td> <?php if (!check_safemode()) { - echo debug_result(_('Safe mode enabled'), false); + echo debug_result(T_('Safe mode enabled'), false); } else { - echo debug_result(_('Safe mode not enabled'), true); + echo debug_result(T_('Safe mode not enabled'), true); } ?> </td> </tr><tr> -<td><?php echo _('PHP Memory Limit'); ?>:</td> +<td><?php echo T_('PHP Memory Limit'); ?>:</td> <td> <?php if (!check_php_memory()) { - echo debug_result(_('Memory limit less than recommended size') . ' ' . ini_get('memory_limit'), false); + echo debug_result(T_('Memory limit less than recommended size') . ' ' . ini_get('memory_limit'), false); } else { echo debug_result(ini_get('memory_limit'),true); @@ -183,19 +183,19 @@ ?> </td> </tr><tr> -<td><?php echo _('PHP Execution Time Limit'); ?>:</td> +<td><?php echo T_('PHP Execution Time Limit'); ?>:</td> <td> <?php if (!check_php_timelimit()) { - echo debug_result(sprintf(_('Execution time limit is %s seconds, which is less than recommended'), ini_get('max_execution_time')), false); + echo debug_result(sprintf(T_('Execution time limit is %s seconds, which is less than recommended'), ini_get('max_execution_time')), false); } else { - echo debug_result(ini_get('max_execution_time') . ' ' . _('seconds'),true); + echo debug_result(ini_get('max_execution_time') . ' ' . T_('seconds'),true); } ?> </td> </tr><tr> -<td><?php echo _('ampache.cfg.php is writable'); ?></td> +<td><?php echo T_('ampache.cfg.php is writable'); ?></td> <td> <?php if (!check_config_writable()) { diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 4ffb3b7d..0100d678 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -30,44 +30,44 @@ $prefix = realpath(dirname(__FILE__). "/../"); require $prefix . '/templates/install_header.inc.php'; ?> <div class="content"> - <?php echo _('Step 1 - Create the Ampache database'); ?><br /> - <strong><?php echo _('Step 2 - Create ampache.cfg.php'); ?></strong><br /> + <?php echo T_('Step 1 - Create the Ampache database'); ?><br /> + <strong><?php echo T_('Step 2 - Create ampache.cfg.php'); ?></strong><br /> <dl> - <dd><?php printf(_('This step takes the basic config values and generates the config file. If your config/ directory is writable, you can select "write" to have Ampache write the config file directly to the correct location. If you select "download" it will prompt you to download the config file, and you can then manually place the config file in %s'), $prefix . '/config'); ?></dd> + <dd><?php printf(T_('This step takes the basic config values and generates the config file. If your config/ directory is writable, you can select "write" to have Ampache write the config file directly to the correct location. If you select "download" it will prompt you to download the config file, and you can then manually place the config file in %s'), $prefix . '/config'); ?></dd> </dl> - <?php echo _('Step 3 - Set up the initial account'); ?><br /> + <?php echo T_('Step 3 - Set up the initial account'); ?><br /> <?php Error::display('general'); ?> <br /> -<span class="header2"><?php echo _('Generate Config File'); ?></span> +<span class="header2"><?php echo T_('Generate Config File'); ?></span> <?php Error::display('config'); ?> <form method="post" action="<?php echo WEB_PATH . "?action=create_config"; ?>" enctype="multipart/form-data" > <table> <tr> - <td class="align"><?php echo _('Web Path'); ?></td> + <td class="align"><?php echo T_('Web Path'); ?></td> <td class="align"><input type="text" name="web_path" value="<?php echo $web_path; ?>" /></td> </tr> <tr> - <td class="align"><?php echo _('Database Name'); ?></td> + <td class="align"><?php echo T_('Database Name'); ?></td> <td class="align"><input type="text" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td> </tr> <tr> - <td class="align"><?php echo _('MySQL Hostname'); ?></td> + <td class="align"><?php echo T_('MySQL Hostname'); ?></td> <td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td> </tr> <tr> - <td class="align"><?php echo _('MySQL Username'); ?></td> + <td class="align"><?php echo T_('MySQL Username'); ?></td> <td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td> </tr> <tr> - <td class="align"><?php echo _('MySQL Password'); ?></td> + <td class="align"><?php echo T_('MySQL Password'); ?></td> <td class="align"><input type="password" name="local_pass" value="" /></td> </tr> <tr> <td> </td> <td> - <input type="submit" name="download" value="<?php echo _('Download'); ?>" /> - <input type="submit" name="write" value="<?php echo _('Write'); ?>" <?php if (!check_config_writable()) { echo "disabled "; } ?>/> + <input type="submit" name="download" value="<?php echo T_('Download'); ?>" /> + <input type="submit" name="write" value="<?php echo T_('Write'); ?>" <?php if (!check_config_writable()) { echo "disabled "; } ?>/> <input type="hidden" name="htmllang" value="<?php echo $htmllang; ?>" /> <input type="hidden" name="charset" value="<?php echo $charset; ?>" /> </td> @@ -77,7 +77,7 @@ require $prefix . '/templates/install_header.inc.php'; <br /> <table> <tr> - <td class="align"><?php echo _('ampache.cfg.php exists?'); ?></td> + <td class="align"><?php echo T_('ampache.cfg.php exists?'); ?></td> <td>[ <?php if (!is_readable($configfile)) { @@ -92,7 +92,7 @@ require $prefix . '/templates/install_header.inc.php'; </tr> <tr> <td class="align"> - <?php echo _('ampache.cfg.php configured?'); ?> + <?php echo T_('ampache.cfg.php configured?'); ?> </td> <td>[ <?php @@ -111,13 +111,13 @@ require $prefix . '/templates/install_header.inc.php'; <td> </td> <td> <?php $check_url = WEB_PATH . "?action=show_create_config&htmllang=$htmllang&charset=$charset&local_db=" . $_REQUEST['local_db'] . "&local_host=" . $_REQUEST['local_host']; ?> - <a href="<?php echo $check_url; ?>">[<?php echo _('Recheck Config'); ?>]</a> + <a href="<?php echo $check_url; ?>">[<?php echo T_('Recheck Config'); ?>]</a> </td> </tr> </table> <br /> <form method="post" action="<?php echo WEB_PATH . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data"> - <input type="submit" value="<?php echo _('Continue to Step 3'); ?>" /> + <input type="submit" value="<?php echo T_('Continue to Step 3'); ?>" /> </form> </div> <div id="bottom"> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 81395ebb..506bdee8 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -32,12 +32,12 @@ require $prefix . '/templates/install_header.inc.php'; <?php require_once 'templates/show_install_check.inc.php'; ?> <?php if (Error::occurred()) { ?> <div class="content"> - <span class="fatalerror"><?php echo _('Minimum requirements not met. Unable to install Ampache.'); ?></span> + <span class="fatalerror"><?php echo T_('Minimum requirements not met. Unable to install Ampache.'); ?></span> </div> <?php } ?> <div class="content"> - <strong><?php echo _('Choose Installation Language'); ?></strong> + <strong><?php echo T_('Choose Installation Language'); ?></strong> <p> <?php Error::display('general'); ?> </p> @@ -58,7 +58,7 @@ foreach ($languages as $lang=>$name) { echo "</select>\n"; ?> -<input type="submit" value="<?php echo _('Start configuration'); ?>" /> +<input type="submit" value="<?php echo T_('Start configuration'); ?>" /> </form> </div> diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index 5f71aad7..4ac9c1e3 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -27,16 +27,16 @@ */ ?> -<?php /* HINT: Username */ show_box_top(sprintf(_('%s IP History'), $working_user->fullname)); ?> +<?php /* HINT: Username */ show_box_top(sprintf(T_('%s IP History'), $working_user->fullname)); ?> <div id="information_actions"> <ul> <li> <?php if (isset($_REQUEST['all'])){ ?> <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo get_user_icon('disable'); ?></a> - <?php echo _('Show Unique'); ?> + <?php echo T_('Show Unique'); ?> <?php }else{ ?> <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo get_user_icon('add'); ?></a> - <?php echo _('Show All'); ?> + <?php echo T_('Show All'); ?> <?php }?> </li> </ul> @@ -49,8 +49,8 @@ <col id="col_ipaddress" /> </colgroup> <tr class="th-top"> - <th class="cel_date"><?php echo _('Date'); ?></th> - <th class="cel_ipaddress"><?php echo _('IP Address'); ?></th> + <th class="cel_date"><?php echo T_('Date'); ?></th> + <th class="cel_ipaddress"><?php echo T_('IP Address'); ?></th> </tr> <?php foreach ($history as $data) { ?> <tr class="<?php echo flip_class(); ?>"> @@ -63,8 +63,8 @@ </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_date"><?php echo _('Date'); ?></th> - <th class="cel_ipaddress"><?php echo _('IP Address'); ?></th> + <th class="cel_date"><?php echo T_('Date'); ?></th> + <th class="cel_ipaddress"><?php echo T_('IP Address'); ?></th> </tr> </table> diff --git a/templates/show_live_stream.inc.php b/templates/show_live_stream.inc.php index b119108c..0717d832 100644 --- a/templates/show_live_stream.inc.php +++ b/templates/show_live_stream.inc.php @@ -27,11 +27,11 @@ */ ?> -<?php show_box_top(_('Manage Radio Stations'),'info-box'); ?> +<?php show_box_top(T_('Manage Radio Stations'),'info-box'); ?> <div id="information_actions"> <ul> <li> - <a href="<?php echo Config::get('web_path'); ?>/radio.php?action=show_create"><?php echo get_user_icon('add',_('Add')); ?></a> <?php echo _('Add Radio Station'); ?> + <a href="<?php echo Config::get('web_path'); ?>/radio.php?action=show_create"><?php echo get_user_icon('add', T_('Add')); ?></a> <?php echo T_('Add Radio Station'); ?> </li> </ul> </div> diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php index 8b039824..75917b48 100644 --- a/templates/show_live_stream_row.inc.php +++ b/templates/show_live_stream_row.inc.php @@ -28,7 +28,7 @@ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id,'add',_('Add'),'add_radio_' . $radio->id); ?> + <?php echo Ajax::button('?action=basket&type=live_stream&id=' . $radio->id,'add', T_('Add'),'add_radio_' . $radio->id); ?> </td> <td class="cel_streamname"><?php echo $radio->f_name_link; ?></td> <td class="cel_callsign"><?php echo $radio->f_callsign; ?></td> @@ -36,9 +36,9 @@ <td class="cel_tag"><?php echo $radio->f_tag; ?></td> <td class="cel_action"> <?php if (Access::check('interface','50')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=live_stream_row&id=' . $radio->id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=live_stream_row&id=' . $radio->id,'edit', T_('Edit'),'edit_radio_' . $radio->id); ?> <?php } ?> <?php if (Access::check('interface','75')) { ?> - <?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $radio->id,'delete',_('Delete'),'delete_radio_' . $radio->id); ?> + <?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $radio->id,'delete', T_('Delete'),'delete_radio_' . $radio->id); ?> <?php } ?> </td> diff --git a/templates/show_live_streams.inc.php b/templates/show_live_streams.inc.php index 02983486..87a73b35 100644 --- a/templates/show_live_streams.inc.php +++ b/templates/show_live_streams.inc.php @@ -40,12 +40,12 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name'); ?></th> - <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign'); ?></th> - <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency'); ?></th> - <th class="cel_genre"><?php echo _('Tag'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name', T_('Name'),'live_stream_sort_name'); ?></th> + <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign', T_('Callsign'),'live_stream_call_sign'); ?></th> + <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency', T_('Frequency'),'live_stream_frequency'); ?></th> + <th class="cel_genre"><?php echo T_('Tag'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?> </th> </tr> <?php foreach ($object_ids as $radio_id) { @@ -58,16 +58,16 @@ foreach ($object_ids as $radio_id) { <?php } //end foreach ($artists as $artist) ?> <?php if (!count($object_ids)) { ?> <tr> - <td colspan="6"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Name'),'live_stream_sort_name_bottom'); ?></th> - <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign',_('Callsign'),'live_stream_call_sign_bottom'); ?></th> - <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency',_('Frequency'),'live_stream_frequency_bottom'); ?></th> - <th class="cel_genre"><?php echo _('Tag'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_streamname"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name', T_('Name'),'live_stream_sort_name_bottom'); ?></th> + <th class="cel_callsign"><?php echo Ajax::text('?page=browse&action=set_sort&sort=call_sign', T_('Callsign'),'live_stream_call_sign_bottom'); ?></th> + <th class="cel_frequency"><?php echo Ajax::text('?page=browse&action=set_sort&sort=frequency', T_('Frequency'),'live_stream_frequency_bottom'); ?></th> + <th class="cel_genre"><?php echo T_('Tag'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?> </th> </tr> </table> <?php require Config::Get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php index 0863ddb5..5ae40d59 100644 --- a/templates/show_localplay_add_instance.inc.php +++ b/templates/show_localplay_add_instance.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Add Localplay Instance'), 'box box_localplay_add_instance'); ?> +<?php show_box_top(T_('Add Localplay Instance'), 'box box_localplay_add_instance'); ?> <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=add_instance"> <table cellpadding="3" cellspacing="0" class="tabledata"> <?php foreach ($fields as $key=>$field) { ?> @@ -38,7 +38,7 @@ <?php } ?> </table> <div class="formValidation"> - <input type="submit" value="<?php echo _('Add Instance'); ?>" /> + <input type="submit" value="<?php echo T_('Add Instance'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php index 2a4a7aa4..7eaaf4cb 100644 --- a/templates/show_localplay_control.inc.php +++ b/templates/show_localplay_control.inc.php @@ -28,9 +28,9 @@ ?> <div id="localplay-control"> -<?php echo Ajax::button('?page=localplay&action=command&command=prev','prev',_('Previous'),'localplay_control_previous'); ?> -<?php echo Ajax::button('?page=localplay&action=command&command=stop','stop',_('Stop'),'localplay_control_stop'); ?> -<?php echo Ajax::button('?page=localplay&action=command&command=pause','pause',_('Pause'),'localplay_control_pause'); ?> -<?php echo Ajax::button('?page=localplay&action=command&command=play','play',_('Play'),'localplay_control_play'); ?> -<?php echo Ajax::button('?page=localplay&action=command&command=next','next',_('Next'),'localplay_control_next'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=prev','prev', T_('Previous'),'localplay_control_previous'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=stop','stop', T_('Stop'),'localplay_control_stop'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=pause','pause', T_('Pause'),'localplay_control_pause'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=play','play', T_('Play'),'localplay_control_play'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=next','next', T_('Next'),'localplay_control_next'); ?> </div> diff --git a/templates/show_localplay_controllers.inc.php b/templates/show_localplay_controllers.inc.php index 8b3cda94..c6494266 100644 --- a/templates/show_localplay_controllers.inc.php +++ b/templates/show_localplay_controllers.inc.php @@ -37,10 +37,10 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_description"><?php echo _('Description'); ?></th> - <th class="cel_version"><?php echo _('Version'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($controllers as $controller) { @@ -49,11 +49,11 @@ foreach ($controllers as $controller) { $localplay->format(); if (Localplay::is_enabled($controller)) { $action = 'confirm_uninstall_localplay'; - $action_txt = _('Disable'); + $action_txt = T_('Disable'); } else { $action = 'install_localplay'; - $action_txt = _('Activate'); + $action_txt = T_('Activate'); } ?> <tr class="<?php echo flip_class(); ?>"> @@ -64,14 +64,14 @@ foreach ($controllers as $controller) { </tr> <?php } if (!count($controllers)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="4"><span class="error"><?php echo _('No Records Found'); ?></span></td> + <td colspan="4"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_description"><?php echo _('Description'); ?></th> - <th class="cel_version"><?php echo _('Version'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <br /> diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php index 42a5dcf8..ca9ca250 100644 --- a/templates/show_localplay_edit_instance.inc.php +++ b/templates/show_localplay_edit_instance.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Edit Localplay Instance'), 'box box_localplay_edit_instance'); ?> +<?php show_box_top(T_('Edit Localplay Instance'), 'box box_localplay_edit_instance'); ?> <form method="post" action="<?php echo Config::get('web_path'); ?>/localplay.php?action=update_instance&instance=<?php echo intval($_REQUEST['instance']); ?>"> <table cellpadding="3" cellspacing="0" class="tabledata"> <?php foreach ($fields as $key=>$field) { ?> @@ -38,7 +38,7 @@ <?php } ?> </table> <div class="formValidation"> - <input type="submit" value="<?php echo _('Update Instance'); ?>" /> + <input type="submit" value="<?php echo T_('Update Instance'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_localplay_instances.inc.php b/templates/show_localplay_instances.inc.php index c88934cc..5d61cd45 100644 --- a/templates/show_localplay_instances.inc.php +++ b/templates/show_localplay_instances.inc.php @@ -27,13 +27,13 @@ */ ?> -<?php show_box_top(_('Show Localplay Instances'), 'box box_localplay_instances'); ?> +<?php show_box_top(T_('Show Localplay Instances'), 'box box_localplay_instances'); ?> <table cellpadding="3" cellspacing="0" class="tabledata"> <tr> <?php foreach ($fields as $key=>$field) { ?> <th><?php echo $field['description']; ?></th> <?php } ?> - <th><?php echo _('Action'); ?></th> + <th><?php echo T_('Action'); ?></th> </tr> <?php foreach ($instances as $uid=>$name) { $instance = $localplay->get_instance($uid); @@ -43,8 +43,8 @@ <td><?php echo $instance[$key]; ?></td> <?php } ?> <td> - <a href="<?php echo Config::get('web_path'); ?>/localplay.php?action=edit_instance&instance=<?php echo $uid; ?>"><?php echo get_user_icon('edit',_('Edit Instance')); ?></a> - <?php echo Ajax::button('?page=localplay&action=delete_instance&instance=' . $uid,'delete',_('Delete'),'delete_instance_' . $uid); ?> + <a href="<?php echo Config::get('web_path'); ?>/localplay.php?action=edit_instance&instance=<?php echo $uid; ?>"><?php echo get_user_icon('edit', T_('Edit Instance')); ?></a> + <?php echo Ajax::button('?page=localplay&action=delete_instance&instance=' . $uid,'delete', T_('Delete'),'delete_instance_' . $uid); ?> </td> </tr> <?php } ?> diff --git a/templates/show_localplay_playlist.inc.php b/templates/show_localplay_playlist.inc.php index ea42800c..7572cf95 100644 --- a/templates/show_localplay_playlist.inc.php +++ b/templates/show_localplay_playlist.inc.php @@ -38,9 +38,9 @@ $status = $localplay->status(); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_track"><?php echo _('Track'); ?></th> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $object) { @@ -55,18 +55,18 @@ foreach ($object_ids as $object) { <?php echo $localplay->format_name($object['name'],$object['id']); ?> </td> <td class="cel_action"> - <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete',_('Delete'),'localplay_delete_' . intval($object['id'])); ?> + <?php echo Ajax::button('?page=localplay&action=delete_track&id=' . intval($object['id']),'delete', T_('Delete'),'localplay_delete_' . intval($object['id'])); ?> </td> </tr> <?php } if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="3"><span class="error"><?php echo _('No Records Found'); ?></span></td> + <td colspan="3"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_track"><?php echo _('Track'); ?></th> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php index 028e442d..b97b6b79 100644 --- a/templates/show_localplay_status.inc.php +++ b/templates/show_localplay_status.inc.php @@ -30,28 +30,28 @@ $status = $localplay->status(); $now_playing = $status['track_title'] ? $status['track_title'] . ' - ' . $status['track_album'] . ' - ' . $status['track_artist'] : ''; ?> <?php Ajax::start_container('localplay_status'); ?> -<?php show_box_top(_('Localplay Control') . ' - '. strtoupper($localplay->type), 'box box_localplay_status'); ?> -<?php echo _('Now Playing'); ?>:<i><?php echo $now_playing; ?></i> +<?php show_box_top(T_('Localplay Control') . ' - '. strtoupper($localplay->type), 'box box_localplay_status'); ?> +<?php echo T_('Now Playing'); ?>:<i><?php echo $now_playing; ?></i> <div id="information_actions"> <ul> <li> -<?php echo Ajax::button('?page=localplay&action=command&command=volume_mute','volumemute',_('Mute'),'localplay_mute'); ?> -<?php echo Ajax::button('?page=localplay&action=command&command=volume_down','volumedn',_('Decrease Volume'),'localplay_volume_dn'); ?> -<?php echo Ajax::button('?page=localplay&action=command&command=volume_up','volumeup',_('Increase Volume'),'localplay_volume_up'); ?> -<?php echo _('Volume'); ?>:<?php echo $status['volume']; ?>% +<?php echo Ajax::button('?page=localplay&action=command&command=volume_mute','volumemute', T_('Mute'),'localplay_mute'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=volume_down','volumedn', T_('Decrease Volume'),'localplay_volume_dn'); ?> +<?php echo Ajax::button('?page=localplay&action=command&command=volume_up','volumeup', T_('Increase Volume'),'localplay_volume_up'); ?> +<?php echo T_('Volume'); ?>:<?php echo $status['volume']; ?>% </li> <li> <?php echo print_bool($status['repeat']); ?> | <?php echo Ajax::text('?page=localplay&action=repeat&value=' . invert_bool($status['repeat']), print_bool(invert_bool($status['repeat'])), 'localplay_repeat'); ?> - <?php echo _('Repeat'); ?> + <?php echo T_('Repeat'); ?> </li> <li> <?php echo print_bool($status['random']); ?> | <?php echo Ajax::text('?page=localplay&action=random&value=' . invert_bool($status['random']), print_bool(invert_bool($status['random'])), 'localplay_random'); ?> - <?php echo _('Random'); ?> + <?php echo T_('Random'); ?> </li> <li> - <?php echo Ajax::button('?page=localplay&action=command&command=delete_all','delete',_('Clear Playlist'),'localplay_clear_all'); ?><?php echo _('Clear Playlist'); ?> + <?php echo Ajax::button('?page=localplay&action=command&command=delete_all','delete', T_('Clear Playlist'),'localplay_clear_all'); ?><?php echo T_('Clear Playlist'); ?> </li> </ul> </div> diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index d4d65b2d..58860351 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -63,28 +63,28 @@ function focus(){ document.login.username.focus(); } <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/login.php"> <div class="loginfield" id="usernamefield"> - <label for="username"><?php echo _('Username'); ?>:</label> + <label for="username"><?php echo T_('Username'); ?>:</label> <input class="text_input" type="text" id="username" name="username" value="<?php echo scrub_out($_REQUEST['username']); ?>" /> </div> <div class="loginfield" id="passwordfield"> - <label for="password"><?php echo _('Password'); ?>:</label> + <label for="password"><?php echo T_('Password'); ?>:</label> <input class="text_input" type="password" id="password" name="password" value="" /> </div> <div class="loginfield" id="remembermefield"><label for="rememberme"> - <?php echo _('Remember Me'); ?> </label><input type="checkbox" id="rememberme" name="rememberme" <?php echo $remember_disabled; ?> /> + <?php echo T_('Remember Me'); ?> </label><input type="checkbox" id="rememberme" name="rememberme" <?php echo $remember_disabled; ?> /> </div> <?php echo Config::get('login_message'); ?> <?php Error::display('general'); ?> <div class="formValidation"> - <a class="button" id="lostpasswordbutton" href="<?php echo Config::get('web_path'); ?>/lostpassword.php"><?php echo _('Lost password'); ?></a> - <input class="button" id="loginbutton" type="submit" value="<?php echo _('Login'); ?>" /> + <a class="button" id="lostpasswordbutton" href="<?php echo Config::get('web_path'); ?>/lostpassword.php"><?php echo T_('Lost password'); ?></a> + <input class="button" id="loginbutton" type="submit" value="<?php echo T_('Login'); ?>" /> <input type="hidden" name="referrer" value="<?php echo scrub_out($_SERVER['HTTP_REFERRER']); ?>" /> <input type="hidden" name="action" value="login" /> <?php if (Config::get('allow_public_registration')) { ?> - <a class="button" id="registerbutton" href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo _('Register'); ?></a> + <a class="button" id="registerbutton" href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo T_('Register'); ?></a> <?php } // end if (conf('allow_public_registration')) ?> </div> @@ -96,7 +96,7 @@ if (@is_readable(Config::get('prefix') . '/config/motd.php')) { ?> <div id="motd"> <?php - show_box_top(_('Message of the Day')); + show_box_top(T_('Message of the Day')); include Config::get('prefix') . '/config/motd.php'; show_box_bottom(); ?> @@ -105,7 +105,7 @@ if (@is_readable(Config::get('prefix') . '/config/motd.php')) { <div id="footer"> <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> Copyright (c) 2001 - 2010 Ampache.org - <?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> + <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo T_('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> </html> diff --git a/templates/show_lostpassword_form.inc.php b/templates/show_lostpassword_form.inc.php index c8a782dc..07a8cce7 100644 --- a/templates/show_lostpassword_form.inc.php +++ b/templates/show_lostpassword_form.inc.php @@ -70,16 +70,16 @@ function focus(){ document.login.username.focus(); } <h2><?php echo scrub_out(Config::get('site_title')); ?></h2> <form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/lostpassword.php"> - <div class="loginfield" id="email"><label for="email"><?php echo _('Email'); ?>:</label> + <div class="loginfield" id="email"><label for="email"><?php echo T_('Email'); ?>:</label> <input type="hidden" id="action" name="action" value="send" /> <input class="text_input" type="text" id="email" name="email" /></div> <input class="button" id="lostpasswordbutton" type="submit" - value="<?php echo _('Submit'); ?>" /></form> + value="<?php echo T_('Submit'); ?>" /></form> </div> </div> <div id="footer"><a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> -Copyright (c) 2001 - 2009 Ampache.org <?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> -<?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> +Copyright (c) 2001 - 2009 Ampache.org <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> +<?php echo T_('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> </html> diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php index aa5eb34c..89b4978d 100644 --- a/templates/show_lyrics.inc.php +++ b/templates/show_lyrics.inc.php @@ -37,14 +37,14 @@ * @todo get lyrics from id3tag, if possible. */ /* HINT: Song Title */ -show_box_top(sprintf(_('%s Lyrics'), $song->title), 'box box_lyrics'); +show_box_top(sprintf(T_('%s Lyrics'), $song->title), 'box box_lyrics'); ?> <table class="tabledata" cellspacing="0" cellpadding="0"> <tr> <td> <?php if($return == "Sorry Lyrics, Not found") { - echo _("Sorry Lyrics Not Found."); + echo T_("Sorry Lyrics Not Found."); } else { echo $link; diff --git a/templates/show_lyrics_song.inc.php b/templates/show_lyrics_song.inc.php index b9af036f..11c0b395 100644 --- a/templates/show_lyrics_song.inc.php +++ b/templates/show_lyrics_song.inc.php @@ -46,21 +46,21 @@ $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full)); <div class="np_group"> <div class="np_cell cel_song"> - <label><?php echo _('Song'); ?></label> + <label><?php echo T_('Song'); ?></label> <a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $song->id; ?>"> <?php echo $title; ?> </a> </div> <div class="np_cell cel_album"> - <label><?php echo _('Album'); ?></label> + <label><?php echo T_('Album'); ?></label> <a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $song->album; ?>"> <?php echo $album; ?> </a> </div> <div class="np_cell cel_artist"> - <label><?php echo _('Artist'); ?></label> + <label><?php echo T_('Artist'); ?></label> <a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $song->artist; ?>"> <?php echo $artist; ?> </a> diff --git a/templates/show_mail_users.inc.php b/templates/show_mail_users.inc.php index acc13fb5..66cd7ad2 100644 --- a/templates/show_mail_users.inc.php +++ b/templates/show_mail_users.inc.php @@ -28,17 +28,17 @@ ?> -<?php show_box_top(_('Send E-mail to Users'), 'box box_mail_users'); ?> +<?php show_box_top(T_('Send E-mail to Users'), 'box box_mail_users'); ?> <form name="mail" method="post" action="<?php echo Config::get('web_path'); ?>/admin/mail.php?action=send_mail" enctype="multipart/form-data"> <table> <tr> - <td><?php echo _('Mail to'); ?>:</td> + <td><?php echo T_('Mail to'); ?>:</td> <td> <select name="to"> - <option value="all" title="Mail Everyone"><?php echo _('All'); ?></option> - <option value="users" title="Mail Users"><?php echo _('User'); ?></option> - <option value="admins" title="Mail Admins"><?php echo _('Admin'); ?></option> - <option value="inactive" title="Mail Inactive Users"><?php echo _('Inactive Users'); ?> </option> + <option value="all" title="Mail Everyone"><?php echo T_('All'); ?></option> + <option value="users" title="Mail Users"><?php echo T_('User'); ?></option> + <option value="admins" title="Mail Admins"><?php echo T_('Admin'); ?></option> + <option value="inactive" title="Mail Inactive Users"><?php echo T_('Inactive Users'); ?> </option> </select> </td> </tr> @@ -47,43 +47,43 @@ <td colspan="2"> <table> <tr> - <td><?php echo _('Catalog Statistics'); ?>:</td> + <td><?php echo T_('Catalog Statistics'); ?>:</td> <td> <input type="checkbox" name="cat_stats" value="yes" /> </td> - <td><?php echo _('Most Popular Albums'); ?>:</td> + <td><?php echo T_('Most Popular Albums'); ?>:</td> <td> <input type="checkbox" name="pop_albums" value="yes" /> </td> </tr> <tr> - <td><?php echo _('Latest Artist Additions'); ?>:</td> + <td><?php echo T_('Latest Artist Additions'); ?>:</td> <td> <input type="checkbox" name="new_artists" value="yes" /> </td> - <td><?php echo _('Most Popular Artists'); ?>:</td> + <td><?php echo T_('Most Popular Artists'); ?>:</td> <td> <input type="checkbox" name="pop_artists" value="yes" /> </td> </tr> <tr> - <td><?php echo _('Latest Album Additions'); ?>:</td> + <td><?php echo T_('Latest Album Additions'); ?>:</td> <td> <input type="checkbox" name="new_albums" value="yes" /> </td> - <td><?php echo _('Most Popular Songs'); ?>:</td> + <td><?php echo T_('Most Popular Songs'); ?>:</td> <td> <input type="checkbox" name="pop_songs" value="yes" /> </td> </tr> <tr> - <td><?php echo _('Flagged Songs'); ?>:</td> + <td><?php echo T_('Flagged Songs'); ?>:</td> <td> <input type="checkbox" name="flagged" value="yes" /> </td> - <td><?php echo _('Disabled Songs'); ?>:</td> + <td><?php echo T_('Disabled Songs'); ?>:</td> <td> <input type="checkbox" name="disabled" value="yes" /> </td> @@ -91,7 +91,7 @@ </tr> <tr> - <td colspan = "2"><?php echo _('Most Popular Threshold in days'); ?>:</td> + <td colspan = "2"><?php echo T_('Most Popular Threshold in days'); ?>:</td> <td> <input type="text" name="threshold" size="3" value="<?php echo Config::get('popular_threshold'); ?>" /> </td> @@ -102,23 +102,23 @@ </tr> --> <tr> - <td><?php echo _('From'); ?>:</td> + <td><?php echo T_('From'); ?>:</td> <td> <select name="from"> - <option value="self" title="Self"><?php echo _('Yourself'); ?></option> - <option value="system" title="System"><?php echo _('Ampache'); ?></option> + <option value="self" title="Self"><?php echo T_('Yourself'); ?></option> + <option value="system" title="System"><?php echo T_('Ampache'); ?></option> </select> </td> </tr> <tr> - <td><?php echo _('Subject'); ?>:</td> + <td><?php echo T_('Subject'); ?>:</td> <td colspan="3"> <input name="subject" value="<?php echo scrub_out($_POST['subject']); ?>" size="50"></input> </td> </tr> <tr> - <td valign="top"><?php echo _('Message'); ?>:</td> + <td valign="top"><?php echo T_('Message'); ?>:</td> <td> <textarea class="input" name="message" rows="10" cols="70"></textarea> </td> @@ -126,7 +126,7 @@ </table> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Send Mail'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Send Mail'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_manage_catalogs.inc.php b/templates/show_manage_catalogs.inc.php index 4656b1d5..7f5d302a 100644 --- a/templates/show_manage_catalogs.inc.php +++ b/templates/show_manage_catalogs.inc.php @@ -27,27 +27,27 @@ */ ?> -<?php show_box_top(_('Show Catalogs'), 'box box_manage_catalogs') ?> +<?php show_box_top(T_('Show Catalogs'), 'box box_manage_catalogs') ?> <div id="information_actions"> <table> <tr> <td> <ul> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo _('Gather All Art'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo _('Add to All'); ?></a> </li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo _('Verify All'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo _('Clean All'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo _('Update All'); ?></a></li> - <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clear_stats"><?php echo _('Clear Stats'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=gather_album_art"><?php echo T_('Gather All Art'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=add_to_all_catalogs"><?php echo T_('Add to All'); ?></a> </li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_all_catalogs"><?php echo T_('Verify All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clean_all_catalogs"><?php echo T_('Clean All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=full_service"><?php echo T_('Update All'); ?></a></li> + <li><a href="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=clear_stats"><?php echo T_('Clear Stats'); ?></a></li> </ul> </td> <td> <form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php?action=update_from"> - <?php /* HINT: /data/myNewMusic */ ?><?php printf (_('Add From %s'), '<span class="information">/data/myNewMusic</span>'); ?><br /> + <?php /* HINT: /data/myNewMusic */ ?><?php printf (T_('Add From %s'), '<span class="information">/data/myNewMusic</span>'); ?><br /> <input type="text" name="add_path" value="/" /><br /> - <?php /* HINT: /data/myUpdatedMusic */ ?><?php printf (_('Update From %s'), '<span class="information">/data/myUpdatedMusic</span>'); ?><br /> + <?php /* HINT: /data/myUpdatedMusic */ ?><?php printf (T_('Update From %s'), '<span class="information">/data/myUpdatedMusic</span>'); ?><br /> <input type="text" name="update_path" value="/" /><br /> -<input type="submit" value="<?php echo _('Update'); ?>" /> +<input type="submit" value="<?php echo T_('Update'); ?>" /> </form> </td> </tr> diff --git a/templates/show_manage_democratic.inc.php b/templates/show_manage_democratic.inc.php index 33d5373a..9b274265 100644 --- a/templates/show_manage_democratic.inc.php +++ b/templates/show_manage_democratic.inc.php @@ -26,7 +26,7 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Manage Democratic Playlists')); ?> +show_box_top(T_('Manage Democratic Playlists')); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_number" /> @@ -38,13 +38,13 @@ show_box_top(_('Manage Democratic Playlists')); ?> <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_number"><?php echo _('Playlist'); ?></th> - <th class="cel_base_playlist"><?php echo _('Base Playlist'); ?></th> - <th class="cel_cooldown"><?php echo _('Cooldown'); ?></th> - <th class="cel_level"><?php echo _('Level'); ?></th> - <th class="cel_default"><?php echo _('Default'); ?></th> - <th class="cel_vote_count"><?php echo _('Songs'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_number"><?php echo T_('Playlist'); ?></th> + <th class="cel_base_playlist"><?php echo T_('Base Playlist'); ?></th> + <th class="cel_cooldown"><?php echo T_('Cooldown'); ?></th> + <th class="cel_level"><?php echo T_('Level'); ?></th> + <th class="cel_default"><?php echo T_('Default'); ?></th> + <th class="cel_vote_count"><?php echo T_('Songs'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($playlists as $democratic_id) { @@ -61,18 +61,18 @@ show_box_top(_('Manage Democratic Playlists')); ?> <td><?php echo $democratic->f_primary; ?></td> <td><?php echo $democratic->count_items(); ?></td> <td> - <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all',_('Play'),'play_democratic'); ?> - <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=delete&democratic_id=<?php echo scrub_out($democratic->id); ?>"><?php echo get_user_icon('delete', _('Delete')); ?></a> + <?php echo Ajax::button('?page=democratic&action=send_playlist&democratic_id=' . $democratic->id,'all', T_('Play'),'play_democratic'); ?> + <a href="<?php echo Config::get('web_path'); ?>/democratic.php?action=delete&democratic_id=<?php echo scrub_out($democratic->id); ?>"><?php echo get_user_icon('delete', T_('Delete')); ?></a> </td> </tr> <?php } if (!count($playlists)) { ?> <tr> - <td colspan="7"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> </table> <br /> <div> -<a class="button" href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo _('Create New Playlist'); ?></a> +<a class="button" href="<?php echo Config::get('web_path'); ?>/democratic.php?action=show_create"><?php echo T_('Create New Playlist'); ?></a> </div> <?php show_box_bottom(); ?> diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php index b6b1fe0b..374c5a24 100644 --- a/templates/show_manage_shoutbox.inc.php +++ b/templates/show_manage_shoutbox.inc.php @@ -38,12 +38,12 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_object"><?php echo _('Object'); ?></th> - <th class="cel_username"><?php echo _('User'); ?></th> - <th class="cel_flag"><?php echo _('Sticky'); ?></th> - <th class="cel_comment"><?php echo _('Comment'); ?></th> - <th class="cel_date"><?php echo _('Date Added'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_flag"><?php echo T_('Sticky'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_date"><?php echo T_('Date Added'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $shout_id) { @@ -58,15 +58,15 @@ foreach ($object_ids as $shout_id) { ?> <?php } if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="7" class="error"><?php echo _('No Records Found'); ?></td> + <td colspan="7" class="error"><?php echo T_('No Records Found'); ?></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_object"><?php echo _('Object'); ?></th> - <th class="cel_username"><?php echo _('User'); ?></th> - <th class="cel_sticky"><?php echo _('Sticky'); ?></th> - <th class="cel_comment"><?php echo _('Comment'); ?></th> - <th class="cel_date"><?php echo _('Date Added'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_object"><?php echo T_('Object'); ?></th> + <th class="cel_username"><?php echo T_('User'); ?></th> + <th class="cel_sticky"><?php echo T_('Sticky'); ?></th> + <th class="cel_comment"><?php echo T_('Comment'); ?></th> + <th class="cel_date"><?php echo T_('Date Added'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> diff --git a/templates/show_newest.inc.php b/templates/show_newest.inc.php index 6236058a..23740c88 100644 --- a/templates/show_newest.inc.php +++ b/templates/show_newest.inc.php @@ -27,6 +27,6 @@ */ ?> -<?php show_box_top(_('Information')); ?> +<?php show_box_top(T_('Information')); ?> <?php require_once Config::get('prefix') . '/templates/show_stats_newest.inc.php'; ?> <?php show_box_bottom(); ?> diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php index b2e8140f..09374b63 100644 --- a/templates/show_now_playing.inc.php +++ b/templates/show_now_playing.inc.php @@ -36,7 +36,7 @@ if (count($results)) { $link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('nowplaying') : ''; ?> -<?php show_box_top(_('Now Playing') . $link); ?> +<?php show_box_top(T_('Now Playing') . $link); ?> <?php foreach ($results as $item) { $media = $item['media']; diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index d3b647b9..031af1c7 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -33,14 +33,14 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); ?> <div class="np_group" id="np_group_1"> <div class="np_cell cel_username"> - <label><?php echo _('Username'); ?></label> + <label><?php echo T_('Username'); ?></label> <a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&user_id=<?php echo $np_user->id; ?>"> <?php echo scrub_out($np_user->fullname); ?> </a> </div> <div class="np_cell cel_rating"> - <label><?php echo _('Rating'); ?></label> + <label><?php echo T_('Rating'); ?></label> <div id="rating_<?php echo $media->id; ?>_song"> <?php Rating::show($media->id,'song'); ?> </div> @@ -50,7 +50,7 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); <div class="np_cell cel_lyrics"> <label> </label> <a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/song.php?action=show_lyrics&song_id=<?php echo $media->id; ?>"> - <?php echo _('Show Lyrics');?> + <?php echo T_('Show Lyrics');?> </a> </div> <?php } ?> @@ -58,21 +58,21 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); <div class="np_group" id="np_group_2"> <div class="np_cell cel_song"> - <label><?php echo _('Song'); ?></label> + <label><?php echo T_('Song'); ?></label> <a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&song_id=<?php echo $media->id; ?>"> <?php echo $title; ?> </a> </div> <div class="np_cell cel_album"> - <label><?php echo _('Album'); ?></label> + <label><?php echo T_('Album'); ?></label> <a title="<?php echo scrub_out($media->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&album=<?php echo $media->album; ?>"> <?php echo $album; ?> </a> </div> <div class="np_cell cel_artist"> - <label><?php echo _('Artist'); ?></label> + <label><?php echo T_('Artist'); ?></label> <a title="<?php echo scrub_out($media->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&artist=<?php echo $media->artist; ?>"> <?php echo $artist; ?> </a> @@ -93,7 +93,7 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); <div class="np_group"> <?php if ($artists = Recommendation::get_artists_like($media->artist, 3, false)) { ?> <div class="np_cel cel_similar"> - <label><?php echo _('Similar Artists'); ?></label> + <label><?php echo T_('Similar Artists'); ?></label> <?php foreach ($artists as $a) { ?> <div class="np_cel cel_similar_artist"> <?php @@ -112,7 +112,7 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full)); <?php } // end show similar artists ?> <?php if ($songs = Recommendation::get_songs_like($media->id, 3)) { ?> <div class="np_cel cel_similar"> - <label><?php echo _('Similar Songs'); ?></label> + <label><?php echo T_('Similar Songs'); ?></label> <?php foreach ($songs as $s) { ?> <div class="np_cel cel_similar_song"> <?php diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php index 167015dc..8fa40fac 100644 --- a/templates/show_object_rating.inc.php +++ b/templates/show_object_rating.inc.php @@ -39,11 +39,11 @@ $base_url = '?action=set_rating&rating_type=' . $rating->type . '&object_id=' . if ($width < 0) $width = 0; //set the current rating background - echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . _('Current rating: '); + echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . T_('Current rating: '); if ($rating->rating <= 0) { - echo _('not rated yet') . "</li>\n"; + echo T_('not rated yet') . "</li>\n"; } - else printf(_('%s of 5'), $rating->preciserating); echo "</li>\n"; + else printf(T_('%s of 5'), $rating->preciserating); echo "</li>\n"; for ($i=1; $i<6; $i++) { diff --git a/templates/show_object_rating_static.inc.php b/templates/show_object_rating_static.inc.php index 285d3bb3..198bb3b3 100644 --- a/templates/show_object_rating_static.inc.php +++ b/templates/show_object_rating_static.inc.php @@ -39,17 +39,17 @@ $base_url = Config::get('ajax_url') . '?action=set_rating&rating_type=' . $r if ($width < 0) $width = 0; //set the current rating background - echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . _('Current rating: '); + echo "<li class=\"current-rating\" style=\"width:${width}%\" >" . T_('Current rating: '); if ($rating->rating <= 0) { - echo _('not rated yet') . "</li>\n"; + echo T_('not rated yet') . "</li>\n"; } - else printf(_('%s of 5') ,$rating->preciserating); echo "</li>\n"; + else printf(T_('%s of 5') ,$rating->preciserating); echo "</li>\n"; for ($i=1; $i<6; $i++) { ?> <li> - <span class="star<?php echo $i; ?>" title="<?php echo $i.' '._('out of'); ?> 5"><?php echo $i; ?></span> + <span class="star<?php echo $i; ?>" title="<?php echo $i.' ' . T_('out of'); ?> 5"><?php echo $i; ?></span> </li> <?php } diff --git a/templates/show_objects.inc.php b/templates/show_objects.inc.php index 9630a4e1..d31925d1 100644 --- a/templates/show_objects.inc.php +++ b/templates/show_objects.inc.php @@ -48,7 +48,7 @@ <?php if (!count($objects)) { ?> <tr> <td colspan="<?php echo count($headers); ?>"> - <span class="error"><?php echo _('Not Enough Data'); ?></span> + <span class="error"><?php echo T_('Not Enough Data'); ?></span> </td> </tr> <?php } ?> diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php index 35adadc8..a9961b26 100644 --- a/templates/show_playlist.inc.php +++ b/templates/show_playlist.inc.php @@ -43,33 +43,33 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . <div id="information_actions"> <ul> <li> - <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&playlist_id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('statistics',_('Normalize Tracks')); ?></a> - <?php echo _('Normalize Tracks'); ?> + <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=normalize_tracks&playlist_id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('statistics', T_('Normalize Tracks')); ?></a> + <?php echo T_('Normalize Tracks'); ?> </li> <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('batch_download', _('Batch Download')); ?></a> - <?php echo _('Batch Download'); ?> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('batch_download', T_('Batch Download')); ?></a> + <?php echo T_('Batch Download'); ?> </li> <?php } ?> <li> - <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add',_('Add All'),'play_playlist'); ?> - <?php echo _('Add All'); ?> + <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> + <?php echo T_('Add All'); ?> </li> <li> - <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random',_('Add Random'),'play_playlist_random'); ?> - <?php echo _('Add Random'); ?> + <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Add Random'),'play_playlist_random'); ?> + <?php echo T_('Add Random'); ?> </li> <?php if ($playlist->has_access()) { ?> <li> - <?php echo Ajax::button('?action=show_edit_object&type=playlist_title&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo _('Edit'); ?> + <?php echo Ajax::button('?action=show_edit_object&type=playlist_title&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo T_('Edit'); ?> </li> <li> <a href="<?php echo Config::get('web_path'); ?>/playlist.php?action=delete_playlist&playlist_id=<?php echo $playlist->id; ?>"> <?php echo get_user_icon('delete'); ?> </a> - <?php echo _('Delete'); ?> + <?php echo T_('Delete'); ?> </li> <?php } ?> </ul> diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php index 95e252f5..08f83e84 100644 --- a/templates/show_playlist_row.inc.php +++ b/templates/show_playlist_row.inc.php @@ -28,8 +28,8 @@ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add',_('Add'),'add_playlist_' . $playlist->id); ?> - <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random',_('Random'),'random_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=basket&type=playlist&id=' . $playlist->id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=basket&type=playlist_random&id=' . $playlist->id,'random', T_('Random'),'random_playlist_' . $playlist->id); ?> </td> <td class="cel_playlist"><?php echo $playlist->f_link; ?></td> <td class="cel_type"><?php echo $playlist->f_type; ?></td> @@ -38,11 +38,11 @@ <td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=playlist&id=<?php echo $playlist->id; ?>"> - <?php echo get_user_icon('batch_download',_('Batch Download')); ?> + <?php echo get_user_icon('batch_download', T_('Batch Download')); ?> </a> <?php } ?> <?php if ($playlist->has_access()) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=playlist_row&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo Ajax::button('?page=browse&action=delete_object&type=playlist&id=' . $playlist->id,'delete',_('Delete'),'delete_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=playlist_row&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?page=browse&action=delete_object&type=playlist&id=' . $playlist->id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> <?php } ?> </td> diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php index 22ff8ee2..eae9cc54 100644 --- a/templates/show_playlist_song_row.inc.php +++ b/templates/show_playlist_song_row.inc.php @@ -27,7 +27,7 @@ */ ?> -<td class="cel_add"><?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'playlist_add_' . $song->id); ?></td> +<td class="cel_add"><?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'playlist_add_' . $song->id); ?></td> <td class="cel_track"><?php echo $playlist_track; ?></td> <td class="cel_song"><?php echo $song->f_link; ?></td> <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> @@ -41,11 +41,11 @@ <td class="cel_action"> <?php if (Config::get('download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> - <?php echo get_user_icon('download',_('Download')); ?> + <?php echo get_user_icon('download', T_('Download')); ?> </a> <?php } ?> <?php if ($playlist->has_access()) { ?> - <?php echo Ajax::button('?page=playlist&action=edit_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'edit',_('Edit'),'track_edit_' . $object['track_id']); ?> - <?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete',_('Delete'),'track_del_' . $object['track_id']); ?> + <?php echo Ajax::button('?page=playlist&action=edit_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'edit', T_('Edit'),'track_edit_' . $object['track_id']); ?> + <?php echo Ajax::button('?page=playlist&action=delete_track&playlist_id=' . $playlist->id . '&track_id=' . $object['track_id'],'delete', T_('Delete'),'track_del_' . $object['track_id']); ?> <?php } ?> </td> diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php index c3ebc3b6..a9f997d2 100644 --- a/templates/show_playlist_songs.inc.php +++ b/templates/show_playlist_songs.inc.php @@ -46,19 +46,19 @@ $ajax_url = Config::get('ajax_url'); </colgroup> <tr class="th-top"> <th class="cel_add"> </th> - <th class="cel_track"><?php echo _('Track'); ?></th> - <th class="cel_song"><?php echo _('Song Title'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_genre"><?php echo _('Genre'); ?></th> - <th class="cel_track"><?php echo _('Track'); ?></th> - <th class="cel_time"><?php echo _('Time'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_song"><?php echo T_('Song Title'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_genre"><?php echo T_('Genre'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> <?php if (Config::get('ratings')) { Rating::build_cache('song', array_map(create_function('$i', 'return $i[\'object_id\'];'), $object_ids)); ?> - <th class="cel_rating"><?php echo _('Rating'); ?></th> + <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $object) { @@ -72,17 +72,17 @@ $ajax_url = Config::get('ajax_url'); <?php } ?> <tr class="th-bottom"> <th class="cel_add"> </th> - <th class="cel_track"><?php echo _('Track'); ?></th> - <th class="cel_song"><?php echo _('Song Title'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_genre"><?php echo _('Genre'); ?></th> - <th class="cel_track"><?php echo _('Track'); ?></th> - <th class="cel_time"><?php echo _('Time'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_song"><?php echo T_('Song Title'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_genre"><?php echo T_('Genre'); ?></th> + <th class="cel_track"><?php echo T_('Track'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> <?php if (Config::get('ratings')) { ?> - <th class="cel_rating"><?php echo _('Rating'); ?></th> + <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_playlist_title.inc.php b/templates/show_playlist_title.inc.php index 957f0e64..cc3cee0b 100644 --- a/templates/show_playlist_title.inc.php +++ b/templates/show_playlist_title.inc.php @@ -28,4 +28,4 @@ ?> -<?php echo sprintf(_('%s %s (Playlist)'), $playlist->f_type, $playlist->name); ?> +<?php echo sprintf(T_('%s %s (Playlist)'), $playlist->f_type, $playlist->name); ?> diff --git a/templates/show_playlists.inc.php b/templates/show_playlists.inc.php index c3959629..46999725 100644 --- a/templates/show_playlists.inc.php +++ b/templates/show_playlists.inc.php @@ -38,12 +38,12 @@ <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th> <th class="cel_type"> </th> - <th class="cel_songs"><?php echo _('# Songs'); ?></th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user',_('Owner'),'playlist_sort_owner'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_songs"><?php echo T_('# Songs'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php foreach ($object_ids as $playlist_id) { @@ -57,16 +57,16 @@ foreach ($object_ids as $playlist_id) { <?php } // end foreach ($playlists as $playlist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="6"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name',_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> <th class="cel_type"> </th> - <th class="cel_songs"><?php echo _('# Songs'); ?></th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user',_('Owner'),'playlist_sort_owner_bottom'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_songs"><?php echo T_('# Songs'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> diff --git a/templates/show_playtype_switch.inc.php b/templates/show_playtype_switch.inc.php index 095a8b17..0a085d96 100644 --- a/templates/show_playtype_switch.inc.php +++ b/templates/show_playtype_switch.inc.php @@ -37,13 +37,13 @@ if (Preference::has_access('play_type')) { <form method="post" id="play_type_form" action="javascript.void(0);"> <select id="play_type_select" name="type"> <?php if (Config::get('allow_stream_playback')) { ?> - <option value="stream" <?php echo $is_stream; ?>><?php echo _('Stream'); ?></option> + <option value="stream" <?php echo $is_stream; ?>><?php echo T_('Stream'); ?></option> <?php } if (Config::get('allow_localplay_playback')) { ?> - <option value="localplay" <?php echo $is_localplay; ?>><?php echo _('Localplay'); ?></option> + <option value="localplay" <?php echo $is_localplay; ?>><?php echo T_('Localplay'); ?></option> <?php } if (Config::get('allow_democratic_playback')) { ?> - <option value="democratic" <?php echo $is_democratic; ?>><?php echo _('Democratic'); ?></option> + <option value="democratic" <?php echo $is_democratic; ?>><?php echo T_('Democratic'); ?></option> <?php } ?> - <option value="xspf_player" <?php echo $is_xspf_player; ?>><?php echo _('Flash Player'); ?></option> + <option value="xspf_player" <?php echo $is_xspf_player; ?>><?php echo T_('Flash Player'); ?></option> </select> <?php echo Ajax::observe('play_type_select','change',Ajax::action('?page=stream&action=set_play_type','play_type_select','play_type_form'),'1'); ?> </form> diff --git a/templates/show_plugins.inc.php b/templates/show_plugins.inc.php index dd434d0c..ead57dfd 100644 --- a/templates/show_plugins.inc.php +++ b/templates/show_plugins.inc.php @@ -37,11 +37,11 @@ $web_path = Config::get('web_path'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_description"><?php echo _('Description'); ?></th> - <th class="cel_version"><?php echo _('Version'); ?></th> - <th class="cel_iversion"><?php echo _('Installed Version'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_iversion"><?php echo T_('Installed Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($plugins as $plugin_name) { @@ -49,15 +49,15 @@ foreach ($plugins as $plugin_name) { $installed_version = Plugin::get_plugin_version($plugin->_plugin->name); if (! $installed_version) { $action = "<a href=\"" . $web_path . "/admin/modules.php?action=install_plugin&plugin=" . scrub_out($plugin_name) . "\">" . - _('Activate') . "</a>"; + T_('Activate') . "</a>"; } else { $action = "<a href=\"" . $web_path . "/admin/modules.php?action=confirm_uninstall_plugin&plugin=" . scrub_out($plugin_name) . "\">" . - _('Deactivate') . "</a>"; + T_('Deactivate') . "</a>"; if ($installed_version < $plugin->_plugin->version) { $action .= ' <a href="' . $web_path . '/admin/modules.php?action=upgrade_plugin&plugin=' . - scrub_out($plugin_name) . '">' . _('Upgrade') . '</a>'; + scrub_out($plugin_name) . '">' . T_('Upgrade') . '</a>'; } } ?> @@ -70,14 +70,14 @@ foreach ($plugins as $plugin_name) { </tr> <?php } if (!count($plugins)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="4"><span class="error"><?php echo _('No Records Found'); ?></span></td> + <td colspan="4"><span class="error"><?php echo T_('No Records Found'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_name"><?php echo _('Name'); ?></th> - <th class="cel_description"><?php echo _('Description'); ?></th> - <th class="cel_version"><?php echo _('Version'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_name"><?php echo T_('Name'); ?></th> + <th class="cel_description"><?php echo T_('Description'); ?></th> + <th class="cel_version"><?php echo T_('Version'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <br /> diff --git a/templates/show_popular.inc.php b/templates/show_popular.inc.php index c3bfeb52..db6cd424 100644 --- a/templates/show_popular.inc.php +++ b/templates/show_popular.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Information')); ?> +<?php show_box_top(T_('Information')); ?> <?php $object_ids = Stats::get_top('song'); $browse = new Browse(); diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 09848b5b..502c94f9 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Preference Administration')); ?> +<?php show_box_top(T_('Preference Administration')); ?> <form method="post" action="<?php echo conf('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data"> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> @@ -35,32 +35,32 @@ <col id="col_level" /> </colgroup> <tr class="th-top"> - <th class="cel_preference"><?php echo _('Preference'); ?></th> - <th class="cel_level"><?php echo _('Level'); ?></th> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_level"><?php echo T_('Level'); ?></th> </tr> <?php foreach ($preferences as $preference) { unset($is_25,$is_5,$is_100); ?> <tr class="<?php echo flip_class(); ?>"> - <td class="cel_preference"><?php echo scrub_out(_($preference['description'])); ?></td> + <td class="cel_preference"><?php echo scrub_out(T_($preference['description'])); ?></td> <td class="cel_level"> <?php $level_name = "is_" . $preference['level']; ${$level_name} = 'selected="selected"'; ?> <select name="prefs[<?php echo scrub_out($preference['name']); ?>]"> - <option value="5" <?php echo $is_5; ?>><?php echo _('Guest'); ?></option> - <option value="25" <?php echo $is_25; ?>><?php echo _('User'); ?></option> - <option value="100" <?php echo $is_100; ?>><?php echo _('Admin'); ?></option> + <option value="5" <?php echo $is_5; ?>><?php echo T_('Guest'); ?></option> + <option value="25" <?php echo $is_25; ?>><?php echo T_('User'); ?></option> + <option value="100" <?php echo $is_100; ?>><?php echo T_('Admin'); ?></option> </select> </td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_preference"><?php echo _('Preference'); ?></th> - <th class="cel_level"><?php echo _('Level'); ?></th> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_level"><?php echo T_('Level'); ?></th> </tr> </table> <div class="formValidation"> <input type="hidden" name="action" value="set_preferences" /> - <input type="submit" value="<?php echo _('Update'); ?>" /> + <input type="submit" value="<?php echo T_('Update'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index cd7b753c..6a8803a6 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -33,7 +33,7 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST $is_admin = true; } ?> -<h4><?php echo _($preferences['title']); ?></h4> +<h4><?php echo T_($preferences['title']); ?></h4> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_preference" /> @@ -44,16 +44,16 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST <?php } ?> </colgroup> <tr class="th-top"> - <th class="cel_preference"><?php echo _('Preference'); ?></th> - <th class="cel_value"><?php echo _('Value'); ?></th> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_value"><?php echo T_('Value'); ?></th> <?php if ($is_admin) { ?> - <th class="cel_applytoall"><?php echo _('Apply to All'); ?></th> - <th class="cel_level"><?php echo _('Access Level'); ?></th> + <th class="cel_applytoall"><?php echo T_('Apply to All'); ?></th> + <th class="cel_level"><?php echo T_('Access Level'); ?></th> <?php } ?> </tr> <?php foreach ($preferences['prefs'] as $pref) { ?> <tr class="<?php echo flip_class(); ?>"> - <td class="cel_preference"><?php echo _($pref['description']); ?></td> + <td class="cel_preference"><?php echo T_($pref['description']); ?></td> <td class="cel_value"> <?php create_preference_input($pref['name'], $pref['value']); ?> </td> @@ -62,11 +62,11 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST <td class="cel_level"> <?php $name = 'on_' . $pref['level']; ${$name} = 'selected="selected"'; ?> <select name="level_<?php echo $pref['name']; ?>"> - <option value="5" <?php echo $on_5; ?>><?php echo _('Guest'); ?></option> - <option value="25" <?php echo $on_25; ?>><?php echo _('User'); ?></option> - <option value="50" <?php echo $on_50; ?>><?php echo _('Content Manager'); ?></option> - <option value="75" <?php echo $on_75; ?>><?php echo _('Catalog Manager'); ?></option> - <option value="100" <?php echo $on_100; ?>><?php echo _('Admin'); ?></option> + <option value="5" <?php echo $on_5; ?>><?php echo T_('Guest'); ?></option> + <option value="25" <?php echo $on_25; ?>><?php echo T_('User'); ?></option> + <option value="50" <?php echo $on_50; ?>><?php echo T_('Content Manager'); ?></option> + <option value="75" <?php echo $on_75; ?>><?php echo T_('Catalog Manager'); ?></option> + <option value="100" <?php echo $on_100; ?>><?php echo T_('Admin'); ?></option> </select> <?php unset(${$name}); ?> </td> @@ -74,11 +74,11 @@ if ((Access::check('interface','100') OR !Config::get('use_auth')) AND $_REQUEST </tr> <?php } // End foreach ($preferences['prefs'] as $pref) ?> <tr class="th-bottom"> - <th class="cel_preference"><?php echo _('Preference'); ?></th> - <th class="cel_value"><?php echo _('Value'); ?></th> + <th class="cel_preference"><?php echo T_('Preference'); ?></th> + <th class="cel_value"><?php echo T_('Value'); ?></th> <?php if ($is_admin) { ?> - <th class="cel_applytoall"><?php echo _('Apply to All'); ?></th> - <th class="cel_level"><?php echo _('Access Level'); ?></th> + <th class="cel_applytoall"><?php echo T_('Apply to All'); ?></th> + <th class="cel_level"><?php echo T_('Access Level'); ?></th> <?php } ?> </tr> </table> diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index 9aa98244..5ad845f5 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -32,13 +32,13 @@ */ ?> -<?php /* HINT: Username */ show_box_top(sprintf(_('Editing %s preferences'), $fullname),'box box_preferences'); ?> +<?php /* HINT: Username */ show_box_top(sprintf(T_('Editing %s preferences'), $fullname),'box box_preferences'); ?> <?php if ($_REQUEST['tab'] != 'account' && $_REQUEST['tab'] != 'modules') { ?> <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=update_preferences" enctype="multipart/form-data"> <?php show_preference_box($preferences[$_REQUEST['tab']]); ?> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Update Preferences'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Update Preferences'); ?>" /> <?php echo Core::form_register('update_preference'); ?> <input type="hidden" name="tab" value="<?php echo scrub_out($_REQUEST['tab']); ?>" /> <input type="hidden" name="method" value="<?php echo scrub_out($_REQUEST['action']); ?>" /> diff --git a/templates/show_random.inc.php b/templates/show_random.inc.php index c2ab692e..dcd0bd76 100644 --- a/templates/show_random.inc.php +++ b/templates/show_random.inc.php @@ -27,19 +27,19 @@ */ ?> -<?php show_box_top(_('Play Random Selection'), 'box box_random'); ?> +<?php show_box_top(T_('Play Random Selection'), 'box box_random'); ?> <form id="random" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/random.php?action=get_advanced&type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"> <table class="tabledata" cellpadding="3" cellspacing="0"> <tr id="search_location"> - <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=song"><?php echo _('Songs'); ?></a><?php } else { echo _('Songs'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=album"><?php echo _('Albums'); ?></a><?php } else { echo _('Albums'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=artist"><?php echo _('Artists'); ?></a><?php } else { echo _('Artists'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=song"><?php echo T_('Songs'); ?></a><?php } else { echo T_('Songs'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=album"><?php echo T_('Albums'); ?></a><?php } else { echo T_('Albums'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/random.php?action=advanced&type=artist"><?php echo T_('Artists'); ?></a><?php } else { echo T_('Artists'); } ?></td> </tr> <tr id="search_blank_line"><td> </td></tr> </table> <table class="tabledata" cellpadding="0" cellspacing="0"> <tr id="search_item_count"> - <td><?php echo _('Item count'); ?></td> + <td><?php echo T_('Item count'); ?></td> <td> <?php $name = 'random_'; if ($_POST['random'] == -1) { @@ -59,16 +59,16 @@ <option value="100"<?php echo $random_100; ?>>100</option> <option value="500"<?php echo $random_500; ?>>500</option> <option value="1000"<?php echo $random_1000; ?>>1000</option> - <option value="-1" <?php echo $random_all; ?> ><?php echo _('All'); ?></option> + <option value="-1" <?php echo $random_all; ?> ><?php echo T_('All'); ?></option> </select> </td> </tr> <tr id="search_length"> - <td><?php echo _('Length'); ?></td> + <td><?php echo T_('Length'); ?></td> <td> <?php $name = 'length_' . intval($_POST['length']); ${$name} = ' selected="selected"'; ?> <select name="length"> - <option value="0"<?php echo $length_0; ?>><?php echo _('Unlimited'); ?></option> + <option value="0"<?php echo $length_0; ?>><?php echo T_('Unlimited'); ?></option> <option value="15"<?php echo $length_15; ?>><?php printf(ngettext('%d minute','%d minutes',15), "15"); ?></option> <option value="30"<?php echo $length_30; ?>><?php printf(ngettext('%d minute','%d minutes',30), "30"); ?></option> <option value="60"<?php echo $length_60; ?>><?php printf(ngettext('%d hour','%d hours',1), "1"); ?></option> @@ -80,11 +80,11 @@ </td> </tr> <tr id="search_size_limit"> - <td><?php echo _('Size Limit'); ?></td> + <td><?php echo T_('Size Limit'); ?></td> <td> <?php $name = 'size_' . intval($_POST['size_limit']); ${$name} = ' selected="selected"'; ?> <select name="size_limit"> - <option value="0"<?php echo $size_0; ?>><?php echo _('Unlimited'); ?></option> + <option value="0"<?php echo $size_0; ?>><?php echo T_('Unlimited'); ?></option> <option value="64"<?php echo $size_64; ?>>64MB</option> <option value="128"<?php echo $size_128; ?>>128MB</option> <option value="256"<?php echo $size_256; ?>>256MB</option> @@ -98,7 +98,7 @@ <?php require Config::get('prefix') . '/templates/show_rules.inc.php'; ?> <div class="formValidation"> - <input type="submit" value="<?php echo _('Enqueue'); ?>" /> + <input type="submit" value="<?php echo T_('Enqueue'); ?>" /> </div> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index be669f75..e5abaa23 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -27,9 +27,9 @@ */ $web_path = Config::get('web_path'); -$button = Ajax::button('?page=index&action=random_albums','random',_('Refresh'),'random_refresh'); +$button = Ajax::button('?page=index&action=random_albums','random', T_('Refresh'),'random_refresh'); ?> -<?php show_box_top(_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?> +<?php show_box_top(T_('Albums of the Moment') . ' ' . $button, 'box box_random_albums'); ?> <?php if ($albums) { @@ -53,7 +53,7 @@ $button = Ajax::button('?page=index&action=random_albums','random',_('Refresh'), echo "</div>"; } ?> - <span class="play_album"><?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Play Album'),'play_full_' . $album->id); ?></span> + <span class="play_album"><?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add', T_('Play Album'),'play_full_' . $album->id); ?></span> </div> <?php } // end foreach ?> diff --git a/templates/show_recently_played.inc.php b/templates/show_recently_played.inc.php index f91f71de..542dd2b2 100644 --- a/templates/show_recently_played.inc.php +++ b/templates/show_recently_played.inc.php @@ -27,7 +27,7 @@ */ $link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('recently_played') : ''; -show_box_top(_('Recently Played') . $link, 'box box_recently_played'); +show_box_top(T_('Recently Played') . $link, 'box box_recently_played'); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> @@ -39,12 +39,12 @@ show_box_top(_('Recently Played') . $link, 'box box_recently_played'); <col id="col_lastplayed" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_song"><?php echo _('Song'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_username"><?php echo _('Username'); ?></th> - <th class="cel_lastplayed"><?php echo _('Last Played'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_username"><?php echo T_('Username'); ?></th> + <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> </tr> <?php foreach ($data as $row) { $row_user = new User($row['user']); @@ -84,13 +84,13 @@ show_box_top(_('Recently Played') . $link, 'box box_recently_played'); } // I wonder how smart gettext is? - $time_string = sprintf(ngettext('%d ' . rtrim($unit, 's') . ' ago', '%d ' . $unit . ' ago', $interval), $interval); + $time_string = sprintf(T_ngettext('%d ' . rtrim($unit, 's') . ' ago', '%d ' . $unit . ' ago', $interval), $interval); $song->format(); ?> <tr class="<?php echo flip_class(); ?>"> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?> + <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_' . $song->id); ?> </td> <td class="cel_song"><?php echo $song->f_link; ?></td> <td class="cel_album"><?php echo $song->f_album_link; ?></td> @@ -105,16 +105,16 @@ show_box_top(_('Recently Played') . $link, 'box box_recently_played'); <?php } ?> <?php if (!count($data)) { ?> <tr> - <td colspan="6"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_username"><?php echo _('Username'); ?></th> - <th class="cel_song"><?php echo _('Song'); ?></th> - <th class="cel_album"><?php echo _('Album'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_lastplayed"><?php echo _('Last Played'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_username"><?php echo T_('Username'); ?></th> + <th class="cel_song"><?php echo T_('Song'); ?></th> + <th class="cel_album"><?php echo T_('Album'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_lastplayed"><?php echo T_('Last Played'); ?></th> </tr> </table> <?php show_box_bottom(); ?> diff --git a/templates/show_recommended_artists.inc.php b/templates/show_recommended_artists.inc.php index 6a168048..4652a0eb 100644 --- a/templates/show_recommended_artists.inc.php +++ b/templates/show_recommended_artists.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Similar Artists'), 'info-box'); ?> +<?php show_box_top(T_('Similar Artists'), 'info-box'); ?> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_add" /> @@ -39,14 +39,14 @@ <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_songs"><?php echo _('Songs'); ?></th> - <th class="cel_albums"><?php echo _('Albums'); ?></th> - <th class="cel_time"><?php echo _('Time'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_rating"> <?php echo _('Rating'); ?> </th> - <th class="cel_action"> <?php echo _('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_albums"><?php echo T_('Albums'); ?></th> + <th class="cel_time"><?php echo T_('Time'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> <?php // Cache the ratings we are going to use @@ -63,17 +63,17 @@ foreach ($object_ids as $artist_id) { <?php } //end foreach ($artists as $artist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="5"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="5"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_artist"><?php echo _('Artist'); ?></th> - <th class="cel_songs"> <?php echo _('Songs'); ?> </th> - <th class="cel_albums"> <?php echo _('Albums'); ?> </th> - <th class="cel_time"> <?php echo _('Time'); ?> </th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_rating"> <?php echo _('Rating'); ?> </th> - <th class="cel_action"> <?php echo _('Action'); ?> </th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_artist"><?php echo T_('Artist'); ?></th> + <th class="cel_songs"> <?php echo T_('Songs'); ?> </th> + <th class="cel_albums"> <?php echo T_('Albums'); ?> </th> + <th class="cel_time"> <?php echo T_('Time'); ?> </th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_rating"> <?php echo T_('Rating'); ?> </th> + <th class="cel_action"> <?php echo T_('Action'); ?> </th> </tr> </table> diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php index 9aad6786..d7b62222 100644 --- a/templates/show_registration_confirmation.inc.php +++ b/templates/show_registration_confirmation.inc.php @@ -33,22 +33,22 @@ $web_path = Config::get('web_path'); <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> -<title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title> +<title><?php echo Config::get('site_title'); ?> - <?php echo T_('Registration'); ?></title> <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" /> <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> </head> <body> <div id="header"> <h1><?php echo scrub_out(Config::get('site_title')); ?></h1> -<?php echo _('Registration Complete'); ?>... +<?php echo T_('Registration Complete'); ?>... </div> <script src="<?php echo $web_path; ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/lib/javascript/base.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/lib/javascript/ajax.js" language="javascript" type="text/javascript"></script> <div id="maincontainer"> -<?php echo _('Your account has been created. An activation key has been sent to the e-mail address you provided. Please check your e-mail for further information'); ?> +<?php echo T_('Your account has been created. An activation key has been sent to the e-mail address you provided. Please check your e-mail for further information'); ?> <br /><br /> -<a href="<?php echo Config::get('web_path'); ?>/login.php"><?php echo _('Return to Login Page'); ?></a> +<a href="<?php echo Config::get('web_path'); ?>/login.php"><?php echo T_('Return to Login Page'); ?></a> </div><!--end <div>id="maincontainer--> <div id="bottom"> <p><strong>Ampache</strong><br /> diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php index 604ffcc8..8eebe5ce 100644 --- a/templates/show_rename_artist.inc.php +++ b/templates/show_rename_artist.inc.php @@ -33,15 +33,15 @@ function insert() document.getElementById('artist_name').value = '<?php echo $artist->name; ?>'; } </script> -<?php /* HINT: Artist Name */ show_box_top(sprintf(_('Rename %s'), $artist->name)); ?> +<?php /* HINT: Artist Name */ show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?> <form name="rename_artist" method="post" action="<?php echo conf('web_path'); ?>/artists.php?action=rename&artist=<?php echo $artist->id; ?>" style="Display:inline;"> <?php show_artist_pulldown($artist->id, "artist_id", 4); ?> <br /> - <?php echo _('OR'); ?><br /> + <?php echo T_('OR'); ?><br /> <input type="text" name="artist_name" size="30" value="<?php echo scrub_out($_REQUEST['artist_name']); ?>" id="artist_name" /> - <a href="javascript:insert()">[<?php echo _('Insert current'); ?>]</a><br /> + <a href="javascript:insert()">[<?php echo T_('Insert current'); ?>]</a><br /> <?php $GLOBALS['error']->print_error('artist_name'); ?> - <input type="checkbox" name="update_id3" value="yes" /> <?php echo _('Update id3 tags') ?><br /> - <input type="submit" value="<?php echo _('Rename'); ?>" /><br /> + <input type="checkbox" name="update_id3" value="yes" /> <?php echo T_('Update id3 tags') ?><br /> + <input type="submit" value="<?php echo T_('Rename'); ?>" /><br /> </form> <?php show_box_bottom(); ?> diff --git a/templates/show_rules.inc.php b/templates/show_rules.inc.php index e588f23a..ed076f0e 100644 --- a/templates/show_rules.inc.php +++ b/templates/show_rules.inc.php @@ -32,15 +32,15 @@ $logic_operator = strtolower($logic_operator); <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search.js"></script> <script type="text/javascript" src="<?php echo Config::get('web_path'); ?>/lib/javascript/search-data.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>"></script> -<?php show_box_top(_('Rules') . "...", 'box box_rules'); ?> +<?php show_box_top(T_('Rules') . "...", 'box box_rules'); ?> <table class="tabledata" cellpadding="3" cellspacing="0"> <tbody id="searchtable"> <tr id="rules_operator"> - <td><?php echo _('Match'); ?></td> + <td><?php echo T_('Match'); ?></td> <td> <select name="operator"> - <option value="and" <?php if($logic_operator == 'and') echo 'selected="selected"'?>><?php echo _('all rules'); ?></option> - <option value="or" <?php if($logic_operator == 'or') echo 'selected="selected"'?>><?php echo _('any rule'); ?></option> + <option value="and" <?php if($logic_operator == 'and') echo 'selected="selected"'?>><?php echo T_('all rules'); ?></option> + <option value="or" <?php if($logic_operator == 'or') echo 'selected="selected"'?>><?php echo T_('any rule'); ?></option> </select> </td> </tr> @@ -48,7 +48,7 @@ $logic_operator = strtolower($logic_operator); <td> <a id="addrowbutton" href="javascript:void(0)"> <?php echo get_user_icon('add'); ?> - <?php echo _('Add Another Rule'); ?> + <?php echo T_('Add Another Rule'); ?> </a> <script type="text/javascript">Event.observe('addrowbutton', 'click', SearchRow.add);</script> </td> diff --git a/templates/show_run_add_catalog.inc.php b/templates/show_run_add_catalog.inc.php index be9f5b6f..d25ec832 100644 --- a/templates/show_run_add_catalog.inc.php +++ b/templates/show_run_add_catalog.inc.php @@ -28,5 +28,5 @@ // Get the count of the number of items in their playlist ?> -<?php echo _('Found'); ?>:<?php echo $catalog_add_found; ?><br /> -<?php echo _('Reading'); ?>:<?php echo $catalog_add_directory; ?><br /> +<?php echo T_('Found'); ?>:<?php echo $catalog_add_found; ?><br /> +<?php echo T_('Reading'); ?>:<?php echo $catalog_add_directory; ?><br /> diff --git a/templates/show_search.inc.php b/templates/show_search.inc.php index e55ba308..0d5484db 100644 --- a/templates/show_search.inc.php +++ b/templates/show_search.inc.php @@ -31,23 +31,23 @@ * This is the template for the searches... amazing! */ ?> -<?php show_box_top(_('Search Ampache') . "...", 'box box_advanced_search'); ?> +<?php show_box_top(T_('Search Ampache') . "...", 'box box_advanced_search'); ?> <form id="search" name="search" method="post" action="<?php echo Config::get('web_path'); ?>/search.php?type=<?php echo $_REQUEST['type'] ? scrub_out($_REQUEST['type']) : 'song'; ?>" enctype="multipart/form-data" style="Display:inline"> <table class="tabledata" cellpadding="3" cellspacing="0"> <tr id="search_location"> - <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=song"><?php echo _('Songs'); ?></a><?php } else { echo _('Songs'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=album"><?php echo _('Albums'); ?></a><?php } else { echo _('Albums'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=artist"><?php echo _('Artists'); ?></a><?php } else { echo _('Artists'); } ?></td> - <td><?php if ($_REQUEST['type'] != 'video') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=video"><?php echo _('Videos'); ?></a><?php } else { echo _('Videos'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'song') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=song"><?php echo T_('Songs'); ?></a><?php } else { echo T_('Songs'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'album') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=album"><?php echo T_('Albums'); ?></a><?php } else { echo T_('Albums'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'artist') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=artist"><?php echo T_('Artists'); ?></a><?php } else { echo T_('Artists'); } ?></td> + <td><?php if ($_REQUEST['type'] != 'video') { ?><a href="<?php echo Config::get('web_path'); ?>/search.php?type=video"><?php echo T_('Videos'); ?></a><?php } else { echo T_('Videos'); } ?></td> </tr> <tr id="search_blank_line"><td> </td></tr> </table> <table class="tabledata" cellpadding="3" cellspacing="0"> <tr id="search_max_results"> - <td><?php echo _('Maximum Results'); ?></td> + <td><?php echo T_('Maximum Results'); ?></td> <td> <select name="limit"> - <option value="0"><?php echo _('Unlimited'); ?></option> + <option value="0"><?php echo T_('Unlimited'); ?></option> <option value="25" <?php if($_REQUEST['limit']=="25") echo "selected=\"selected\""?>>25</option> <option value="50" <?php if($_REQUEST['limit']=="50") echo "selected=\"selected\""?>>50</option> <option value="100" <?php if($_REQUEST['limit']=="100") echo "selected=\"selected\""?>>100</option> @@ -60,9 +60,9 @@ <?php require Config::get('prefix') . '/templates/show_rules.inc.php'; ?> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Search'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Search'); ?>" /> <?php if ($_REQUEST['type'] == 'song' || ! $_REQUEST['type']) { ?> - <input id="savesearchbutton" class="button" type="submit" value="<?php echo _('Save as Smart Playlist'); ?>" onClick="$('hiddenaction').setValue('save_as_smartplaylist');" /> + <input id="savesearchbutton" class="button" type="submit" value="<?php echo T_('Save as Smart Playlist'); ?>" onClick="$('hiddenaction').setValue('save_as_smartplaylist');" /> <?php } ?> <input type="hidden" id="hiddenaction" name="action" value="search" /> </div> diff --git a/templates/show_search_bar.inc.php b/templates/show_search_bar.inc.php index 558868bd..fa9dee8e 100644 --- a/templates/show_search_bar.inc.php +++ b/templates/show_search_bar.inc.php @@ -34,14 +34,14 @@ <input type="hidden" name="rule_1_operator" value="0" /> <input type="hidden" name="object_type" value="song" /> <select name="rule_1"> - <option value="anywhere"><?php echo _('Anywhere')?></option> - <option value="title"><?php echo _('Title')?></option> - <option value="album"><?php echo _('Album')?></option> - <option value="artist"><?php echo _('Artist')?></option> - <option value="tag"><?php echo _('Tag')?></option> + <option value="anywhere"><?php echo T_('Anywhere')?></option> + <option value="title"><?php echo T_('Title')?></option> + <option value="album"><?php echo T_('Album')?></option> + <option value="artist"><?php echo T_('Artist')?></option> + <option value="tag"><?php echo T_('Tag')?></option> </select> - <input class="button" type="submit" value="<?php echo _('Search'); ?>" id="searchBtn" /> - <a href="<?php echo $web_path; ?>/search.php?type=song" class="button" id="advSearchBtn"><?php echo _('Advanced Search'); ?></a> + <input class="button" type="submit" value="<?php echo T_('Search'); ?>" id="searchBtn" /> + <a href="<?php echo $web_path; ?>/search.php?type=song" class="button" id="advSearchBtn"><?php echo T_('Advanced Search'); ?></a> </form> </div> diff --git a/templates/show_search_options.inc.php b/templates/show_search_options.inc.php index c4e49de6..a9434071 100644 --- a/templates/show_search_options.inc.php +++ b/templates/show_search_options.inc.php @@ -26,17 +26,17 @@ * @link http://www.ampache.org/ */ ?> -<?php show_box_top(_('Options'),'info-box'); ?> +<?php show_box_top(T_('Options'),'info-box'); ?> <div id="information_actions"> <ul> <li> - <?php echo Ajax::button('?action=basket&type=browse_set&browse_id=' . $browse->id,'add',_('Add Search Results'),'add_search_results'); ?> - <?php echo _('Add Search Results'); ?> + <?php echo Ajax::button('?action=basket&type=browse_set&browse_id=' . $browse->id,'add', T_('Add Search Results'),'add_search_results'); ?> + <?php echo T_('Add Search Results'); ?> </li> <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=browse&type=<?php echo scrub_out($_REQUEST['type']); ?>&browse_id=<?php echo $browse->id; ?>"><?php echo get_user_icon('batch_download', _('Batch Download')); ?></a> - <?php echo _('Batch Download'); ?> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=browse&type=<?php echo scrub_out($_REQUEST['type']); ?>&browse_id=<?php echo $browse->id; ?>"><?php echo get_user_icon('batch_download', T_('Batch Download')); ?></a> + <?php echo T_('Batch Download'); ?> </li> <?php } ?> </ul> diff --git a/templates/show_shout_row.inc.php b/templates/show_shout_row.inc.php index 154171dd..221f3e89 100644 --- a/templates/show_shout_row.inc.php +++ b/templates/show_shout_row.inc.php @@ -36,11 +36,11 @@ <td class="cel_action"> <a href="<?php echo $web_path; ?>/admin/shout.php?action=show_edit&shout_id=<?php echo $shout->id; ?>"> - <?php echo get_user_icon('edit', _('Edit')); ?> + <?php echo get_user_icon('edit', T_('Edit')); ?> </a> <a href="<?php echo $web_path; ?>/admin/shout.php?action=delete&shout_id=<?php echo $shout->id; ?>"> - <?php echo get_user_icon('delete', _('Delete')); ?> + <?php echo get_user_icon('delete', T_('Delete')); ?> </a> </td> </tr> diff --git a/templates/show_shoutbox.inc.php b/templates/show_shoutbox.inc.php index 5455539b..d2fc403e 100644 --- a/templates/show_shoutbox.inc.php +++ b/templates/show_shoutbox.inc.php @@ -27,7 +27,7 @@ */ ?> -<?php show_box_top(_('Shoutbox')); ?> +<?php show_box_top(T_('Shoutbox')); ?> <div id="shoutbox"> <?php foreach ($shouts as $shout_id) { @@ -39,7 +39,7 @@ ?> <div class="shout <?php echo flip_class(); ?>"> <?php echo $shout->get_image(); ?> - <?php echo Ajax::button('?action=basket&type=' . $shout->object_type .'&id=' . $shout->object_id,'add',_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?> + <?php echo Ajax::button('?action=basket&type=' . $shout->object_type .'&id=' . $shout->object_id,'add', T_('Add'),'add_' . $shout->object_type . '_' . $shout->object_id); ?> <?php echo $object->f_link; ?> <span class="information"><?php echo $client->f_link; ?> <?php echo date("d/m H:i",$shout->date); ?></span> <span class="shouttext"><?php echo scrub_out($shout->text); ?></span> diff --git a/templates/show_smartplaylist.inc.php b/templates/show_smartplaylist.inc.php index adde43fa..917c0a35 100644 --- a/templates/show_smartplaylist.inc.php +++ b/templates/show_smartplaylist.inc.php @@ -31,24 +31,24 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . <ul> <?php if (Access::check_function('batch_download')) { ?> <li> - <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=search&id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('batch_download', _('Batch Download')); ?></a> - <?php echo _('Batch Download'); ?> + <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=search&id=<?php echo $playlist->id; ?>"><?php echo get_user_icon('batch_download', T_('Batch Download')); ?></a> + <?php echo T_('Batch Download'); ?> </li> <?php } ?> <li> - <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add',_('Add All'),'play_playlist'); ?> - <?php echo _('Add All'); ?> + <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add', T_('Add All'),'play_playlist'); ?> + <?php echo T_('Add All'); ?> </li> <?php if ($playlist->has_access()) { ?> <li> - <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_title&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo _('Edit'); ?> + <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_title&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo T_('Edit'); ?> </li> <li> <a href="<?php echo Config::get('web_path'); ?>/smartplaylist.php?action=delete_playlist&playlist_id=<?php echo $playlist->id; ?>"> <?php echo get_user_icon('delete'); ?> </a> - <?php echo _('Delete'); ?> + <?php echo T_('Delete'); ?> </li> <?php } ?> </ul> @@ -59,7 +59,7 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . <?php require Config::get('prefix') . '/templates/show_rules.inc.php'; ?> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Save Changes'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Save Changes'); ?>" /> </div> </form> diff --git a/templates/show_smartplaylist_row.inc.php b/templates/show_smartplaylist_row.inc.php index bf1f43f0..201df5cb 100644 --- a/templates/show_smartplaylist_row.inc.php +++ b/templates/show_smartplaylist_row.inc.php @@ -21,7 +21,7 @@ */ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add',_('Add'),'add_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=basket&type=smartplaylist&id=' . $playlist->id,'add', T_('Add'),'add_playlist_' . $playlist->id); ?> </td> <td class="cel_playlist"><?php echo $playlist->f_link; ?></td> <td class="cel_type"><?php echo $playlist->f_type; ?></td> @@ -29,11 +29,11 @@ <td class="cel_action"> <?php if (Access::check_function('batch_download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/batch.php?action=smartplaylist&id=<?php echo $playlist->id; ?>"> - <?php echo get_user_icon('batch_download',_('Batch Download')); ?> + <?php echo get_user_icon('batch_download', T_('Batch Download')); ?> </a> <?php } ?> <?php if ($playlist->has_access()) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_row&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?> - <?php echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $playlist->id,'delete',_('Delete'),'delete_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=smartplaylist_row&id=' . $playlist->id,'edit', T_('Edit'),'edit_playlist_' . $playlist->id); ?> + <?php echo Ajax::button('?page=browse&action=delete_object&type=smartplaylist&id=' . $playlist->id,'delete', T_('Delete'),'delete_playlist_' . $playlist->id); ?> <?php } ?> </td> diff --git a/templates/show_smartplaylist_title.inc.php b/templates/show_smartplaylist_title.inc.php index 8691ac98..1d81ca80 100644 --- a/templates/show_smartplaylist_title.inc.php +++ b/templates/show_smartplaylist_title.inc.php @@ -21,4 +21,4 @@ */ ?> -<?php echo sprintf(_('%s %s (Smart Playlist)'), $playlist->f_type, $playlist->name); ?> +<?php echo sprintf(T_('%s %s (Smart Playlist)'), $playlist->f_type, $playlist->name); ?> diff --git a/templates/show_smartplaylists.inc.php b/templates/show_smartplaylists.inc.php index 2c891884..b371d882 100644 --- a/templates/show_smartplaylists.inc.php +++ b/templates/show_smartplaylists.inc.php @@ -32,11 +32,11 @@ <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=name',_('Playlist Name'),'playlist_sort_name'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=name', T_('Playlist Name'),'playlist_sort_name'); ?></th> <th class="cel_type"> </th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=user',_('Owner'),'playlist_sort_owner'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=smartplaylist&sort=user', T_('Owner'),'playlist_sort_owner'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> <?php foreach ($object_ids as $playlist_id) { @@ -49,15 +49,15 @@ foreach ($object_ids as $playlist_id) { <?php } // end foreach ($playlists as $playlist) ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="6"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="6"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name',_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_playlist"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=name', T_('Playlist Name'),'playlist_sort_name_bottom'); ?></th> <th class="cel_type"> </th> - <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user',_('Owner'),'playlist_sort_owner_bottom'); ?></th> - <th class="cel_action"><?php echo _('Actions'); ?></th> + <th class="cel_owner"><?php echo Ajax::text('?page=browse&action=set_sort&type=playlist&sort=user', T_('Owner'),'playlist_sort_owner_bottom'); ?></th> + <th class="cel_action"><?php echo T_('Actions'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php' ?> diff --git a/templates/show_song.inc.php b/templates/show_song.inc.php index f3cfd638..794ceb43 100644 --- a/templates/show_song.inc.php +++ b/templates/show_song.inc.php @@ -29,22 +29,22 @@ $icon = $song->enabled ? 'disable' : 'enable'; $button_flip_state_id = 'button_flip_state_' . $song->id; ?> -<?php show_box_top($song->title . ' ' . _('Details'), 'box box_song_details'); ?> +<?php show_box_top($song->title . ' ' . T_('Details'), 'box box_song_details'); ?> <dl class="song_details"> <?php if (Config::get('ratings')) { ?> -<dt class="<?php echo flip_class(); ?>"><?php echo _('Rating'); ?></dt> +<dt class="<?php echo flip_class(); ?>"><?php echo T_('Rating'); ?></dt> <dd><div id="rating_<?php echo $song->id; ?>_song"><?php Rating::show($song->id,'song'); ?></div></dd> <?php } ?> -<dt class="<?php echo $rowparity; ?>"><?php echo _('Action'); ?></dt> +<dt class="<?php echo $rowparity; ?>"><?php echo T_('Action'); ?></dt> <dd class="<?php echo flip_class(); ?>"> - <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_song_' . $song->id); ?> + <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_song_' . $song->id); ?> <?php if (Access::check_function('download')) { ?> - <a href="<?php echo Song::play_url($song->id); ?>"><?php echo get_user_icon('link',_('Link')); ?></a> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"><?php echo get_user_icon('download',_('Download')); ?></a> + <a href="<?php echo Song::play_url($song->id); ?>"><?php echo get_user_icon('link', T_('Link')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"><?php echo get_user_icon('download', T_('Download')); ?></a> <?php } ?> <?php if (Access::check('interface','75')) { ?> <span id="<?php echo($button_flip_state_id); ?>"> - <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon,_(ucfirst($icon)),'flip_song_' . $song->id); ?> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?> </span> <?php } ?> </dd> @@ -72,7 +72,7 @@ $button_flip_state_id = 'button_flip_state_' . $song->id; if(trim($value)) { $rowparity = flip_class(); - echo "<dt class=\"".$rowparity."\">" . _($key) . "</dt><dd class=\"".$rowparity."\">" . $value . "</dd>"; + echo "<dt class=\"".$rowparity."\">" . T_($key) . "</dt><dd class=\"".$rowparity."\">" . $value . "</dd>"; } } ?> diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php index 626f5967..5913e64a 100644 --- a/templates/show_song_row.inc.php +++ b/templates/show_song_row.inc.php @@ -28,7 +28,7 @@ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?> + <?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add', T_('Add'),'add_' . $song->id); ?> </td> <td class="cel_song"><a href="<?php echo Song::play_url($song->id); ?>" title="<?php echo scrub_out($song->title); ?>"><?php echo $song->f_title; ?></a></td> <td class="cel_artist"><?php echo $song->f_artist_link; ?></td> @@ -40,23 +40,23 @@ <td class="cel_rating" id="rating_<?php echo $song->id; ?>_song"><?php Rating::show($song->id,'song'); ?></td> <?php } ?> <td class="cel_action"> - <a href="<?php echo $song->link; ?>"><?php echo get_user_icon('preferences',_('Song Information')); ?></a> + <a href="<?php echo $song->link; ?>"><?php echo get_user_icon('preferences', T_('Song Information')); ?></a> <?php if (Config::get('shoutbox')) { ?> <a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&type=song&id=<?php echo $song->id; ?>"> - <?php echo get_user_icon('comment',_('Post Shout')); ?> + <?php echo get_user_icon('comment', T_('Post Shout')); ?> </a> <?php } ?> <?php if (Access::check_function('download')) { ?> <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&song_id=<?php echo $song->id; ?>"> - <?php echo get_user_icon('download',_('Download')); ?> + <?php echo get_user_icon('download', T_('Download')); ?> </a> <?php } ?> <?php if (Access::check('interface','75')) { ?> - <?php echo Ajax::button('?action=show_edit_object&type=song_row&id=' . $song->id,'edit',_('Edit'),'edit_song_' . $song->id); ?> + <?php echo Ajax::button('?action=show_edit_object&type=song_row&id=' . $song->id,'edit', T_('Edit'),'edit_song_' . $song->id); ?> <?php $icon = $song->enabled ? 'disable' : 'enable'; ?> <?php $button_flip_state_id = 'button_flip_state_' . $song_id; ?> <span id="<?php echo($button_flip_state_id); ?>"> - <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon,_(ucfirst($icon)),'flip_song_' . $song->id); ?> + <?php echo Ajax::button('?page=song&action=flip_state&song_id=' . $song->id,$icon, T_(ucfirst($icon)),'flip_song_' . $song->id); ?> </span> <?php } ?> </td> diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 4befb999..98331fc6 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -43,19 +43,19 @@ $ajax_url = Config::get('ajax_url'); <col id="col_action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', _('Song Title'), 'sort_song_title'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', _('Artist'), 'sort_song_artist'); ?></th> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=album', _('Album'), 'sort_song_album'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=track', _('Track'), 'sort_song_track'); ?></th> - <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=time', _('Time'), 'sort_song_time'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=title', T_('Song Title'), 'sort_song_title'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=artist', T_('Artist'), 'sort_song_artist'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=album', T_('Album'), 'sort_song_album'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=track', T_('Track'), 'sort_song_track'); ?></th> + <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&browse_id=' . $browse->id . '&sort=time', T_('Time'), 'sort_song_time'); ?></th> <?php if (Config::get('ratings')) { Rating::build_cache('song', $object_ids); ?> - <th class="cel_rating"><?php echo _('Rating'); ?></th> + <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php foreach ($object_ids as $song_id) { @@ -68,21 +68,21 @@ $ajax_url = Config::get('ajax_url'); <?php } ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="9"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="9"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=title',_('Song Title'),'sort_song_title_bottom'); ?></th> - <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=artist',_('Artist'),'sort_song_artist_bottom'); ?></th> - <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=album',_('Album'),'sort_song_album_bottom'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track',_('Track'),'sort_song_track_bottom'); ?></th> - <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time',_('Time'),'sort_song_time_bottom'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_song"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=title', T_('Song Title'),'sort_song_title_bottom'); ?></th> + <th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=artist', T_('Artist'),'sort_song_artist_bottom'); ?></th> + <th class="cel_album"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=album', T_('Album'),'sort_song_album_bottom'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_track"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=track', T_('Track'),'sort_song_track_bottom'); ?></th> + <th class="cel_time"><?php echo Ajax::text('?page=browse&action=set_sort&type=song&sort=time', T_('Time'),'sort_song_time_bottom'); ?></th> <?php if (Config::get('ratings')) { ?> - <th class="cel_rating"><?php echo _('Rating'); ?></th> + <th class="cel_rating"><?php echo T_('Rating'); ?></th> <?php } ?> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/show_stats.inc.php b/templates/show_stats.inc.php index 07f6da6f..8f3b37e3 100644 --- a/templates/show_stats.inc.php +++ b/templates/show_stats.inc.php @@ -29,19 +29,19 @@ $stats = Catalog::get_stats(); $catalogs = Catalog::get_catalogs(); ?> -<?php show_box_top(_('Statistics'), 'box box_stats'); ?> -<em><?php echo _('Catalogs'); ?></em> +<?php show_box_top(T_('Statistics'), 'box box_stats'); ?> +<em><?php echo T_('Catalogs'); ?></em> <table class="tabledata" cellpadding="3" cellspacing="1"> <tr class="th-top"> - <th><?php echo _('Connected Users'); ?></th> - <th><?php echo _('Total Users'); ?></th> - <th><?php echo _('Albums'); ?></th> - <th><?php echo _('Artists'); ?></th> - <th><?php echo _('Songs'); ?></th> - <th><?php echo _('Videos'); ?></th> - <th><?php echo _('Tags'); ?></th> - <th><?php echo _('Catalog Size'); ?></th> - <th><?php echo _('Catalog Time'); ?></th> + <th><?php echo T_('Connected Users'); ?></th> + <th><?php echo T_('Total Users'); ?></th> + <th><?php echo T_('Albums'); ?></th> + <th><?php echo T_('Artists'); ?></th> + <th><?php echo T_('Songs'); ?></th> + <th><?php echo T_('Videos'); ?></th> + <th><?php echo T_('Tags'); ?></th> + <th><?php echo T_('Catalog Size'); ?></th> + <th><?php echo T_('Catalog Time'); ?></th> </tr> <tr> <td><?php echo $stats['connected']; ?></td> @@ -68,14 +68,14 @@ $catalogs = Catalog::get_catalogs(); <col id="col_total" /> </colgroup> <tr class="th-top"> - <th class="cel_catalog"><?php echo _('Name'); ?></th> - <th class="cel_path"><?php echo _('Path'); ?></th> - <th class="cel_lastverify"><?php echo _('Last Verify'); ?></th> - <th class="cel_lastadd"><?php echo _('Last Add'); ?></th> - <th class="cel_lastclean"><?php echo _('Last Clean'); ?></th> - <th class="cel_songs"><?php echo _('Songs'); ?></th> - <th class="cel_video"><?php echo _('Videos'); ?></th> - <th class="cel_total"><?php echo _('Catalog Size'); ?></th> + <th class="cel_catalog"><?php echo T_('Name'); ?></th> + <th class="cel_path"><?php echo T_('Path'); ?></th> + <th class="cel_lastverify"><?php echo T_('Last Verify'); ?></th> + <th class="cel_lastadd"><?php echo T_('Last Add'); ?></th> + <th class="cel_lastclean"><?php echo T_('Last Clean'); ?></th> + <th class="cel_songs"><?php echo T_('Songs'); ?></th> + <th class="cel_video"><?php echo T_('Videos'); ?></th> + <th class="cel_total"><?php echo T_('Catalog Size'); ?></th> </tr> <?php foreach ($catalogs as $catalog_id) { $catalog = new Catalog($catalog_id); diff --git a/templates/show_stats_popular.inc.php b/templates/show_stats_popular.inc.php index 01340054..6e3f49ad 100644 --- a/templates/show_stats_popular.inc.php +++ b/templates/show_stats_popular.inc.php @@ -30,13 +30,13 @@ <div> <?php $objects = Stats::get_top('album'); - $headers = array('f_link'=>_('Most Popular Albums')); + $headers = array('f_link' => T_('Most Popular Albums')); show_box_top('','info-box box_popular_albums'); require Config::get('prefix') . '/templates/show_objects.inc.php'; show_box_bottom(); $objects = Stats::get_top('artist'); - $headers = array('f_name_link'=>_('Most Popular Artists')); + $headers = array('f_name_link' => T_('Most Popular Artists')); show_box_top('','info-box box_popular_artists'); require Config::get('prefix') . '/templates/show_objects.inc.php'; show_box_bottom(); diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php index 6ba7bb8f..215b0141 100644 --- a/templates/show_tagcloud.inc.php +++ b/templates/show_tagcloud.inc.php @@ -37,6 +37,6 @@ $web_path = Config::get('web_path'); <?php echo Ajax::observe('click_' . intval($tag->id),'click',Ajax::action('?page=tag&action=add_filter&browse_id=' . $browse2->id . '&tag_id=' . intval($tag->id),'')); ?> <?php } ?> <?php if (!count($object_ids)) { ?> -<span class="fatalerror"><?php echo _('Not Enough Data'); ?></span> +<span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span> <?php } ?> <?php Ajax::end_container(); ?> diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index fcc070bd..eda139d8 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -36,26 +36,26 @@ </head> <body bgcolor="#f0f0f0"> <div id="header"> -<h1><?php echo _('Ampache Debug'); ?></h1> -<p><?php echo _('You\'ve reached this page because a configuration error has occured. Debug Information below'); ?></p> +<h1><?php echo T_('Ampache Debug'); ?></h1> +<p><?php echo T_('You\'ve reached this page because a configuration error has occured. Debug Information below'); ?></p> </div> <div> <table align="center" cellpadding="3" cellspacing="0"> <tr> - <td><font size="+1"><?php echo _('CHECK'); ?></font></td> + <td><font size="+1"><?php echo T_('CHECK'); ?></font></td> <td> - <font size="+1"><?php echo _('STATUS'); ?></font> + <font size="+1"><?php echo T_('STATUS'); ?></font> </td> - <td><font size="+1"><?php echo _('DESCRIPTION'); ?></font></td> + <td><font size="+1"><?php echo T_('DESCRIPTION'); ?></font></td> </tr> <tr> - <td valign="top"><?php echo _('PHP Version'); ?></td> + <td valign="top"><?php echo T_('PHP Version'); ?></td> <td valign="top">[ <?php if (!check_php_ver()) { echo debug_result('',false); if (function_exists('hash_algos')) { $algos = hash_algos(); } - $string = "<strong>" . phpversion() . " " . _('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . "</strong>"; + $string = "<strong>" . phpversion() . " " . T_('Hash Function Exists') . " " . print_bool(function_exists('hash_algos')) . " " . T_('SHA256 Support') . " " . print_bool(in_array('sha256',$algos)) . "</strong>"; } else { echo debug_result('',true); @@ -64,12 +64,12 @@ ] </td> <td> - <?php echo _('This tests to make sure that you are running a version of PHP that is known to work with Ampache.'); ?> + <?php echo T_('This tests to make sure that you are running a version of PHP that is known to work with Ampache.'); ?> <?php echo $string; ?> </td> </tr> <tr> - <td valign="top"><?php echo _('Mysql for PHP'); ?></td> + <td valign="top"><?php echo T_('Mysql for PHP'); ?></td> <td valign="top">[ <?php if (!check_php_mysql()) { @@ -82,11 +82,11 @@ ] </td> <td> - <?php echo _('This test checks to see if you have the mysql extensions loaded for PHP. These are required for Ampache to work.'); ?> + <?php echo T_('This test checks to see if you have the mysql extensions loaded for PHP. These are required for Ampache to work.'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('PHP Session Support'); ?></td> + <td valign="top"><?php echo T_('PHP Session Support'); ?></td> <td valign="top">[ <?php if (!check_php_session()) { @@ -99,11 +99,11 @@ ] </td> <td> - <?php echo _('This test checks to make sure that you have PHP session support enabled. Sessions are required for Ampache to work.'); ?> + <?php echo T_('This test checks to make sure that you have PHP session support enabled. Sessions are required for Ampache to work.'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('PHP ICONV Support'); ?></td> + <td valign="top"><?php echo T_('PHP ICONV Support'); ?></td> <td valign="top">[ <?php if (!check_php_iconv()) { @@ -115,11 +115,11 @@ ?>] </td> <td> - <?php echo _('This test checks to make sure you have Iconv support installed. Iconv support is required for Ampache'); ?> + <?php echo T_('This test checks to make sure you have Iconv support installed. Iconv support is required for Ampache'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('PHP PCRE Support'); ?></td> + <td valign="top"><?php echo T_('PHP PCRE Support'); ?></td> <td valign="top">[ <?php if (!check_php_pcre()) { @@ -131,11 +131,11 @@ ?>] </td> <td> - <?php echo _('This test makes sure you have PCRE support compiled into your version of PHP, this is required for Ampache.'); ?> + <?php echo T_('This test makes sure you have PCRE support compiled into your version of PHP, this is required for Ampache.'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('PHP Safe Mode'); ?></td> + <td valign="top"><?php echo T_('PHP Safe Mode'); ?></td> <td valign="top">[ <?php if (!check_safemode()) { @@ -147,29 +147,29 @@ ?>] </td> <td> - <?php echo _("This test makes sure that PHP isn't running in safe mode. Some features of Ampache may not work correctly in safe mode."); ?> + <?php echo T_("This test makes sure that PHP isn't running in safe mode. Some features of Ampache may not work correctly in safe mode."); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('Override Memory Limit'); ?></td> + <td valign="top"><?php echo T_('Override Memory Limit'); ?></td> <td valign="top">[ <?php echo debug_result('', check_override_memory()); ?>] </td> <td> - <?php echo _('This tests whether Ampache can override the memory limit. This is not strictly necessary, but may result in a better experience.'); ?> + <?php echo T_('This tests whether Ampache can override the memory limit. This is not strictly necessary, but may result in a better experience.'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('Override Execution Limit'); ?></td> + <td valign="top"><?php echo T_('Override Execution Limit'); ?></td> <td valign="top">[ <?php echo debug_result('', check_override_exec_time()); ?>] </td> <td> - <?php echo _('This tests whether Ampache can override the limit on maximum execution time. This is not strictly necessary, but may result in a better experience.'); ?> + <?php echo T_('This tests whether Ampache can override the limit on maximum execution time. This is not strictly necessary, but may result in a better experience.'); ?> </td> </tr> <tr> - <td valign="top"><?php echo sprintf(_("%s is readable"),"ampache.cfg.php"); ?></td> + <td valign="top"><?php echo sprintf(T_("%s is readable"),"ampache.cfg.php"); ?></td> <td valign="top">[ <?php if (!is_readable($configfile)) { @@ -182,13 +182,13 @@ ] </td> <td width="350px"> - <?php echo _('This attempts to read /config/ampache.cfg.php If this fails either the ampache.cfg.php is not in the correct locations or + <?php echo T_('This attempts to read /config/ampache.cfg.php If this fails either the ampache.cfg.php is not in the correct locations or it is not currently readable by your webserver.'); ?> </td> </tr> <tr> <td valign="top"> - <?php echo _('Ampache.cfg.php Configured?'); ?> + <?php echo T_('Ampache.cfg.php Configured?'); ?> </td> <td valign="top">[ <?php @@ -204,11 +204,11 @@ ] </td> <td> - <?php echo _("This test makes sure that you have set all of the required configuration variables and that we are able to completely parse your config file"); ?> + <?php echo T_("This test makes sure that you have set all of the required configuration variables and that we are able to completely parse your config file"); ?> </td> </tr> <tr> - <td valign="top"><?php echo _("DB Connection"); ?></td> + <td valign="top"><?php echo T_("DB Connection"); ?></td> <td valign="top">[ <?php $db = check_database($results['database_hostname'], $results['database_username'], $results['database_password'],$results['database_name']); @@ -222,11 +222,11 @@ ] </td> <td> - <?php echo _("This attempts to connect to your database using the values from your ampache.cfg.php"); ?> + <?php echo T_("This attempts to connect to your database using the values from your ampache.cfg.php"); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('DB Inserted'); ?></td> + <td valign="top"><?php echo T_('DB Inserted'); ?></td> <td valign="top">[ <?php $db_inserted = check_database_inserted($db,$results['local_db']); @@ -240,12 +240,12 @@ ] </td> <td> - <?php echo _('This checks a few key tables to make sure that you have successfully inserted the ampache database and that the user has access to the database'); ?> + <?php echo T_('This checks a few key tables to make sure that you have successfully inserted the ampache database and that the user has access to the database'); ?> </td> </tr> <tr> - <td valign="top"><?php echo _('Web Path'); ?></td> + <td valign="top"><?php echo T_('Web Path'); ?></td> <td valign="top">[ <?php /* @@ -269,7 +269,7 @@ ] </td> <td> - <?php echo _('This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark here then your web_path is not set correctly.'); ?> + <?php echo T_('This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark here then your web_path is not set correctly.'); ?> </td> </tr> </table> diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php index 5a493bff..b78c0dff 100644 --- a/templates/show_test_config.inc.php +++ b/templates/show_test_config.inc.php @@ -44,7 +44,7 @@ body { </head> <body bgcolor="#f0f0f0"> <div id="header"> -<h1><?php echo _('Ampache Debug'); ?></h1> +<h1><?php echo T_('Ampache Debug'); ?></h1> <p>Ampache.cfg.php error detected</p> </div> <div id="content"> diff --git a/templates/show_update_items.inc.php b/templates/show_update_items.inc.php index c952dc41..0466f876 100644 --- a/templates/show_update_items.inc.php +++ b/templates/show_update_items.inc.php @@ -26,10 +26,10 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Starting Update from Tags'), 'box box_update_items'); +show_box_top(T_('Starting Update from Tags'), 'box box_update_items'); Catalog::update_single_item($type,$object_id); ?> <br /> -<strong><?php echo _('Update from Tags Complete'); ?></strong> -<a class="button" href="<?php echo $target_url; ?>"><?php echo _('Continue'); ?></a> +<strong><?php echo T_('Update from Tags Complete'); ?></strong> +<a class="button" href="<?php echo $target_url; ?>"><?php echo T_('Continue'); ?></a> <?php show_box_bottom(); ?> diff --git a/templates/show_user.inc.php b/templates/show_user.inc.php index cc085055..653cfd32 100644 --- a/templates/show_user.inc.php +++ b/templates/show_user.inc.php @@ -26,27 +26,27 @@ * @link http://www.ampache.org/ */ -$last_seen = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen) : _('Never'); -$create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : _('Unknown'); +$last_seen = $client->last_seen ? date("m\/d\/y - H:i",$client->last_seen) : T_('Never'); +$create_date = $client->create_date ? date("m\/d\/y - H:i",$client->create_date) : T_('Unknown'); $client->format(); ?> <?php show_box_top($client->fullname); ?> <table cellspacing="0"> <tr> <td valign="top"> - <strong><?php echo _('Full Name'); ?>:</strong> <?php echo $client->fullname; ?><br /> - <strong><?php echo _('Create Date'); ?>:</strong> <?php echo $create_date; ?><br /> - <strong><?php echo _('Last Seen'); ?>:</strong> <?php echo $last_seen; ?><br /> - <strong><?php echo _('Activity'); ?>:</strong> <?php echo $client->f_useage; ?><br /> + <strong><?php echo T_('Full Name'); ?>:</strong> <?php echo $client->fullname; ?><br /> + <strong><?php echo T_('Create Date'); ?>:</strong> <?php echo $create_date; ?><br /> + <strong><?php echo T_('Last Seen'); ?>:</strong> <?php echo $last_seen; ?><br /> + <strong><?php echo T_('Activity'); ?>:</strong> <?php echo $client->f_useage; ?><br /> <?php if ($client->is_logged_in() AND $client->is_online()) { ?> - <i style="color:green;"><?php echo _('User is Online Now'); ?></i> + <i style="color:green;"><?php echo T_('User is Online Now'); ?></i> <?php } else { ?> - <i style="color:red;"><?php echo _('User is Offline Now'); ?></i> + <i style="color:red;"><?php echo T_('User is Offline Now'); ?></i> <?php } ?> </td> <td valign="top"> - <h2><?php echo _('Active Playlist'); ?></h2> + <h2><?php echo T_('Active Playlist'); ?></h2> <div style="padding-left:10px;"> <?php $tmp_playlist = new tmpPlaylist(tmpPlaylist::get_from_userid($client->id)); diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php index af8caf19..71307724 100644 --- a/templates/show_user_activate.inc.php +++ b/templates/show_user_activate.inc.php @@ -33,14 +33,14 @@ $web_path = Config::get('web_path'); <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> -<title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title> +<title><?php echo Config::get('site_title'); ?> - <?php echo T_('Registration'); ?></title> <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" /> <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> </head> <body> <div id="header"> <h1><?php echo Config::get('site_title'); ?></h1> -<?php echo _('Registration'); ?>... +<?php echo T_('Registration'); ?>... </div> <script src="<?php echo $web_path; ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> @@ -52,15 +52,15 @@ $web_path = Config::get('web_path'); if ($validation == User::get_validation($username) AND strlen($validation)) { User::activate_user($username); ?> -<h3><?php echo _('User Activated'); ?></h3> +<h3><?php echo T_('User Activated'); ?></h3> <p> <?php /* HINT: Start A tag, End A tag */ - printf(_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?> + printf(T_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?> </p> <?php } else { ?> -<h3><?php echo _('Validation Failed'); ?></h3> -<p><?php echo _("The validation key used isn't correct"); ?></p> +<h3><?php echo T_('Validation Failed'); ?></h3> +<p><?php echo T_("The validation key used isn't correct"); ?></p> <?php } ?> </div><!--end <div>id="maincontainer--> <div id="bottom"> diff --git a/templates/show_user_preferences.inc.php b/templates/show_user_preferences.inc.php index ead20fee..f179f768 100644 --- a/templates/show_user_preferences.inc.php +++ b/templates/show_user_preferences.inc.php @@ -32,7 +32,7 @@ */ ?> -<?php /* HINT: Editing Username preferences */ show_box_top(sprintf(_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?> +<?php /* HINT: Editing Username preferences */ show_box_top(sprintf(T_('Editing %s preferences'), $client->fullname),'box box_preferences'); ?> <form method="post" name="preferences" action="<?php echo Config::get('web_path'); ?>/preferences.php?action=admin_update_preferences" enctype="multipart/form-data"> <table class="tabledata" cellspacing="0"> <colgroup> @@ -40,12 +40,12 @@ <col id="col_value" /> </colgroup> <tr class="th-top"> - <th class="col_preference"><?php echo _('Preference'); ?></th> - <th class="col_value"><?php echo _('Value'); ?></th> + <th class="col_preference"><?php echo T_('Preference'); ?></th> + <th class="col_value"><?php echo T_('Value'); ?></th> </tr> <?php foreach ($preferences as $pref) { ?> <tr class="<?php echo flip_class(); ?>"> - <td class="cel_preference"><?php echo _($pref['description']); ?></td> + <td class="cel_preference"><?php echo T_($pref['description']); ?></td> <td class="cel_value"> <?php create_preference_input($pref['name'], $pref['value']); ?> </td> @@ -54,7 +54,7 @@ <tr> <td> <div class="formValidation"> - <input class="button" type="submit" value="<?php echo _('Update Preferences'); ?>" /> + <input class="button" type="submit" value="<?php echo T_('Update Preferences'); ?>" /> <?php echo Core::form_register('update_preference'); ?> <input type="hidden" name="user_id" value="<?php echo scrub_out($_REQUEST['user_id']); ?>" /> </div> diff --git a/templates/show_user_recommendations.inc.php b/templates/show_user_recommendations.inc.php index 3d163ae5..6b2e761a 100644 --- a/templates/show_user_recommendations.inc.php +++ b/templates/show_user_recommendations.inc.php @@ -34,10 +34,10 @@ <?php if (count($recommended_artists)) { $items = $working_user->format_recommendations($recommended_artists,'artist'); - show_info_box(_('Recommended Artists'),'artist',$items); + show_info_box(T_('Recommended Artists'),'artist',$items); } else { - echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; } ?> </td> @@ -45,10 +45,10 @@ <?php if (count($recommended_albums)) { $items = $working_user->format_recommendations($recommended_albums,'album'); - show_info_box(_('Recommended Albums'),'album',$items); + show_info_box(T_('Recommended Albums'),'album',$items); } else { - echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; } ?> </td> @@ -56,10 +56,10 @@ <?php if (count($recommended_songs)) { $items = $working_user->format_recommendations($recommended_songs,'song'); - show_info_box(_('Recommended Songs'),'song',$items); + show_info_box(T_('Recommended Songs'),'song',$items); } else { - echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; } ?> </td> diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index 2d9ce3a8..27f951a6 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -33,7 +33,7 @@ $web_path = Config::get('web_path'); <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> <head> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> -<title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title> +<title><?php echo Config::get('site_title'); ?> - <?php echo T_('Registration'); ?></title> <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?><?php echo Config::get('theme_path'); ?>/templates/default.css" type="text/css" media="screen" /> <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> </head> @@ -45,7 +45,7 @@ $web_path = Config::get('web_path'); <div id="maincontainer"> <div id="header"> <h1><?php echo scrub_out(Config::get('site_title')); ?></h1> -<span><?php echo _('Registration'); ?>...</span> +<span><?php echo T_('Registration'); ?>...</span> </div> <?php @@ -59,50 +59,50 @@ $email = scrub_in($_REQUEST['email']); <?php /* If we should show the user agreement */ if (Config::get('user_agreement')) { ?> -<h3><?php echo _('User Agreement'); ?></h3> +<h3><?php echo T_('User Agreement'); ?></h3> <div class="registrationAgreement"> <div class="agreementContent"> <?php Registration::show_agreement(); ?> </div> <div class="agreementCheckbox"> - <input type='checkbox' name='accept_agreement' /> <?php echo _('I Accept'); ?> + <input type='checkbox' name='accept_agreement' /> <?php echo T_('I Accept'); ?> <?php Error::display('user_agreement'); ?> </div> </div> <?php } // end if(conf('user_agreement')) ?> -<h3><?php echo _('User Information'); ?></h3> +<h3><?php echo T_('User Information'); ?></h3> <div class="registerfield require"> - <label for="username"><?php echo _('Username'); ?>: <span class="asterix">*</span></label> + <label for="username"><?php echo T_('Username'); ?>: <span class="asterix">*</span></label> <input type='text' name='username' id='username' value='<?php echo scrub_out($username); ?>' /> <?php Error::display('username'); ?> <?php Error::display('duplicate_user'); ?> </div> <div class="registerfield require"> - <label for="fullname"><?php echo _('Full Name'); ?>: <span class="asterix">*</span></label> + <label for="fullname"><?php echo T_('Full Name'); ?>: <span class="asterix">*</span></label> <input type='text' name='fullname' id='fullname' value='<?php echo scrub_out($fullname); ?>' /> <?php Error::display('fullname'); ?> </div> <div class="registerfield require"> - <label for="email"><?php echo _('E-mail'); ?>: <span class="asterix">*</span></label> + <label for="email"><?php echo T_('E-mail'); ?>: <span class="asterix">*</span></label> <input type='text' name='email' id='email' value='<?php echo scrub_out($email); ?>' /> <?php Error::display('email'); ?> </div> <div class="registerfield require"> - <label for="password"><?php echo _('Password'); ?>: <span class="asterix">*</span></label> + <label for="password"><?php echo T_('Password'); ?>: <span class="asterix">*</span></label> <input type='password' name='password_1' id='password_1' /> <?php Error::display('password'); ?> </div> <div class="registerfield require"> - <label for="confirm_passord"><?php echo _('Confirm Password'); ?>: <span class="asterix">*</span></label> + <label for="confirm_passord"><?php echo T_('Confirm Password'); ?>: <span class="asterix">*</span></label> <input type='password' name='password_2' id='password_2' /> </div> <div class="registerInformation"> - <span><?php echo _('* Required fields'); ?></span> + <span><?php echo T_('* Required fields'); ?></span> </div> <?php if (Config::get('captcha_public_reg')) { ?> @@ -112,7 +112,7 @@ if (Config::get('user_agreement')) { ?> <div class="registerButtons"> <input type="hidden" name="action" value="add_user" /> - <input type='submit' name='submit_registration' id='submit_registration' value='<?php echo _('Register User'); ?>' /> + <input type='submit' name='submit_registration' id='submit_registration' value='<?php echo T_('Register User'); ?>' /> </div> </form> </div><!-- end <div id="registerbox--> @@ -120,7 +120,7 @@ if (Config::get('user_agreement')) { ?> <div id="footer"> <a href="http://www.ampache.org/index.php">Ampache v.<?php echo Config::get('version'); ?></a><br /> Copyright (c) 2001 - 2010 Ampache.org - <?php echo _('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo _('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> + <?php echo T_('Queries:'); ?><?php echo Dba::$stats['query']; ?> <?php echo T_('Cache Hits:'); ?><?php echo database_object::$cache_hit; ?> </div> </body> </html> diff --git a/templates/show_user_row.inc.php b/templates/show_user_row.inc.php index 13ec72e7..93f783e4 100644 --- a/templates/show_user_row.inc.php +++ b/templates/show_user_row.inc.php @@ -43,18 +43,18 @@ </td> <?php } ?> <td class="cel_action"> - <a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('edit', _('Edit')); ?></a> - <a href="<?php echo $web_path; ?>/admin/users.php?action=show_preferences&user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('preferences', _('Preferences')); ?></a> + <a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('edit', T_('Edit')); ?></a> + <a href="<?php echo $web_path; ?>/admin/users.php?action=show_preferences&user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('preferences', T_('Preferences')); ?></a> <?php //FIXME: Fix this for the extra permission levels if ($client->disabled == '1') { - echo "<a href=\"".$web_path."/admin/users.php?action=enable&user_id=$client->id\">" . get_user_icon('enable', _('Enable')) . "</a>"; + echo "<a href=\"".$web_path."/admin/users.php?action=enable&user_id=$client->id\">" . get_user_icon('enable', T_('Enable')) . "</a>"; } else { - echo "<a href=\"".$web_path."/admin/users.php?action=disable&user_id=$client->id\">" . get_user_icon('disable', _('Disable')) ."</a>"; + echo "<a href=\"".$web_path."/admin/users.php?action=disable&user_id=$client->id\">" . get_user_icon('disable', T_('Disable')) ."</a>"; } ?> - <a href="<?php echo $web_path; ?>/admin/users.php?action=delete&user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('delete', _('Delete')); ?></a> + <a href="<?php echo $web_path; ?>/admin/users.php?action=delete&user_id=<?php echo $client->id; ?>"><?php echo get_user_icon('delete', T_('Delete')); ?></a> </td> <?php if (($client->is_logged_in()) AND ($client->is_online())) { diff --git a/templates/show_user_stats.inc.php b/templates/show_user_stats.inc.php index 9d812672..10ca28f5 100644 --- a/templates/show_user_stats.inc.php +++ b/templates/show_user_stats.inc.php @@ -35,11 +35,11 @@ if (count($favorite_artists)) { $items = $working_user->format_favorites($favorite_artists); $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=artist">' . - get_user_icon('all', _('Favorite Artists')) . '</a> ' . _('Favorite Artists'); + get_user_icon('all', T_('Favorite Artists')) . '</a> ' . T_('Favorite Artists'); show_info_box($title,'artist',$items); } else { - echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; } ?> </td> @@ -48,11 +48,11 @@ if (count($favorite_albums)) { $items = $working_user->format_favorites($favorite_albums); $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=album">' . - get_user_icon('all', _('Favorite Albums')) . '</a> ' . _('Favorite Albums'); + get_user_icon('all', T_('Favorite Albums')) . '</a> ' . T_('Favorite Albums'); show_info_box($title,'album',$items); } else { - echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; } ?> </td> @@ -61,11 +61,11 @@ if (count($favorite_songs)) { $items = $working_user->format_favorites($favorite_songs); $title = '<a href="' . Config::get('web_path') . '/stream.php?action=play_favorite&type=song">' . - get_user_icon('all', _('Favorite Songs')) . '</a> ' . _('Favorite Songs'); + get_user_icon('all', T_('Favorite Songs')) . '</a> ' . T_('Favorite Songs'); show_info_box($title,'your_song',$items); } else { - echo "<span class=\"error\">" . _('Not Enough Data') . "</span>"; + echo "<span class=\"error\">" . T_('Not Enough Data') . "</span>"; } ?> </td> diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index 552d4b19..ae789f4b 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -43,36 +43,36 @@ $web_path = Config::get('web_path'); <col id="col_online" /> </colgroup> <tr class="th-top"> - <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname',_('Fullname'),'users_sort_fullname'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username',_('Username'),'users_sort_username');?>)</th> - <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen',_('Last Seen'),'users_sort_lastseen'); ?></th> - <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date',_('Registration Date'),'users_sort_createdate'); ?></th> - <th class="cel_activity"><?php echo _('Activity'); ?></th> + <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname', T_('Fullname'),'users_sort_fullname'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'),'users_sort_username');?>)</th> + <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen', T_('Last Seen'),'users_sort_lastseen'); ?></th> + <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date', T_('Registration Date'),'users_sort_createdate'); ?></th> + <th class="cel_activity"><?php echo T_('Activity'); ?></th> <?php if (Config::get('track_user_ip')) { ?> - <th class="cel_lastip"><?php echo _('Last Ip'); ?></th> + <th class="cel_lastip"><?php echo T_('Last Ip'); ?></th> <?php } ?> - <th class="cel_action"><?php echo _('Action'); ?></th> - <th class="cel_online"><?php echo _('On-line'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_online"><?php echo T_('On-line'); ?></th> </tr> <?php foreach ($object_ids as $user_id) { $client = new User($user_id); $client->format(); - $last_seen = $client->last_seen ? date("m\/d\/Y - H:i",$client->last_seen) : _('Never'); - $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : _('Unknown'); + $last_seen = $client->last_seen ? date("m\/d\/Y - H:i",$client->last_seen) : T_('Never'); + $create_date = $client->create_date ? date("m\/d\/Y - H:i",$client->create_date) : T_('Unknown'); ?> <tr class="<?php echo flip_class(); ?>" align="center" id="admin_user_<?php echo $client->id; ?>"> <?php require Config::get('prefix') . '/templates/show_user_row.inc.php'; ?> </tr> <?php } //end foreach users ?> <tr class="th-bottom"> - <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname',_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username',_('Username'),'users_sort_username1');?>)</th> - <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen',_('Last Seen'),'users_sort_lastseen1'); ?></th> - <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date',_('Registration Date'),'users_sort_createdate1'); ?></th> - <th class="cel_activity"><?php echo _('Activity'); ?></th> + <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=fullname', T_('Fullname'),'users_sort_fullname1'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=username', T_('Username'),'users_sort_username1');?>)</th> + <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=last_seen', T_('Last Seen'),'users_sort_lastseen1'); ?></th> + <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&type=user&sort=create_date', T_('Registration Date'),'users_sort_createdate1'); ?></th> + <th class="cel_activity"><?php echo T_('Activity'); ?></th> <?php if (Config::get('track_user_ip')) { ?> - <th class="cel_lastip"><?php echo _('Last Ip'); ?></th> + <th class="cel_lastip"><?php echo T_('Last Ip'); ?></th> <?php } ?> - <th class="cel_action"><?php echo _('Action'); ?></th> - <th class="cel_online"><?php echo _('On-line'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> + <th class="cel_online"><?php echo T_('On-line'); ?></th> </tr> </table> diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php index 4786c703..a9004b5e 100644 --- a/templates/show_verify_catalog.inc.php +++ b/templates/show_verify_catalog.inc.php @@ -26,13 +26,13 @@ * @link http://www.ampache.org/ */ -show_box_top(_('Verify Catalog'), 'box box_verify_catalog'); +show_box_top(T_('Verify Catalog'), 'box box_verify_catalog'); /* HINT: Catalog Name */ -printf(_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>"); +printf(T_('Updating the %s catalog'), "<strong>[ $this->name ]</strong>"); echo "<br />\n"; printf(ngettext('%d item found checking tag information', '%d items found checking tag information', $number), $number); echo "<br />\n\n"; -echo _('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />'; -echo _('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />'; +echo T_('Verified') . ': <span id="verify_count_' . $this->id . '">' . $catalog_verify_found . '</span><br />'; +echo T_('Reading') . ': <span id="verify_dir_' . $this->id . '">' . $catalog_verify_directory . '</span><br />'; show_box_bottom(); ?> diff --git a/templates/show_video_row.inc.php b/templates/show_video_row.inc.php index 6f0ebd1f..e34c4bff 100644 --- a/templates/show_video_row.inc.php +++ b/templates/show_video_row.inc.php @@ -28,7 +28,7 @@ ?> <td class="cel_add"> - <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add',_('Add'),'add_video_' . $video->id); ?> + <?php echo Ajax::button('?action=basket&type=video&id=' . $video->id,'add', T_('Add'),'add_video_' . $video->id); ?> </td> <td class="cel_title"><?php echo $video->f_title; ?></td> <td class="cel_codec"><?php echo $video->f_codec; ?></td> @@ -37,6 +37,6 @@ <td class="cel_tags"><?php $video->f_tags; ?></td> <td class="cel_action"> <?php if (Access::check_function('download')) { ?> - <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&type=video&oid=<?php echo $video->id; ?>"><?php echo get_user_icon('download',_('Download')); ?></a> + <a href="<?php echo Config::get('web_path'); ?>/stream.php?action=download&type=video&oid=<?php echo $video->id; ?>"><?php echo get_user_icon('download', T_('Download')); ?></a> <?php } ?> </td> diff --git a/templates/show_videos.inc.php b/templates/show_videos.inc.php index a4fe0741..90a2b700 100644 --- a/templates/show_videos.inc.php +++ b/templates/show_videos.inc.php @@ -41,13 +41,13 @@ $web_path = Config::get('web_path'); <col id="col-action" /> </colgroup> <tr class="th-top"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=title',_('Title'),'sort_video_title'); ?></th> - <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=codec',_('Codec'),'sort_video_codec'); ?></th> - <th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=resolution',_('Resolution'),'sort_video_rez'); ?></th> - <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length',_('Time'),'sort_video_length'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_title"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=title', T_('Title'),'sort_video_title'); ?></th> + <th class="cel_codec"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=codec', T_('Codec'),'sort_video_codec'); ?></th> + <th class="cel_resolution"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=resolution', T_('Resolution'),'sort_video_rez'); ?></th> + <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length', T_('Time'),'sort_video_length'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> <?php /* Foreach through every artist that has been passed to us */ @@ -61,17 +61,17 @@ foreach ($object_ids as $video_id) { <?php } //end foreach ?> <?php if (!count($object_ids)) { ?> <tr class="<?php echo flip_class(); ?>"> - <td colspan="7"><span class="fatalerror"><?php echo _('Not Enough Data'); ?></span></td> + <td colspan="7"><span class="fatalerror"><?php echo T_('Not Enough Data'); ?></span></td> </tr> <?php } ?> <tr class="th-bottom"> - <th class="cel_add"><?php echo _('Add'); ?></th> - <th class="cel_title"><?php echo _('Title'); ?></th> - <th class="cel_codec"><?php echo _('Codec'); ?></th> - <th class="cel_resolution"><?php echo _('Resolution'); ?></th> - <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length',_('Time'),'sort_video_length_bottom'); ?></th> - <th class="cel_tags"><?php echo _('Tags'); ?></th> - <th class="cel_action"><?php echo _('Action'); ?></th> + <th class="cel_add"><?php echo T_('Add'); ?></th> + <th class="cel_title"><?php echo T_('Title'); ?></th> + <th class="cel_codec"><?php echo T_('Codec'); ?></th> + <th class="cel_resolution"><?php echo T_('Resolution'); ?></th> + <th class="cel_length"><?php echo Ajax::text('?page=browse&action=set_sort&type=video&sort=length', T_('Time'),'sort_video_length_bottom'); ?></th> + <th class="cel_tags"><?php echo T_('Tags'); ?></th> + <th class="cel_action"><?php echo T_('Action'); ?></th> </tr> </table> <?php require Config::get('prefix') . '/templates/list_header.inc.php'; ?> diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php index f1d980a0..00685bc4 100644 --- a/templates/sidebar.inc.php +++ b/templates/sidebar.inc.php @@ -31,11 +31,11 @@ $class_name = 'sidebar_' . $_SESSION['state']['sidebar_tab']; ${$class_name} = ' active'; // List of buttons ( id, title, icon, access level) -$sidebar_items[] = array('id'=>'home', 'title'=>_('Home'), 'icon'=>'home', 'access'=>5); -$sidebar_items[] = array('id'=>'localplay', 'title'=>_('Localplay'), 'icon'=>'volumeup', 'access'=>5); -$sidebar_items[] = array('id'=>'preferences', 'title'=>_('Preferences'), 'icon'=>'edit', 'access'=>5); -$sidebar_items[] = array('id'=>'modules','title'=>_('Modules'),'icon'=>'plugin','access'=>100); -$sidebar_items[] = array('id'=>'admin', 'title'=>_('Admin'), 'icon'=>'admin', 'access'=>100); +$sidebar_items[] = array('id'=>'home', 'title' => T_('Home'), 'icon'=>'home', 'access'=>5); +$sidebar_items[] = array('id'=>'localplay', 'title' => T_('Localplay'), 'icon'=>'volumeup', 'access'=>5); +$sidebar_items[] = array('id'=>'preferences', 'title' => T_('Preferences'), 'icon'=>'edit', 'access'=>5); +$sidebar_items[] = array('id'=>'modules','title' => T_('Modules'),'icon'=>'plugin','access'=>100); +$sidebar_items[] = array('id'=>'admin', 'title' => T_('Admin'), 'icon'=>'admin', 'access'=>100); $web_path = Config::get('web_path'); @@ -65,7 +65,7 @@ $ajax_url = Config::get('ajax_url'); ?> <li id="sb_tab_logout" class="sb1"> <a href="<?php echo Config::get('web_path'); ?>/logout.php" id="sidebar_logout" > - <?php echo get_user_icon('logout',_('Logout')); ?> + <?php echo get_user_icon('logout', T_('Logout')); ?> </a> </li> </ul> diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php index 789d654d..eda90e7c 100644 --- a/templates/sidebar_admin.inc.php +++ b/templates/sidebar_admin.inc.php @@ -28,44 +28,44 @@ ?> <ul class="sb2" id="sb_admin"> - <li><h4><?php echo _('Catalogs'); ?></h4> + <li><h4><?php echo T_('Catalogs'); ?></h4> <ul class="sb3" id="sb_admin_catalogs"> - <li id="sb_admin_catalogs_Add"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo _('Add a Catalog'); ?></a></li> - <li id="sb_admin_catalogs_Show"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo _('Show Catalogs'); ?></a></li> + <li id="sb_admin_catalogs_Add"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_add_catalog"><?php echo T_('Add a Catalog'); ?></a></li> + <li id="sb_admin_catalogs_Show"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=show_catalogs"><?php echo T_('Show Catalogs'); ?></a></li> </ul> </li> - <li><h4><?php echo _('User Tools'); ?></h4> + <li><h4><?php echo T_('User Tools'); ?></h4> <ul class="sb3" id="sb_admin_ut"> - <li id="sb_admin_ut_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo _('Add User'); ?></a></li> - <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li> + <li id="sb_admin_ut_AddUser"><a href="<?php echo $web_path; ?>/admin/users.php?action=show_add_user"><?php echo T_('Add User'); ?></a></li> + <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo T_('Browse Users'); ?></a></li> </ul> </li> - <li><h4><?php echo _('Access Control'); ?></h4> + <li><h4><?php echo T_('Access Control'); ?></h4> <ul class="sb3" id="sb_admin_acl"> - <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_advanced"><?php echo _('Add ACL'); ?></a></li> - <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo _('Show ACL(s)'); ?></a></li> + <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_advanced"><?php echo T_('Add ACL'); ?></a></li> + <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo T_('Show ACL(s)'); ?></a></li> </ul> </li> - <li><h4><?php echo _('Other Tools'); ?></h4> + <li><h4><?php echo T_('Other Tools'); ?></h4> <ul class="sb3" id="sb_admin_ot"> - <li id="sb_admin_ot_Debug"><a href="<?php echo $web_path; ?>/admin/system.php?action=show_debug"><?php echo _('Ampache Debug'); ?></a></li> - <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li> - <li id="sb_admin_ot_ExportCatalog"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo _('Export Catalog'); ?></a></li> + <li id="sb_admin_ot_Debug"><a href="<?php echo $web_path; ?>/admin/system.php?action=show_debug"><?php echo T_('Ampache Debug'); ?></a></li> + <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo T_('Clear Now Playing'); ?></a></li> + <li id="sb_admin_ot_ExportCatalog"><a href="<?php echo $web_path; ?>/admin/export.php"><?php echo T_('Export Catalog'); ?></a></li> <?php if (Config::get('shoutbox')) { ?> - <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php"><?php echo _('Manage Shoutbox'); ?></a></li> + <li id="sb_admin_ot_ManageShoutbox"><a href="<?php echo $web_path; ?>/admin/shout.php"><?php echo T_('Manage Shoutbox'); ?></a></li> <?php } ?> </ul> </li> <?php if (Access::check('interface','100')) { ?> - <li><h4><?php echo _('Server Config'); ?></h4> + <li><h4><?php echo T_('Server Config'); ?></h4> <ul class="sb3" id="sb_preferences_sc"> <?php $catagories = Preference::get_catagories(); foreach ($catagories as $name) { $f_name = ucfirst($name); ?> - <li id="sb_preferences_sc_<?php echo $f_name; ?>"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=<?php echo $name; ?>"><?php echo _($f_name); ?></a></li> + <li id="sb_preferences_sc_<?php echo $f_name; ?>"><a href="<?php echo $web_path; ?>/preferences.php?action=admin&tab=<?php echo $name; ?>"><?php echo T_($f_name); ?></a></li> <?php } ?> </ul> </li> diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php index 8c7fd25d..186bd7e1 100644 --- a/templates/sidebar_home.inc.php +++ b/templates/sidebar_home.inc.php @@ -29,7 +29,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?> <ul class="sb2" id="sb_home"> - <li><h4><?php echo _('Browse'); ?></h4> + <li><h4><?php echo T_('Browse'); ?></h4> <?php // Build the selected dealie if (isset($_REQUEST['action'])) { @@ -38,23 +38,23 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); } ?> <ul class="sb3" id="sb_browse_bb"> - <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo _('Song Titles'); ?></a></li> - <li id="sb_browse_bb_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo _('Albums'); ?></a></li> - <li id="sb_browse_bb_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo _('Artists'); ?></a></li> - <li id="sb_browse_bb_Tags"><a href="<?php echo $web_path; ?>/browse.php?action=tag"><?php echo _('Tag Cloud'); ?></a></li> - <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo _('Playlists'); ?></a></li> - <li id="sb_browse_bb_SmartPlaylist"><a href="<?php echo $web_path; ?>/browse.php?action=smartplaylist"><?php echo _('Smart Playlists'); ?></a></li> - <li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo _('Radio Stations'); ?></a></li> - <li id="sb_browse_bb_Video"><a href="<?php echo $web_path; ?>/browse.php?action=video"><?php echo _('Videos'); ?></a></li> + <li id="sb_browse_bb_SongTitle"><a href="<?php echo $web_path; ?>/browse.php?action=song"><?php echo T_('Song Titles'); ?></a></li> + <li id="sb_browse_bb_Album"><a href="<?php echo $web_path; ?>/browse.php?action=album"><?php echo T_('Albums'); ?></a></li> + <li id="sb_browse_bb_Artist"><a href="<?php echo $web_path; ?>/browse.php?action=artist"><?php echo T_('Artists'); ?></a></li> + <li id="sb_browse_bb_Tags"><a href="<?php echo $web_path; ?>/browse.php?action=tag"><?php echo T_('Tag Cloud'); ?></a></li> + <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/browse.php?action=playlist"><?php echo T_('Playlists'); ?></a></li> + <li id="sb_browse_bb_SmartPlaylist"><a href="<?php echo $web_path; ?>/browse.php?action=smartplaylist"><?php echo T_('Smart Playlists'); ?></a></li> + <li id="sb_browse_bb_RadioStation"><a href="<?php echo $web_path; ?>/browse.php?action=live_stream"><?php echo T_('Radio Stations'); ?></a></li> + <li id="sb_browse_bb_Video"><a href="<?php echo $web_path; ?>/browse.php?action=video"><?php echo T_('Videos'); ?></a></li> </ul> </li> <?php Ajax::start_container('browse_filters'); ?> <?php Ajax::end_container(); ?> - <li><h4><?php echo _('Playlist'); ?></h4> + <li><h4><?php echo T_('Playlist'); ?></h4> <ul class="sb3" id="sb_home_info"> - <li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo _('Currently Playing'); ?></a></li> + <li id="sb_home_info_CurrentlyPlaying"><a href="<?php echo $web_path; ?>/index.php"><?php echo T_('Currently Playing'); ?></a></li> <?php if (Config::get('allow_democratic_playback')) { ?> - <li id="sb_home_democratic_playlist"><a href="<?php echo $web_path; ?>/democratic.php?action=show_playlist"><?php echo _('Democratic'); ?></a></li> + <li id="sb_home_democratic_playlist"><a href="<?php echo $web_path; ?>/democratic.php?action=show_playlist"><?php echo T_('Democratic'); ?></a></li> <?php } ?> <?php if ($server_allow = Config::get('allow_localplay_playback') AND $controller = Config::get('localplay_controller') AND $access_check = Access::check('localplay','5')) { ?> <?php @@ -63,32 +63,32 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); $current_instance = $localplay->current_instance(); $class = $current_instance ? '' : ' class="active_instance"'; ?> - <li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo _('Localplay'); ?></a></li> + <li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo T_('Localplay'); ?></a></li> <?php } ?> - <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/playlist.php?action=show_import_playlist"><?php echo _('Import'); ?></a></li> + <li id="sb_browse_bb_Playlist"><a href="<?php echo $web_path; ?>/playlist.php?action=show_import_playlist"><?php echo T_('Import'); ?></a></li> </ul> </li> - <li><h4><?php echo _('Random'); ?></h4> + <li><h4><?php echo T_('Random'); ?></h4> <ul class="sb3" id="sb_home_random"> - <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album',_('Album'),'home_random_album'); ?></li> - <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist',_('Artist'),'home_random_artist'); ?></li> - <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist',_('Playlist'),'home_random_playlist'); ?></li> - <li id="sb_home_random_advanced"><a href="<?php echo $web_path; ?>/random.php?action=advanced&type=song"><?php echo _('Advanced'); ?></a></li> + <li id="sb_home_random_album"><?php echo Ajax::text('?page=random&action=album', T_('Album'),'home_random_album'); ?></li> + <li id="sb_home_random_artist"><?php echo Ajax::text('?page=random&action=artist', T_('Artist'),'home_random_artist'); ?></li> + <li id="sb_home_random_playlist"><?php echo Ajax::text('?page=random&action=playlist', T_('Playlist'),'home_random_playlist'); ?></li> + <li id="sb_home_random_advanced"><a href="<?php echo $web_path; ?>/random.php?action=advanced&type=song"><?php echo T_('Advanced'); ?></a></li> </ul> </li> - <li><h4><?php echo _('Information'); ?></h4> + <li><h4><?php echo T_('Information'); ?></h4> <ul class="sb3" id="sb_home_info"> - <li id="sb_home_info_Statistics"><a href="<?php echo $web_path; ?>/stats.php?action=show"><?php echo _('Statistics'); ?></a></li> - <li id="sb_home_info_Newest"><a href="<?php echo $web_path; ?>/stats.php?action=newest"><?php echo _('Newest'); ?></a></li> - <li id="sb_home_info_Popular"><a href="<?php echo $web_path; ?>/stats.php?action=popular"><?php echo _('Popular'); ?></a></li> + <li id="sb_home_info_Statistics"><a href="<?php echo $web_path; ?>/stats.php?action=show"><?php echo T_('Statistics'); ?></a></li> + <li id="sb_home_info_Newest"><a href="<?php echo $web_path; ?>/stats.php?action=newest"><?php echo T_('Newest'); ?></a></li> + <li id="sb_home_info_Popular"><a href="<?php echo $web_path; ?>/stats.php?action=popular"><?php echo T_('Popular'); ?></a></li> </ul> </li> - <li><h4><?php echo _('Search'); ?></h4> + <li><h4><?php echo T_('Search'); ?></h4> <ul class="sb3" id="sb_home_search"> - <li id="sb_home_search_song"><a href="<?php echo $web_path; ?>/search.php?type=song"><?php echo _('Songs'); ?></a></li> - <li id="sb_home_search_album"><a href="<?php echo $web_path; ?>/search.php?type=album"><?php echo _('Albums'); ?></a></li> - <li id="sb_home_search_artist"><a href="<?php echo $web_path; ?>/search.php?type=artist"><?php echo _('Artists'); ?></a></li> - <li id="sb_home_search_video"><a href="<?php echo $web_path; ?>/search.php?type=video"><?php echo _('Videos'); ?></a></li> + <li id="sb_home_search_song"><a href="<?php echo $web_path; ?>/search.php?type=song"><?php echo T_('Songs'); ?></a></li> + <li id="sb_home_search_album"><a href="<?php echo $web_path; ?>/search.php?type=album"><?php echo T_('Albums'); ?></a></li> + <li id="sb_home_search_artist"><a href="<?php echo $web_path; ?>/search.php?type=artist"><?php echo T_('Artists'); ?></a></li> + <li id="sb_home_search_video"><a href="<?php echo $web_path; ?>/search.php?type=video"><?php echo T_('Videos'); ?></a></li> </ul> </li> </ul> diff --git a/templates/sidebar_localplay.inc.php b/templates/sidebar_localplay.inc.php index 7339e2a9..a689e497 100644 --- a/templates/sidebar_localplay.inc.php +++ b/templates/sidebar_localplay.inc.php @@ -37,19 +37,19 @@ $class = $current_instance ? '' : ' class="active_instance"'; ?> <?php if (Access::check('localplay','25')) { ?> - <li><h4><?php echo _('Localplay'); ?></h4> + <li><h4><?php echo T_('Localplay'); ?></h4> <ul class="sb3" id="sb_localplay_info"> <?php if (Access::check('localplay','75')) { ?> - <li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo _('Add Instance'); ?></a></li> - <li id="sb_localplay_info_show_instances"><a href="<?php echo $web_path; ?>/localplay.php?action=show_instances"><?php echo _('Show instances'); ?></a></li> + <li id="sb_localplay_info_add_instance"><a href="<?php echo $web_path; ?>/localplay.php?action=show_add_instance"><?php echo T_('Add Instance'); ?></a></li> + <li id="sb_localplay_info_show_instances"><a href="<?php echo $web_path; ?>/localplay.php?action=show_instances"><?php echo T_('Show instances'); ?></a></li> <?php } ?> - <li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo _('Show Playlist'); ?></a></li> + <li id="sb_localplay_info_show"><a href="<?php echo $web_path; ?>/localplay.php?action=show_playlist"><?php echo T_('Show Playlist'); ?></a></li> </ul> </li> <?php } ?> - <li><h4><?php echo _('Active Instance'); ?></h4> + <li><h4><?php echo T_('Active Instance'); ?></h4> <ul class="sb3" id="sb_localplay_instances"> - <li id="sb_localplay_instances_none"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0',_('None'),'localplay_instance_none'); ?></li> + <li id="sb_localplay_instances_none"<?php echo $class; ?>><?php echo Ajax::text('?page=localplay&action=set_instance&instance=0', T_('None'),'localplay_instance_none'); ?></li> <?php // Requires a little work.. :( $instances = $localplay->get_instances(); @@ -65,13 +65,13 @@ </ul> </li> <?php } else { ?> - <li><h4><?php echo _('Localplay Disabled'); ?></h4></li> + <li><h4><?php echo T_('Localplay Disabled'); ?></h4></li> <?php if (!$server_allow) { ?> - <li><?php echo _('Allow Localplay set to False'); ?></li> + <li><?php echo T_('Allow Localplay set to False'); ?></li> <?php } elseif (!$controller) { ?> - <li><?php echo _('Localplay Controller Not Defined'); ?></li> + <li><?php echo T_('Localplay Controller Not Defined'); ?></li> <?php } elseif (!$access_check) { ?> - <li><?php echo _('Access Denied'); ?></li> + <li><?php echo T_('Access Denied'); ?></li> <?php } ?> <?php } ?> </ul> diff --git a/templates/sidebar_modules.inc.php b/templates/sidebar_modules.inc.php index 83e64568..7989f030 100644 --- a/templates/sidebar_modules.inc.php +++ b/templates/sidebar_modules.inc.php @@ -29,25 +29,25 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path'); ?> <ul class="sb2" id="sb_modules"> -<li><h4><?php echo _('Modules'); ?></h4> +<li><h4><?php echo T_('Modules'); ?></h4> <ul class="sb3" id="sb_Modules"> - <li id="sb_preferences_mo_localplay"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_localplay"><?php echo _('Localplay Modules'); ?></a></li> - <li id="sb_preferences_mo_plugins"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_plugins"><?php echo _('Available Plugins'); ?></a></li> + <li id="sb_preferences_mo_localplay"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_localplay"><?php echo T_('Localplay Modules'); ?></a></li> + <li id="sb_preferences_mo_plugins"><a href="<?php echo $web_path; ?>/admin/modules.php?action=show_plugins"><?php echo T_('Available Plugins'); ?></a></li> </ul> </li> - <li><h4><?php echo _('Other Tools'); ?></h4> + <li><h4><?php echo T_('Other Tools'); ?></h4> <ul class="sb3" id="sb_admin_ot"> - <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo _('Find Duplicates'); ?></a></li> - <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo _('Mail Users'); ?></a></li> - <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo _('Manage Flagged'); ?></a></li> - <li id="sb_admin_ot_ShowDisabled"><a href="<?php echo $web_path; ?>/admin/flag.php?action=show_disabled"><?php echo _('Show Disabled'); ?></a></li> + <li id="sb_admin_ot_Duplicates"><a href="<?php echo $web_path; ?>/admin/duplicates.php"><?php echo T_('Find Duplicates'); ?></a></li> + <li id="sb_admin_ot_Mail"><a href="<?php echo $web_path; ?>/admin/mail.php"><?php echo T_('Mail Users'); ?></a></li> + <li id="sb_admin_ot_ManageFlagged"><a href="<?php echo $web_path; ?>/admin/flag.php"><?php echo T_('Manage Flagged'); ?></a></li> + <li id="sb_admin_ot_ShowDisabled"><a href="<?php echo $web_path; ?>/admin/flag.php?action=show_disabled"><?php echo T_('Show Disabled'); ?></a></li> </ul> </li> <!-- <?php if (Config::get('allow_democratic_playback')) { ?> - <li><h4><?php echo _('Democratic'); ?></h4> + <li><h4><?php echo T_('Democratic'); ?></h4> <ul class="sb3" id="sb_home_democratic"> - <li id="sb_home_democratic_playlist"><a href="<?php echo $web_path; ?>/democratic.php?action=manage_playlists"><?php echo _('Manage Playlist'); ?></a></li> + <li id="sb_home_democratic_playlist"><a href="<?php echo $web_path; ?>/democratic.php?action=manage_playlists"><?php echo T_('Manage Playlist'); ?></a></li> </ul> </li> <?php } ?> diff --git a/templates/sidebar_preferences.inc.php b/templates/sidebar_preferences.inc.php index 46ce68c2..b18d6be8 100644 --- a/templates/sidebar_preferences.inc.php +++ b/templates/sidebar_preferences.inc.php @@ -33,16 +33,16 @@ $catagories = Preference::get_catagories(); ?> <ul class="sb2" id="sb_preferences"> - <li><h4><?php echo _('Preferences'); ?></h4> + <li><h4><?php echo T_('Preferences'); ?></h4> <ul class="sb3" id="sb_preferences_sections"> <?php foreach ($catagories as $name) { if ($name == 'system') { continue; } $f_name = ucfirst($name); ?> - <li id="sb_preferences_sections_<?php echo $f_name; ?>"><a href="<?php echo $web_path; ?>/preferences.php?tab=<?php echo $name; ?>"><?php echo _($f_name); ?></a></li> + <li id="sb_preferences_sections_<?php echo $f_name; ?>"><a href="<?php echo $web_path; ?>/preferences.php?tab=<?php echo $name; ?>"><?php echo T_($f_name); ?></a></li> <?php } ?> - <li id="sb_preferences_sections_account"><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo _('Account'); ?></a></li> + <li id="sb_preferences_sections_account"><a href="<?php echo $web_path; ?>/preferences.php?tab=account"><?php echo T_('Account'); ?></a></li> </ul> </li> </ul> @@ -53,28 +53,28 @@ $htmllang = str_replace("_","-",Config::get('lang')); <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" /> <link rel="stylesheet" type="text/css" media="screen" href="<?php echo Config::get('web_path') . '/templates/install.css'; ?>" /> -<title><?php echo _('Ampache Update'); ?></title> +<title><?php echo T_('Ampache Update'); ?></title> </head> <body> <div id="header"> -<h1><?php echo _('Ampache Update'); ?></h1> +<h1><?php echo T_('Ampache Update'); ?></h1> <p>Pour l'Amour de la Musique.</p> </div> <div id="text-box"> <div class="notify"> -<?php printf(_('This page handles all database updates to Ampache starting with <strong>3.3.3.5</strong>. According to your database your current version is: <strong>%s</strong>.'), Update::format_version($version)); ?> -<?php echo _('the following updates need to be performed'); ?><br /><br /> +<?php printf(T_('This page handles all database updates to Ampache starting with <strong>3.3.3.5</strong>. According to your database your current version is: <strong>%s</strong>.'), Update::format_version($version)); ?> +<?php echo T_('the following updates need to be performed'); ?><br /><br /> <div style="font-size:1.2em;font-weight:bold;text-align:center;"><?php Error::display('general'); ?></div> </div> <div class="content"> <?php Update::display_update(); ?> <form method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/update.php?action=update"> -<?php if (Update::need_update()) { ?><input type="submit" value="<?php echo _('Update Now!'); ?>" /> <?php } ?> +<?php if (Update::need_update()) { ?><input type="submit" value="<?php echo T_('Update Now!'); ?>" /> <?php } ?> </form> </div> <div id="bottom"> - <p><b><?php echo _('Ampache Installation.'); ?></b><br /> + <p><b><?php echo T_('Ampache Installation.'); ?></b><br /> Pour l'Amour de la Musique.</p> </div> </div> |