[vlma-devel] commit: Little bugs in the mediaView page. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sun Oct 26 14:11:35 2008 +0100| [bea6265aa7f2628f706a6baca61f2ba9f2530789] | committer: Adrien Grand 

Little bugs in the mediaView page.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=bea6265aa7f2628f706a6baca61f2ba9f2530789
---

 .../vlma/web/media/MediaViewController.java        |    2 +-
 vlma-webapp/src/main/resources/messages.properties |    1 +
 .../src/main/resources/messages_fr.properties      |    1 +
 3 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/vlma-webapp/src/main/java/org/videolan/vlma/web/media/MediaViewController.java b/vlma-webapp/src/main/java/org/videolan/vlma/web/media/MediaViewController.java
index f87592d..5cb6a19 100644
--- a/vlma-webapp/src/main/java/org/videolan/vlma/web/media/MediaViewController.java
+++ b/vlma-webapp/src/main/java/org/videolan/vlma/web/media/MediaViewController.java
@@ -74,7 +74,7 @@ public class MediaViewController implements Controller {
         if(media.getProgram() != null) {
             StreamingStrategy strategy = media.getProgram().getStreamingStrategy();
             if(strategy.getProtocol() == Protocol.UDP_MULTICAST) {
-                properties.put("medias.view.ip", media.getProgram().getIp());
+                properties.put("medias.view.ip", media.getProgram().getIp().getHostAddress());
             }
             StringBuilder announcementsAsString = new StringBuilder();
             for(Announcement announcement : strategy.getAnnouncements()) {
diff --git a/vlma-webapp/src/main/resources/messages.properties b/vlma-webapp/src/main/resources/messages.properties
index 4662fb9..7bd68e2 100644
--- a/vlma-webapp/src/main/resources/messages.properties
+++ b/vlma-webapp/src/main/resources/messages.properties
@@ -259,6 +259,7 @@ medias.view.sapName = SAP name
 medias.view.sapGroup = SAP group
 medias.view.url = URL
 medias.view.priority = Priority
+medias.view.ip = multicast IP
 
 medias.DTTchannel.add = Add a DTT channel
 medias.DTTchannel.add.name = Name:
diff --git a/vlma-webapp/src/main/resources/messages_fr.properties b/vlma-webapp/src/main/resources/messages_fr.properties
index 10d7c7e..c1f326b 100644
--- a/vlma-webapp/src/main/resources/messages_fr.properties
+++ b/vlma-webapp/src/main/resources/messages_fr.properties
@@ -256,6 +256,7 @@ medias.view.sapName = Annonce SAP
 medias.view.sapGroup = Groupe SAP
 medias.view.url = URL
 medias.view.priority = Priorité
+medias.view.ip = IP multicast
 
 medias.DTTchannel.add = Ajout d'une chaîne TNT
 medias.DTTchannel.add.name = Nom :