From 5d1704555a9f0f8f29a845e4c406dbf2395cbd3d Mon Sep 17 00:00:00 2001
From: momo-i <momo-i@ampache>
Date: Wed, 11 Mar 2009 22:59:06 +0000
Subject: Added: Lyrics wiki link on show song page

---
 docs/CHANGELOG                |  3 +++
 docs/README                   | 13 ++++++++-----
 song.php                      |  3 +++
 templates/show_lyrics.inc.php | 21 +++++++++++----------
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 8bbf4a05..8ff14f42 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,9 @@
 
 --------------------------------------------------------------------------
   v.3.5-Alpha3 
+	- Added lyricswiki link Ticket #70
+	- Updated README language
+	- Updated getid3 library 2.0.0b4 to 2.0.0b5
 	- Make the Democratic playlist be assoicated with the user
 		who sends it to a 'player' 
 	- Fixed missing page headers on democratic playlist
diff --git a/docs/README b/docs/README
index 43bd7f34..0ac28533 100755
--- a/docs/README
+++ b/docs/README
@@ -36,7 +36,7 @@ Contents:
      contact us on irc, or the forums and we will investigate adding 
      them. Thanks
 
-     	- MP3 (id3v1 && id3v2)
+	- MP3 (id3v1 && id3v2)
 	- OGG
 	- WMA/ASF
 	- FLAC
@@ -85,15 +85,18 @@ Contents:
      a new one please contact us at translation@ampache.org or see
      /locale/base/TRANSLATIONS for more instructions. 
 
-     	- English	(en_US)
+	- English	(en_US)
 	- German	(de_DE)
-	- Turkish	(tr_TR)
 	- Spanish	(es_ES)
 	- Dutch		(nl_NL)
-	- Chinese	(zh_CN)
+	- Norwegian	(nb_NO)
 	- UK English	(en_GB)
 	- Italian	(it_IT)
-	- French	(fr_FR) 
+	- French	(fr_FR)
+	- Swedish	(sv_SE)
+	- Japanese	(ja_JP) 
+	- Catalan	(ca_ES)
+	- Russian	(ru_RU)
 
   D) A Special Thanks:
      Thanks to those who've helped us make Ampache so useable:
diff --git a/song.php b/song.php
index d0d4729a..06932726 100644
--- a/song.php
+++ b/song.php
@@ -36,6 +36,9 @@ switch ($_REQUEST['action']) {
 		if($show_lyrics == 1) {
 			$lyric = new Artist();
 			$return = scrub_out($lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title)));
+			$link = '<a href="http://lyricwiki.org/' . rawurlencode(ucwords($song->f_artist)) . ':' . rawurlencode(ucwords($song->title)) . '" target="_blank">';
+			$link .= sprintf(_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title));
+			$link .= "</a><br /><br />";
 			require_once Config::get('prefix') . '/templates/show_lyrics.inc.php';
 		}
 	break; 
diff --git a/templates/show_lyrics.inc.php b/templates/show_lyrics.inc.php
index 9812c878..6b5af3b1 100644
--- a/templates/show_lyrics.inc.php
+++ b/templates/show_lyrics.inc.php
@@ -33,16 +33,17 @@
 <?php show_box_top(sprintf(_('%s Lyrics'), $song->title)); ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
-       <td>
-               <?php
-                       if($return == "Sorry Lyrics, Not found") {
-                               echo _("Sorry Lyrics Not Found.");
-                       }
-                       else {
-                               echo "<pre>" . $return . "</pre>";
-                       }
-               ?>
-       </td>
+	<td>
+		<?php
+		if($return == "Sorry Lyrics, Not found") {
+			echo _("Sorry Lyrics Not Found.");
+		}
+		else {
+			echo $link;
+			echo "<pre>" . $return . "</pre>";
+		}
+		?>
+	</td>
 </tr>
 </table>
 <?php show_box_bottom(); ?>
-- 
cgit