diff options
author | momo-i <momo-i@ampache> | 2008-08-29 07:07:13 +0000 |
---|---|---|
committer | momo-i <momo-i@ampache> | 2008-08-29 07:07:13 +0000 |
commit | 59a103e607811934c3d1213c48c58eb9a2748d77 (patch) | |
tree | 3bba6e6dca915accf48c1e0d6d9ee5f7ff74ce2a /templates | |
parent | fae2f92e98fdeecc69044933c509e17c7ad91fb6 (diff) | |
download | ampache-59a103e607811934c3d1213c48c58eb9a2748d77.tar.gz ampache-59a103e607811934c3d1213c48c58eb9a2748d77.tar.bz2 ampache-59a103e607811934c3d1213c48c58eb9a2748d77.zip |
Updated more translatable
Diffstat (limited to 'templates')
-rw-r--r-- | templates/show_install.inc.php | 1 | ||||
-rw-r--r-- | templates/show_install_account.inc.php | 1 | ||||
-rw-r--r-- | templates/show_install_config.inc.php | 1 | ||||
-rw-r--r-- | templates/show_install_lang.inc.php | 27 | ||||
-rw-r--r-- | templates/show_preference_admin.inc.php | 2 | ||||
-rw-r--r-- | templates/show_preference_box.inc.php | 2 | ||||
-rw-r--r-- | templates/show_preferences.inc.php | 2 |
7 files changed, 14 insertions, 22 deletions
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 4738d263..5c0ebb90 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -25,6 +25,7 @@ if (INSTALL != '1') { exit; } <head> <title>Ampache :: For The Love Of Music - Install</title> <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" /> +<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" /> </head> <body> <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index 9eb5183a..e751a1bd 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -26,6 +26,7 @@ if (INSTALL != '1') { exit; } <head> <title>Ampache :: For The Love Of Music - Install</title> <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" /> +<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" /> </head> <body> <div id="header"> diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 3cb13849..2c8f630c 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -26,6 +26,7 @@ if (INSTALL != '1') { exit; } <head> <title>Ampache :: For The Love Of Music - Install</title> <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" /> +<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" /> </head> <body> <div id="header"> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index 7e790af2..630fc552 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -26,6 +26,7 @@ <head> <title>Ampache :: Pour l'Amour de la Musique - Install</title> <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" /> +<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" /> </head> <body> <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script> @@ -52,7 +53,7 @@ <h4><?php echo _('Requirements'); ?></h4> <p><?php echo _('PHP Version:'); ?> <?php - if(strcmp('5.1.0',phpversion()) > 0) { + if(!check_php_ver()) { echo " <font color=\"red\">ERROR</font> " . phpversion(); $results = $results + 1; } else { @@ -62,7 +63,7 @@ </p> <p><?php echo _('Mysql for PHP:'); ?> <?php - if (!function_exists('mysql_query')) { + if (!check_php_mysql()) { echo " <font color=\"red\">ERROR</font> "; $results = $results + 1; } else { @@ -76,7 +77,7 @@ </p> <p><?php echo _('PHP Session Support:'); ?> <?php - if (!function_exists('session_set_save_handler')) { + if (!check_php_session()) { echo " <font color=\"red\">ERROR</font> "; $results = $results + 1; } else { @@ -86,7 +87,7 @@ </p> <p><?php echo _('PHP ICONV Support:'); ?> <?php - if (!function_exists('iconv')) { + if (!check_php_iconv()) { echo " <font color=\"red\">ERROR</font> "; $results = $results + 1; } else { @@ -96,7 +97,7 @@ </p> <p><?php echo _('PHP PCRE Support:'); ?> <?php - if (!function_exists('preg_match')) { + if (!check_php_pcre()) { echo " <font color=\"red\">ERROR</font> "; $results = $results + 1; } else { @@ -106,10 +107,7 @@ </p> <p><?php echo _('PHP PutENV Support:'); ?> <?php - $current = ini_get('memory_limit'); - $current = substr($current_memory,0,strlen($current_memory)-1); - $new_limit = ($current+1) . "M"; - if (!ini_set(memory_limit,$new_limit)) { + if (!check_putenv()) { echo " <font color=\"red\">ERROR</font> "; $results = $results + 1; } else { @@ -117,21 +115,12 @@ } ?> </p> - <p><?php echo _('PHP Safe Mode:'); ?> - <?php - if (ini_get('safe_mode')) { - echo " <font color=\"red\">Using Safe Mode.</font> "; - } else { - echo " <font color=\"green\"> OK </font> "; - } - ?> - </p> <hr /> <h4><?php echo _('Optional'); ?></h4> <p><?php echo _('PHP GetText Support:'); ?> <?php if (!function_exists('gettext')) { - echo " <font color=\"#FF6600\">WARNING: This server will use gettext emulator.</font> "; + echo " <font color=\"#FF6600\">" . _('WARNING: This server will use gettext emulator.') . "</font> "; } else { echo " <font color=\"green\"> OK </font> "; } diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 737cadf4..311a8a41 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -34,7 +34,7 @@ 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(_($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']); ?>]"> diff --git a/templates/show_preference_box.inc.php b/templates/show_preference_box.inc.php index 8d4fcb15..1301df36 100644 --- a/templates/show_preference_box.inc.php +++ b/templates/show_preference_box.inc.php @@ -26,7 +26,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 _($preferences['title']); ?></h4> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_preference" /> diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index 1ee70ec3..1e2d7638 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -25,7 +25,7 @@ */ ?> -<?php show_box_top(_('Editing') . ' ' . $fullname . ' ' . _('preferences'),'box box_preferences'); ?> +<?php show_box_top(sprintf(_('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"> |