From: Yves A. <yv...@ar...> - 2002-06-16 06:24:52
|
A couple friends where confused when going into an album that only = contains nested albums, and seeing "3 photos in this album". The = following patch will display things like: 3 albums in this album 5 photos in this album 2 albums and 1 photo in this album instead. You get the idea. YA % diff -u view_album.php.orig view_album.php|less --- view_album.php.orig Tue Jun 4 22:35:12 2002 +++ view_album.php Sat Jun 15 23:18:38 2002 @@ -191,14 +191,25 @@ echo "<option value=3D'" . makeGalleryUrl($target, $args) . = "'>$label</opt ion>"; } =20 +for ($i =3D 1, $numAlbums =3D 0; $i <=3D $numPhotos; ++$i) { + if ($gallery->album->isAlbumName($i)) { + ++$numAlbums; + } +} + $adminText =3D "<span class=3D\"admin\">"; -if ($numPhotos =3D=3D 1) { =20 - $adminText .=3D "1 photo in this album"; -} else { - $adminText .=3D "$numPhotos items in this album"; - if ($maxPages > 1) { - $adminText .=3D " on " . pluralize($maxPages, "page"); - } +if ($numAlbums) { + $adminText .=3D pluralize($numAlbums, "album", "no"); +} +if ($numPhotos - $numAlbums) { + if ($numAlbums) { + $adminText .=3D " and "; + } + $adminText .=3D pluralize($numPhotos - $numAlbums, "photo", "no"); +} +$adminText .=3D " in this album"; +if ($maxPages > 1) { + $adminText .=3D " on " . pluralize($maxPages, "page"); } =20 if ($gallery->user->canWriteToAlbum($gallery->album)) { |