yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-06 03:49:56 +02:00
Code Issues Releases Wiki Activity

Update translate strings

Browse source 
Change indent tab from blank
Fix show_confirmation web_path
This commit is contained in:
momo-i 2009-05-06 23:14:16 +00:00
parent b85fa736cf
commit bd3b70008b
8 changed files with 96 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

8
admin/catalog.php
View file

@ -32,6 +32,7 @@ show_header();
/* Big switch statement to handle various actions */ /* Big switch statement to handle various actions */
switch ($_REQUEST['action']) { switch ($_REQUEST['action']) {
case 'fixed': case 'fixed':
/* Does this use now? */
delete_flagged($flag); delete_flagged($flag);
$type = 'show_flagged_songs'; $type = 'show_flagged_songs';
include(conf('prefix') . '/templates/flag.inc'); include(conf('prefix') . '/templates/flag.inc');
@ -198,15 +199,15 @@ switch ($_REQUEST['action']) {
ob_end_flush(); ob_end_flush();
if (!strlen($_REQUEST['path']) || !strlen($_REQUEST['name'])) { if (!strlen($_REQUEST['path']) || !strlen($_REQUEST['name'])) {
Error::add('general','Error Name and path not specified'); Error::add('general',_('Error: Name and path not specified'));
} }
if (substr($_REQUEST['path'],0,7) != 'http://' && $_REQUEST['type'] == 'remote') { if (substr($_REQUEST['path'],0,7) != 'http://' && $_REQUEST['type'] == 'remote') {
Error::add('general','Error Remote selected, but path is not a URL'); Error::add('general',_('Error: Remote selected, but path is not a URL'));
} }
if ($_REQUEST['type'] == 'remote' && !strlen($_REQUEST['key'])) { if ($_REQUEST['type'] == 'remote' && !strlen($_REQUEST['key'])) {
Error::add('general','Error Remote Catalog specified, but no key provided'); Error::add('general',_('Error: Remote Catalog specified, but no key provided'));
} }
// Make sure that there isn't a catalog with a directory above this one // Make sure that there isn't a catalog with a directory above this one
@ -263,6 +264,7 @@ switch ($_REQUEST['action']) {
show_confirmation(_('Now Playing Cleared'),_('All now playing data has been cleared'),Config::get('web_path') . '/admin/index.php'); show_confirmation(_('Now Playing Cleared'),_('All now playing data has been cleared'),Config::get('web_path') . '/admin/index.php');
break; break;
case 'show_disabled': case 'show_disabled':
/* Stop the demo hippies */
if (conf('demo_mode')) { break; } if (conf('demo_mode')) { break; }
$songs = $catalog->get_disabled(); $songs = $catalog->get_disabled();

1
admin/flag.php
View file

@ -310,4 +310,3 @@ switch ($_REQUEST['action']) {
show_footer(); show_footer();
?> ?>

1
admin/index.php
View file

@ -38,3 +38,4 @@ switch ($_REQUEST['action']) {
} }
show_footer(); show_footer();
?>

1
admin/modules.php
View file

@ -143,5 +143,4 @@ switch ($_REQUEST['action']) {
show_footer(); show_footer();
?> ?>

4
admin/shout.php
View file

@ -32,7 +32,7 @@ switch ($_REQUEST['action']) {
case 'edit_shout': case 'edit_shout':
$shout_id = $_POST['shout_id']; $shout_id = $_POST['shout_id'];
$update = shoutBox::update($_POST); $update = shoutBox::update($_POST);
show_confirmation(_('Shoutbox Post Updated'),'','admin/shout.php'); show_confirmation(_('Shoutbox Post Updated'),'',Config::get('web_path').'/admin/shout.php');
break; break;
case 'show_edit': case 'show_edit':
$shout = new shoutBox($_REQUEST['shout_id']); $shout = new shoutBox($_REQUEST['shout_id']);
@ -44,7 +44,7 @@ switch ($_REQUEST['action']) {
break; break;
case 'delete': case 'delete':
$shout_id = shoutBox::delete($_REQUEST['shout_id']); $shout_id = shoutBox::delete($_REQUEST['shout_id']);
show_confirmation(_('Shoutbox Post Deleted'),'','admin/shout.php'); show_confirmation(_('Shoutbox Post Deleted'),'',Config::get('web_path').'/admin/shout.php');
break; break;
default: default:
Browse::set_type('shoutbox'); Browse::set_type('shoutbox');

3
admin/system.php
View file

@ -46,7 +46,7 @@ switch ($_REQUEST['action']) {
break; break;
case 'reset_db_charset': case 'reset_db_charset':
Dba::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'),'/admin/system.php?action=show_debug'); 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');
break; break;
case 'show_debug': case 'show_debug':
$configuration = Config::get_all(); $configuration = Config::get_all();
@ -57,7 +57,6 @@ switch ($_REQUEST['action']) {
break; break;
} // end switch } // end switch
show_footer(); show_footer();
?> ?>

20
admin/users.php
View file

@ -80,7 +80,7 @@ switch ($_REQUEST['action']) {
$client->update_password($pass1); $client->update_password($pass1);
} }
show_confirmation(_('User Updated'), $client->fullname . "(" . $client->username . ")" . _('updated'),'admin/users.php'); show_confirmation(_('User Updated'), $client->fullname . "(" . $client->username . ")" . _('updated'), Config::get('web_path'). '/admin/users.php');
break; break;
case 'add_user': case 'add_user':
if (Config::get('demo_mode')) { break; } if (Config::get('demo_mode')) { break; }
@ -114,7 +114,7 @@ switch ($_REQUEST['action']) {
/* Attempt to create the user */ /* Attempt to create the user */
$user_id = User::create($username, $fullname, $email, $pass1, $access); $user_id = User::create($username, $fullname, $email, $pass1, $access);
if (!$user_id) { if (!$user_id) {
Error::add('general',"Error: Insert Failed"); Error::add('general',_("Error: Insert Failed"));
} }
} // if no errors } // if no errors
@ -126,20 +126,20 @@ switch ($_REQUEST['action']) {
elseif ($access == 25){ $access = _('User');} elseif ($access == 25){ $access = _('User');}
elseif ($access == 100){ $access = _('Admin');} elseif ($access == 100){ $access = _('Admin');}
show_confirmation(_('New User Added'),__('%user% has been created with an access level of ' . $access,'%user%',$username),'admin/users.php'); show_confirmation(_('New User Added'),__('%user% has been created with an access level of ' . $access,'%user%',$username), Config::get('web_path').'/admin/users.php');
break; break;
case 'enable': case 'enable':
$client = new User($_REQUEST['user_id']); $client = new User($_REQUEST['user_id']);
$client->enable(); $client->enable();
show_confirmation(_('User Enabled'),$client->fullname . ' (' . $client->username . ')','admin/users.php'); show_confirmation(_('User Enabled'),$client->fullname . ' (' . $client->username . ')', Config::get('web_path'). '/admin/users.php');
break; break;
case 'disable': case 'disable':
$client = new User($_REQUEST['user_id']); $client = new User($_REQUEST['user_id']);
if ($client->disable()) { if ($client->disable()) {
show_confirmation(_('User Disabled'),$client->fullname . ' (' . $client->username . ')','admin/users.php'); show_confirmation(_('User Disabled'),$client->fullname . ' (' . $client->username . ')', Config::get('web_path'). '/admin/users.php');
} }
else { else {
show_confirmation(_('Error'),_('Unable to Disabled last Administrator'),'admin/users.php'); show_confirmation(_('Error'),_('Unable to Disabled last Administrator'), Config::get('web_path').'/admin/users.php');
} }
break; break;
case 'show_edit': case 'show_edit':
@ -151,18 +151,18 @@ switch ($_REQUEST['action']) {
if (Config::get('demo_mode')) { break; } if (Config::get('demo_mode')) { break; }
$client = new User($_REQUEST['user_id']); $client = new User($_REQUEST['user_id']);
if ($client->delete()) { if ($client->delete()) {
show_confirmation(_('User Deleted'), "$client->username has been Deleted","admin/users.php"); show_confirmation(_('User Deleted'), sprintf(_('%s has been Deleted'), $client->username), Config::get('web_path'). "/admin/users.php");
} }
else { else {
show_confirmation(_('Delete Error'), _("Unable to delete last Admin User"),"admin/users.php"); show_confirmation(_('Delete Error'), _("Unable to delete last Admin User"), Config::get('web_path')."/admin/users.php");
} }
break; break;
case 'delete': case 'delete':
if (Config::get('demo_mode')) { break; } if (Config::get('demo_mode')) { break; }
$client = new User($_REQUEST['user_id']); $client = new User($_REQUEST['user_id']);
show_confirmation(_('Deletion Request'), show_confirmation(_('Deletion Request'),
_('Are you sure you want to permanently delete') . " $client->fullname ($client->username)?", sprintf(_('Are you sure you want to permanently delete %s?'), $client->fullname),
"admin/users.php?action=confirm_delete&user_id=" . $_REQUEST['user_id'],1); Config::get('web_path')."/admin/users.php?action=confirm_delete&user_id=" . $_REQUEST['user_id'],1);
break; break;
/* Show IP History for the Specified User */ /* Show IP History for the Specified User */
case 'show_ip_history': case 'show_ip_history':