summaryrefslogtreecommitdiffstats
path: root/lib/general.lib.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-03-17 00:50:16 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-03-17 00:50:16 +0000
commit27437304248e6d8fd44c2b997673ea112e08afa8 (patch)
tree9628d564e018fa0b53597dee665ed4d12803b0c1 /lib/general.lib.php
parentadc4e061f4be955e1db8e9a2c51307b90795e699 (diff)
downloadampache-27437304248e6d8fd44c2b997673ea112e08afa8.tar.gz
ampache-27437304248e6d8fd44c2b997673ea112e08afa8.tar.bz2
ampache-27437304248e6d8fd44c2b997673ea112e08afa8.zip
force consistant charset on file add, add fix_filenames script and minor tweak for democratic play
Diffstat (limited to 'lib/general.lib.php')
-rw-r--r--lib/general.lib.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php
index 4e9f39c5..e9cf0e3b 100644
--- a/lib/general.lib.php
+++ b/lib/general.lib.php
@@ -382,7 +382,7 @@ function get_languages() {
$results = array();
/* Prepend English */
- $results['en_US'] = _('English');
+ $results['en_US'] = 'English';
while ($file = readdir($handle)) {
@@ -393,16 +393,16 @@ function get_languages() {
switch($file) {
case 'de_DE'; $name = 'Deutsch'; break;
- case 'en_US'; $name = _('English'); break;
+ case 'en_US'; $name = 'English'; break;
case 'ca_CA'; $name = 'Catal&#224;'; break;
- case 'en_GB'; $name = _('British English'); break;
+ case 'en_GB'; $name = 'British English'; break;
case 'es_ES'; $name = 'Espa&ntilde;ol'; break;
case 'el_GR'; $name = 'Greek (&#x0395;&#x03bb;&#x03bb;&#x03b7;&#x03bd;&#x03b9;&#x03ba;&#x03ac;)'; break;
case 'fr_FR'; $name = 'Fran&ccedil;ais'; break;
case 'it_IT'; $name = 'Italiano'; break;
case 'is_IS'; $name = '&Iacute;slenska'; break;
case 'nl_NL'; $name = 'Nederlands'; break;
- case 'tr_TR'; $name = _('Turkish'); break;
+ case 'tr_TR'; $name = 'Turkish'; break;
case 'zh_CN'; $name = _('Simplified Chinese') . " (&#x7b80;&#x4f53;&#x4e2d;&#x6587;)"; break;
case 'ru_RU'; $name = 'Russian (&#x0420;&#x0443;&#x0441;&#x0441;&#x043a;&#x0438;&#x0439;)'; break;
default: $name = _('Unknown'); break;