diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-02-28 14:17:19 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-02-28 14:17:19 +0000 |
| commit | d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a (patch) | |
| tree | f22abcfcf44e88646dce6005d14a0427607306a4 | |
| parent | 9564abe4bf386a25c79ce8276147a5ee4c64ccbb (diff) | |
| download | forums-d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a.tar forums-d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a.tar.gz forums-d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a.tar.bz2 forums-d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a.tar.xz forums-d04d9e0ac4d3aa4c9fc75814212fdbac629a7e2a.zip | |
Slight mod to language selector to handle double underscored lang files
git-svn-id: file:///svn/phpbb/trunk@2219 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 53d7a365ac..f75a9ad941 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -621,8 +621,9 @@ function language_select($default, $select_name = "language", $dirname="language { if ( ereg("^lang_", $file) && !is_file($dirname . "/" . $file) && !is_link($dirname . "/" . $file) ) { - $filename = str_replace("lang_", "", $file); - $displayname = preg_replace("/(.*)_(.*)/", "\\1 [ \\2 ]", $filename); + $filename = trim(str_replace("lang_", "", $file)); + $displayname = preg_replace("/^(.*?)_(.*)$/", "\\1 [ \\2 ]", $filename); + $displayname = preg_replace("/\[(.*?)_(.*)\]/", "[ \\1 - \\2 ]", $displayname); $lang[$displayname] = $filename; } } |