[jetrix-cvs] SF.net SVN: jetrix:[778] monitor/trunk
Brought to you by:
smanux
Menu
▾
▴
[jetrix-cvs] SF.net SVN: jetrix:[778] monitor/trunk
|
From: <sm...@us...> - 2008-11-16 23:47:49
|
Revision: 778
http://jetrix.svn.sourceforge.net/jetrix/?rev=778&view=rev
Author: smanux
Date: 2008-11-16 23:47:28 +0000 (Sun, 16 Nov 2008)
Log Message:
-----------
Internationalization support and french translation
Modified Paths:
--------------
monitor/trunk/pom.xml
monitor/trunk/src/main/webapp/WEB-INF/web.xml
monitor/trunk/src/main/webapp/index.jsp
monitor/trunk/src/main/webapp/player.jsp
monitor/trunk/src/main/webapp/server-add.jsp
monitor/trunk/src/main/webapp/server.jsp
monitor/trunk/src/main/webapp/spec.jsp
Added Paths:
-----------
monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties
monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties
Modified: monitor/trunk/pom.xml
===================================================================
--- monitor/trunk/pom.xml 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/pom.xml 2008-11-16 23:47:28 UTC (rev 778)
@@ -127,6 +127,18 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+
<!-- Needed for testing -->
<dependency>
<groupId>junit</groupId>
Added: monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties (rev 0)
+++ monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties 2008-11-16 23:47:28 UTC (rev 778)
@@ -0,0 +1,48 @@
+word.server = Server
+word.country = Country
+word.player = Player
+word.players = Players
+word.channel = Channel
+word.channels = Channels
+word.version = Version
+word.team = Team
+word.nick = Nick
+word.status = Status
+word.action = Action
+word.name = Name
+word.description = Description
+word.website = Website
+word.unknown = Unknown
+word.ping = Ping
+word.add = Add
+word.yes = Yes
+word.no = No
+word.peak = Peak
+word.date-added = Date Added
+word.last-online = Last Online
+word.never = Never
+word.tetrinet-client = Client
+word.slot = Slot
+word.last-seen = Last Seen
+word.last-played = Last Played
+word.first-seen = First Seen
+word.active = active
+word.tspec-access= TSpec Access
+word.playing = Playing
+word.idle = Idle
+word.ingame = INGAME
+word.activity-graph = Activity Graph
+
+message.intro = This is a list of the public TetriNET servers. The list is refreshed every {0} minutes. Feel free to add your favorite server if it's not in the list. This list is also available in <a href="servers-xml.jsp">XML</a> and can be freely integrated with an application or a website. Feedback and suggestions can be mailed to <a href="mailto:{1}">{1}</a>.
+message.global-status = There are currently <b>{0}</b> players online on <b>{1}</b> servers.
+message.last-checked = The servers were last checked on {0}.
+message.add-server = Add a new server
+message.back-to-servers = Back to the server list
+message.back-to-server-info = Back to the server info
+message.peak.players = {0} players reached on {1}
+message.peak.active-players = {0} active players reached on {1}
+
+title.servers = TetriNET Servers Listing
+title.server = TetriNET Server - {0}
+title.player = TetriNET Player - {0}
+title.channel = TetriNET Channel - {0} on {1}
Property changes on: monitor/trunk/src/main/webapp/WEB-INF/classes/messages.properties
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision HeadURL
Added: svn:eol-style
+ native
Added: monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties (rev 0)
+++ monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties 2008-11-16 23:47:28 UTC (rev 778)
@@ -0,0 +1,48 @@
+word.server = Serveur
+word.country = Pays
+word.player = Joueur
+word.players = Joueurs
+word.channel = Channel
+word.channels = Channels
+word.version = Version
+word.team = \xC9quipe
+word.nick = Pseudo
+word.status = Statut
+word.action = Action
+word.name = Nom
+word.description = Description
+word.website = Site web
+word.unknown = Inconnu
+word.ping = Latence
+word.add = Ajouter
+word.yes = Oui
+word.no = Non
+word.peak = Pointe
+word.date-added = Date d'ajout
+word.last-online = Derniere V\xE9rification
+word.never = Jamais
+word.tetrinet-client = Client
+word.slot = Place
+word.last-seen = Derni\xE8re Apparition
+word.last-played = Derni\xE8re Partie
+word.first-seen = Premi\xE8re Apparition
+word.active = actifs
+word.tspec-access= Acc\xE8s Spectateur
+word.playing = En jeu
+word.idle = En attente
+word.ingame = EN COURS
+word.activity-graph = Graphique d'activit\xE9
+
+message.intro = Voici la liste des serveurs TetriNET publics. Cette liste est actualis\xE9e toutes les {0} minutes. N''h\xE9sitez pas \xE0 ajouter votre serveur pr\xE9f\xE9r\xE9 s''il n''apparait pas dans la liste. Cette liste est \xE9galement disponible au format <a href="servers-xml.jsp">XML</a> et peut \xEAtre librement int\xE9gr\xE9e dans une application ou un site internet. Envoyez vos commentaires et suggestions \xE0 <a href="mailto:{1}">{1}</a>.
+message.global-status = Il y a actuellement <b>{0}</b> joueurs en ligne sur <b>{1}</b> serveurs.
+message.last-checked = Les serveurs ont \xE9t\xE9 v\xE9rifi\xE9s pour la derni\xE8re fois le {0}.
+message.add-server = Ajouter un serveur
+message.back-to-servers = Retour \xE0 la liste des serveurs
+message.back-to-server-info = Retour aux infos du serveur
+message.peak.players = {0} joueurs atteints le {1}
+message.peak.active-players = {0} joueurs actifs atteints le {1}
+
+title.servers = Liste des serveurs TetriNET
+title.server = Serveur TetriNET - {0}
+title.player = Joueur TetriNET - {0}
+title.channel = Channel TetriNET - {0} sur {1}
Property changes on: monitor/trunk/src/main/webapp/WEB-INF/classes/messages_fr.properties
___________________________________________________________________
Added: svn:keywords
+ Date Author Id Revision HeadURL
Added: svn:eol-style
+ native
Modified: monitor/trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- monitor/trunk/src/main/webapp/WEB-INF/web.xml 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/src/main/webapp/WEB-INF/web.xml 2008-11-16 23:47:28 UTC (rev 778)
@@ -12,6 +12,11 @@
<param-value>/WEB-INF/classes/*Context.xml</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
+ <param-value>messages</param-value>
+ </context-param>
+
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
Modified: monitor/trunk/src/main/webapp/index.jsp
===================================================================
--- monitor/trunk/src/main/webapp/index.jsp 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/src/main/webapp/index.jsp 2008-11-16 23:47:28 UTC (rev 778)
@@ -1,3 +1,4 @@
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
<%@ page import="java.util.Date" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.Locale" %>
@@ -25,37 +26,47 @@
lastChecked = server.getLastChecked();
}
}
-
%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>TetriNET Servers Listing</title>
+ <title><fmt:message key="title.servers"/></title>
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<link rel="Shorcut Icon" href="favicon.ico">
<script type="text/javascript" src="scripts/sortable.js"></script>
</head>
<body>
-<h1>TetriNET Servers Listing</h1>
+<h1><fmt:message key="title.servers"/></h1>
-<p>This is a list of the public TetriNET servers. The list is refreshed every 5 minutes. Feel free to add your favorite
-server if it's not in the list.</p>
+<p>
+<fmt:message key="message.intro">
+ <fmt:param>5</fmt:param>
+ <fmt:param>sm...@lf...</fmt:param>
+</fmt:message>
+</p>
-<p>There are currently <b><%= totalPlayerCount %></b> players online on <b><%= serverCount %></b> servers. The
-servers were last checked on <%= lastChecked %>.</p>
+<p>
+<fmt:message key="message.global-status">
+ <fmt:param><%= totalPlayerCount %></fmt:param>
+ <fmt:param><%= serverCount %></fmt:param>
+</fmt:message>
+<fmt:message key="message.last-checked">
+ <fmt:param><%= lastChecked %></fmt:param>
+</fmt:message>
+</p>
<table class="thin sortable" id="serverlist" border="1" align="center">
<thead>
<tr>
- <th>Server</th>
- <th>Country</th>
- <th>Players</th>
- <th>Channels</th>
- <th>Version</th>
- <th>Ping <small>(ms)</small></th>
- <th>Spec</th>
+ <th><fmt:message key="word.server"/></th>
+ <th><fmt:message key="word.country"/></th>
+ <th><fmt:message key="word.players"/></th>
+ <th><fmt:message key="word.channels"/></th>
+ <th><fmt:message key="word.version"/></th>
+ <th><fmt:message key="word.ping"/> <small>(ms)</small></th>
+ <th>TSpec</th>
</tr>
</thead>
<tbody>
@@ -72,10 +83,11 @@
<%
Locale locale = new Locale("en", server.getCountry());
String countryName = locale.getDisplayCountry(Locale.ENGLISH);
+ String localizedCountryName = locale.getDisplayCountry(request.getLocale());
%>
- <img src="images/flags/24/<%= countryName %>.png" alt="<%= countryName%>" title="<%= countryName%>">
+ <img src="images/flags/24/<%= countryName %>.png" alt="<%= localizedCountryName%>" title="<%= localizedCountryName%>">
<% } else { %>
- <img src="images/flags/24/United Nations.png" alt="Unknown" title="Unknown">
+ <img src="images/flags/24/United Nations.png" alt="<fmt:message key="word.unknown"/>" title="<fmt:message key="word.unknown"/>">
<% } %>
</td>
<td align="right" style="font-weight: bold; <%= server.getStats().getActivePlayerCount() > 0 ? "color: green" : "" %>">
@@ -84,28 +96,36 @@
<td align="right"><%= server.getStats().getChannelCount() %></td>
<td><%= server.getVersion() != null ? server.getVersion() : "" %></td>
<td align="right"><%= server.getStats().getPing() %></td>
- <td align="center" style="color: <%= server.isSpectate() ? "green" : "red" %>"><%= server.isSpectate() ? "Yes" : "No" %></td>
+ <td align="center" style="color: <%= server.isSpectate() ? "green" : "red" %>">
+ <% if (server.isSpectate()) { %>
+ <fmt:message key="word.yes"/>
+ <% } else { %>
+ <fmt:message key="word.no"/>
+ <% } %>
+ </td>
</tr>
<% } %>
</tbody>
</table>
<fieldset style="margin: 1em auto; width: 200px; -moz-border-radius: 6px">
- <legend>Add a new server</legend>
+ <legend><fmt:message key="message.add-server"/></legend>
<form action="server-add.jsp">
<input type="text" name="hostname">
- <input type="submit" value="Add">
+ <input type="submit" value="<fmt:message key="word.add"/>">
<br>
- (<tt>tetrinet.fr</tt> or <tt>194.117.194.68</tt>)
+ (i.e. <tt>tetrinet.fr</tt>, <tt>194.117.194.68</tt>)
</form>
</fieldset>
<hr>
-<p>This list is also available in <a href="servers-xml.jsp">XML</a> and can be freely integrated with an application
-or a website. Flags icons are made by www.icondrawer.com.</p>
+<div style="font-size: smaller; float: left">
+ Powered by <a href="http://jetrix.sourceforge.net">Jetrix Monitor</a><br>
+</div>
+<div style="font-size: smaller; text-align: right">
+ Flags icons are made by <a href="http://www.icondrawer.com">www.icondrawer.com</a>
+</div>
-<p>Feedback and suggestions can be mailed to <a href="mailto:sm...@lf...">sm...@lf...</a></p>
-
</body>
</html>
Modified: monitor/trunk/src/main/webapp/player.jsp
===================================================================
--- monitor/trunk/src/main/webapp/player.jsp 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/src/main/webapp/player.jsp 2008-11-16 23:47:28 UTC (rev 778)
@@ -1,3 +1,4 @@
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
<%@ page import="org.springframework.web.context.ContextLoader" %>
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
<%@ page import="net.jetrix.monitor.PlayerStats" %>
@@ -13,37 +14,47 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>TetriNET Player - <%= StyleUtils.strip(player.getName()) %></title>
+ <title>
+ <fmt:message key="title.player">
+ <fmt:param><%= StyleUtils.strip(player.getName()) %></fmt:param>
+ </fmt:message>
+ </title>
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<link rel="Shorcut Icon" href="favicon.ico">
</head>
<body>
-<h1>TetriNET Player - <%= StyleUtils.strip(player.getName()) %></h1>
+
+<h1>
+ <fmt:message key="title.player">
+ <fmt:param><%= StyleUtils.strip(player.getName()) %></fmt:param>
+ </fmt:message>
+</h1>
+
<table class="thin" border="1" cellspacing="0" style="min-width: 40%">
<tr>
- <th width="25%">First Seen</th>
+ <th width="25%"><fmt:message key="word.first-seen"/></th>
<td><%= player.getFirstSeen() %></td>
</tr>
<tr>
- <th>Last Seen</th>
+ <th><fmt:message key="word.last-seen"/></th>
<td><%= player.getLastSeen() %></td>
</tr>
<tr>
- <th>Last Played</th>
+ <th><fmt:message key="word.last-played"/></th>
<td><%= player.getLastPlayed() != null ? player.getLastPlayed() : "-" %></td>
</tr>
<tr>
- <th>Server</th>
+ <th><fmt:message key="word.server"/></th>
<td><a href="server.jsp?id=<%= player.getLastServer().getId() %>"><%= player.getLastServer().getHostname() %></a></td>
</tr>
<tr>
- <th>Channel</th>
+ <th><fmt:message key="word.channel"/></th>
<td><%= player.getChannel() != null ? player.getChannel() : "" %></td>
</tr>
<tr>
- <th>Team</th>
+ <th><fmt:message key="word.team"/></th>
<td><%= player.getTeam() != null ? player.getTeam() : "" %></td>
</tr>
</table>
Modified: monitor/trunk/src/main/webapp/server-add.jsp
===================================================================
--- monitor/trunk/src/main/webapp/server-add.jsp 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/src/main/webapp/server-add.jsp 2008-11-16 23:47:28 UTC (rev 778)
@@ -3,8 +3,6 @@
<%@ page import="java.net.InetSocketAddress" %>
<%@ page import="java.net.Socket" %>
<%@ page import="java.util.Date" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Locale" %>
<%@ page import="org.springframework.web.context.ContextLoader" %>
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
<%@ page import="net.jetrix.monitor.ServerInfo" %>
Modified: monitor/trunk/src/main/webapp/server.jsp
===================================================================
--- monitor/trunk/src/main/webapp/server.jsp 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/src/main/webapp/server.jsp 2008-11-16 23:47:28 UTC (rev 778)
@@ -1,3 +1,4 @@
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
<%@ page import="java.util.Locale" %>
<%@ page import="org.springframework.web.context.ContextLoader" %>
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
@@ -14,11 +15,13 @@
ServerInfo server = dao.getServer(Long.parseLong(request.getParameter("id")));
String countryName = "Unknown";
+ String localizedCountryName = "Unknown";
String countryFlag = "United Nations";
if (server.getCountry() != null) {
Locale locale = new Locale("en", server.getCountry());
countryName = locale.getDisplayCountry(Locale.ENGLISH);
+ localizedCountryName = locale.getDisplayCountry(request.getLocale());
countryFlag = countryName;
}
@@ -27,24 +30,32 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>TetriNET Server - <%= server.getHostname() %></title>
+ <title>
+ <fmt:message key="title.server">
+ <fmt:param><%= server.getHostname() %></fmt:param>
+ </fmt:message>
+ </title>
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<link rel="Shorcut Icon" href="favicon.ico">
<script type="text/javascript" src="scripts/sortable.js"></script>
</head>
<body>
-<h1>TetriNET Server - <%= server.getHostname() %></h1>
+<h1>
+ <fmt:message key="title.server">
+ <fmt:param><%= server.getHostname() %></fmt:param>
+ </fmt:message>
+</h1>
<% if (server.getMaxPlayerCount() > 0) { %>
<div style="float: right">
- <img src="images/graphs/server-<%= server.getId() %>.png" alt="Activity graph">
+ <img src="images/graphs/server-<%= server.getId() %>.png" alt="<fmt:message key="word.activity-graph"/>">
</div>
<% } %>
<table class="thin" border="1" cellspacing="0" style="min-width: 40%">
<tr>
- <th width="25%">Website</th>
+ <th width="25%"><fmt:message key="word.website"/></th>
<td>
<% if (server.getWebsite() != null) { %>
<a href="<%= server.getWebsite() %>"><%= server.getWebsite() %></a>
@@ -52,81 +63,100 @@
</td>
</tr>
<tr>
- <th>Description</th>
+ <th><fmt:message key="word.description"/></th>
<td><%= server.getDescription() != null ? server.getDescription() : "" %></td>
</tr>
<tr>
- <th>Version</th>
+ <th><fmt:message key="word.version"/></th>
<td><%= server.getVersion() != null ? server.getVersion() : "" %></td>
</tr>
<tr>
- <th>Country</th>
+ <th><fmt:message key="word.country"/></th>
<td>
<table border="0" cellpadding="0" cellspacing="0">
<tr>
- <td><img src="images/flags/24/<%= countryFlag %>.png" alt="<%= countryName%>" title="<%= countryName%>"></td>
- <td><%= countryName%></td>
+ <td><img src="images/flags/24/<%= countryFlag %>.png" alt="<%= localizedCountryName%>"></td>
+ <td><%= localizedCountryName%></td>
</tr>
</table>
</td>
</tr>
<tr>
- <th>Players</th>
+ <th><fmt:message key="word.players"/></th>
<td>
<%= server.getStats().getPlayerCount() %>
<% if (server.getStats().getActivePlayerCount() > 0) { %>
- (<%= server.getStats().getActivePlayerCount() %> active)
+ (<%= server.getStats().getActivePlayerCount() %> <fmt:message key="word.active"/>)
<% } %>
</td>
</tr>
<% if (server.getMaxPlayerCount() != 0 && server.getMaxActivePlayerCount() != 0) { %>
<tr>
- <th>Peak</th>
+ <th><fmt:message key="word.peak"/></th>
<td>
- <%= server.getMaxPlayerCount() %> players reached on <%= server.getMaxPlayerDate() %><br>
- <%= server.getMaxActivePlayerCount() %> active players reached on <%= server.getMaxActivePlayerDate() %>
+ <fmt:message key="message.peak.players">
+ <fmt:param><%= server.getMaxPlayerCount() %></fmt:param>
+ <fmt:param><%= server.getMaxPlayerDate() %></fmt:param>
+ </fmt:message>
+ <br>
+ <fmt:message key="message.peak.active-players">
+ <fmt:param><%= server.getMaxActivePlayerCount() %></fmt:param>
+ <fmt:param><%= server.getMaxActivePlayerDate() %></fmt:param>
+ </fmt:message>
</td>
</tr>
<% } %>
<tr>
- <th>Channels</th>
+ <th><fmt:message key="word.channels"/></th>
<td><%= server.getStats().getChannelCount() %></td>
</tr>
<tr>
- <th>TSpec Access</th>
- <td style="color: <%= server.isSpectate() ? "green" : "red" %>"><%= server.isSpectate() ? "Yes" : "No" %></td>
+ <th><fmt:message key="word.tspec-access"/></th>
+ <td style="color: <%= server.isSpectate() ? "green" : "red" %>">
+ <% if (server.isSpectate()) { %>
+ <fmt:message key="word.yes"/>
+ <% } else { %>
+ <fmt:message key="word.no"/>
+ <% } %>
+ </td>
</tr>
<tr>
- <th>Ping</th>
+ <th><fmt:message key="word.ping"/></th>
<td><%= server.getStats().getPing() %> ms</td>
</tr>
<tr>
- <th>Date Added</th>
+ <th><fmt:message key="word.date-added"/></th>
<td><%= server.getDateAdded() %></td>
</tr>
<tr>
- <th>Last Online</th>
- <td><%= server.getLastOnline() != null ? server.getLastOnline() : "Never" %></td>
+ <th><fmt:message key="word.last-online"/></th>
+ <td>
+ <% if (server.getLastOnline() != null) { %>
+ <%= server.getLastOnline() %>
+ <% } else { %>
+ <fmt:message key="word.never"/>
+ <% } %>
+ </td>
</tr>
</table>
-<p><a href="<%= request.getContextPath() %>/">Back to the server list</a></p>
+<p><a href="<%= request.getContextPath() %>/"><fmt:message key="message.back-to-servers"/></a></p>
<div style="clear: both;"></div>
<% if (!server.getPlayers().isEmpty()) { %>
-<h2>Players</h2>
+<h2><fmt:message key="word.players"/></h2>
<table class="thin sortable" id="players" border="1" style="min-width: 40%">
<thead>
<tr>
- <th>Nick</th>
- <th>Team</th>
- <th>Channel</th>
- <th>Slot</th>
- <th>Status</th>
- <th>Client</th>
+ <th><fmt:message key="word.nick"/></th>
+ <th><fmt:message key="word.team"/></th>
+ <th><fmt:message key="word.channel"/></th>
+ <th><fmt:message key="word.slot"/></th>
+ <th><fmt:message key="word.status"/></th>
+ <th><fmt:message key="word.tetrinet-client"/></th>
</tr>
</thead>
<tbody>
@@ -136,7 +166,13 @@
<td><%= StyleUtils.toHTML(player.getTeam()) %></td>
<td><%= player.getChannel() %></td>
<td><%= player.getSlot() %></td>
- <td style="color: <%= player.isPlaying() ? "green" : "inherit" %>"><%= player.isPlaying() ? "Playing" : "Idle" %></td>
+ <td style="color: <%= player.isPlaying() ? "green" : "inherit" %>">
+ <% if (player.isPlaying()) { %>
+ <fmt:message key="word.playing"/>
+ <% } else { %>
+ <fmt:message key="word.idle"/>
+ <% } %>
+ </td>
<td><%= player.getVersion() %></td>
</tr>
<% } %>
@@ -148,17 +184,17 @@
<% if (!server.getChannels().isEmpty()) { %>
-<h2>Channels</h2>
+<h2><fmt:message key="word.channels"/></h2>
<table class="thin sortable" id="channels" border="1" style="min-width: 40%">
<thead>
<tr>
- <th>Name</th>
- <th>Description</th>
- <th>Players</th>
- <th>Status</th>
+ <th><fmt:message key="word.name"/></th>
+ <th><fmt:message key="word.description"/></th>
+ <th><fmt:message key="word.players"/></th>
+ <th><fmt:message key="word.status"/></th>
<% if (viewable) { %>
- <th>Action</th>
+ <th><fmt:message key="word.action"/></th>
<% } %>
</tr>
</thead>
@@ -168,7 +204,11 @@
<td><%= channel.getName() %></td>
<td><%= StyleUtils.toHTML(channel.getDescription()) %></td>
<td><%= channel.getPlayernum() %> / <%= channel.getPlayermax() %></td>
- <td style="color: green; font-weight: bold"><%= channel.isPlaying() ? "INGAME" : "" %></td>
+ <td style="color: green; font-weight: bold">
+ <% if (channel.isPlaying()) { %>
+ <fmt:message key="word.ingame"/>
+ <% } %>
+ </td>
<% if (viewable) { %>
<td align="center">
<% if (channel.getPlayernum() > 0) { %>
Modified: monitor/trunk/src/main/webapp/spec.jsp
===================================================================
--- monitor/trunk/src/main/webapp/spec.jsp 2008-11-16 21:29:26 UTC (rev 777)
+++ monitor/trunk/src/main/webapp/spec.jsp 2008-11-16 23:47:28 UTC (rev 778)
@@ -1,8 +1,6 @@
+<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %>
<%@ page import="org.springframework.web.context.ContextLoader" %>
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
-<%@ page import="net.jetrix.monitor.PlayerStats" %>
-<%@ page import="net.jetrix.monitor.dao.PlayerStatsDao" %>
-<%@ page import="net.jetrix.monitor.StyleUtils" %>
<%@ page import="net.jetrix.monitor.dao.ServerInfoDao" %>
<%@ page import="net.jetrix.monitor.ServerInfo" %>
<%
@@ -16,13 +14,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>TetriNET Player - <%= channel %> on <%= server.getHostname() %></title>
+ <title>
+ <fmt:message key="title.channel">
+ <fmt:param><%= channel %></fmt:param>
+ <fmt:param><%= server.getHostname() %></fmt:param>
+ </fmt:message>
+ </title>
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
<link rel="Shorcut Icon" href="favicon.ico">
</head>
<body>
-<h1>TetriNET Player - <%= channel %> on <%= server.getHostname() %></h1>
+<h1>
+ <fmt:message key="title.channel">
+ <fmt:param><%= channel %></fmt:param>
+ <fmt:param><%= server.getHostname() %></fmt:param>
+ </fmt:message>
+</h1>
<div align="center">
<applet code="net.jetrix.spectator.SpectatorApplet" archive="webspec-0.1-SNAPSHOT.jar,jetrix-0.3-SNAPSHOT.jar" width="640" height="480">
@@ -33,7 +41,7 @@
</applet>
</div>
-<a href="server.jsp?id=<%= server.getId() %>">Back to the server info</a>
+<a href="server.jsp?id=<%= server.getId() %>"><fmt:message key="message.back-to-server-info"/></a>
</body>
</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
