From e7f516702f35f7cc9bf3490f54bd93cd427bc8e5 Mon Sep 17 00:00:00 2001 From: llaffont <laurent.laffont@gmail.com> Date: Tue, 4 Mar 2014 16:11:50 +0100 Subject: [PATCH] Album audio record infos: better display --- library/Class/File/Info.php | 2 +- public/admin/css/global.css | 1 + tests/library/Class/File/InfoTest.php | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/library/Class/File/Info.php b/library/Class/File/Info.php index 9d057a78270..15f8441ef99 100644 --- a/library/Class/File/Info.php +++ b/library/Class/File/Info.php @@ -40,7 +40,7 @@ class Class_File_Info { if (!$file = $this->fileNameWithoutExtension()) return ''; - $parts = array_filter(preg_split('/[^a-zA-Z\s]+/', $file)); + $parts = array_filter(preg_split('/[0-9_\*\-\s]+/', $file)); return ucfirst(implode(' ', array_map('trim',$parts))); } diff --git a/public/admin/css/global.css b/public/admin/css/global.css index a6af4eaaaf5..547800e1e98 100644 --- a/public/admin/css/global.css +++ b/public/admin/css/global.css @@ -716,6 +716,7 @@ form#sendparams dd {float: left} .profils li div, .tree li div{ float: left; + text-align: left; } .oldprofils li:hover { diff --git a/tests/library/Class/File/InfoTest.php b/tests/library/Class/File/InfoTest.php index 0fad9363539..44fbb48aa86 100644 --- a/tests/library/Class/File/InfoTest.php +++ b/tests/library/Class/File/InfoTest.php @@ -28,7 +28,8 @@ class FileInfoTest extends PHPUnit_Framework_TestCase { ['', ''], [null, ''], ['dark_vador-the*vilain', 'Dark vador the vilain'], - ['666 beast 111', 'Beast'] + ['666 beast 111', 'Beast'], + ['le_condamné', 'Le condamné'] ]; } -- GitLab