Commit e61ea870 authored by Matt Tucker's avatar Matt Tucker Committed by matt

i18n updates.


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@1351 b35dd754-fafc-0310-a699-88a17e54d16e
parent 11dbf32b
...@@ -54,13 +54,13 @@ ...@@ -54,13 +54,13 @@
## Added key: 'offline.messages.drop_option' ## Added key: 'offline.messages.drop_option'
## Added key: 'offline.messages.store_option' ## Added key: 'offline.messages.store_option'
## Added key: 'server.props.ssl_port' ## Added key: 'server.props.ssl_port'
## Added key: 'session.details.back_button'
## Removed duplicate key: 'groupchat.service.properties.error_service_name' ## Removed duplicate key: 'groupchat.service.properties.error_service_name'
## Removed duplicate key: 'logviewer.clear' ## Removed duplicate key: 'logviewer.clear'
## Removed duplicate key: 'session.details.unknown' ## Removed duplicate key: 'session.details.unknown'
## Fixed invalid value for key: 'logviewer.normal' ## Fixed invalid value for key: 'logviewer.normal'
# Messenger # Messenger
short.title = Jive Messenger short.title = Jive Messenger
...@@ -924,6 +924,7 @@ session.details.if_presence=Presence (if authenticated) ...@@ -924,6 +924,7 @@ session.details.if_presence=Presence (if authenticated)
session.details.clientip=Client IP session.details.clientip=Client IP
session.details.close_connect=Close Connection session.details.close_connect=Close Connection
session.details.session_detail=Current session details above. session.details.session_detail=Current session details above.
session.details.back_button=Back to Summary
# Session filter Page # Session filter Page
......
...@@ -63,9 +63,6 @@ ...@@ -63,9 +63,6 @@
sessions = sessionManager.getSessions(address.getNode()); sessions = sessionManager.getSessions(address.getNode());
} }
// Date dateFormatter for all dates on this page:
DateFormat dateFormatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,DateFormat.SHORT);
// Number dateFormatter for all numbers on this page: // Number dateFormatter for all numbers on this page:
NumberFormat numFormatter = NumberFormat.getNumberInstance(); NumberFormat numFormatter = NumberFormat.getNumberInstance();
%> %>
...@@ -224,32 +221,32 @@ ...@@ -224,32 +221,32 @@
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
<fmt:message key="session.details.session_created" />: <fmt:message key="session.details.session_created" />
</td> </td>
<td> <td>
<%= dateFormatter.format(currentSess.getCreationDate()) %> <%= JiveGlobals.formatDateTime(currentSess.getCreationDate()) %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
<fmt:message key="session.details.last_active" />: <fmt:message key="session.details.last_active" />
</td> </td>
<td> <td>
<%= dateFormatter.format(currentSess.getLastActiveDate()) %> <%= JiveGlobals.formatDateTime(currentSess.getLastActiveDate()) %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
<fmt:message key="session.details.statistics" />: <fmt:message key="session.details.statistics" />
</td> </td>
<td> <td>
<fmt:message key="session.details.received" />: <fmt:message key="session.details.received" />
<%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %> <%= numFormatter.format(currentSess.getNumClientPackets()) %>/<%= numFormatter.format(currentSess.getNumServerPackets()) %>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="c1"> <td class="c1">
<fmt:message key="session.details.hostname" />: <fmt:message key="session.details.hostname" />
</td> </td>
<td> <td>
<%= currentSess.getConnection().getInetAddress().getHostAddress() %> <%= currentSess.getConnection().getInetAddress().getHostAddress() %>
...@@ -326,7 +323,7 @@ ...@@ -326,7 +323,7 @@
<%-- <input type="submit" name="message" value="Message this Session">--%> <%-- <input type="submit" name="message" value="Message this Session">--%>
<%----%> <%----%>
<%--<% } %>--%> <%--<% } %>--%>
<input type="submit" name="back" value="Back to Summary"> <input type="submit" name="back" value="<fmt:message key="session.details.back_button" />">
</center> </center>
</form> </form>
......
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
// paginator vars // paginator vars
int numPages = (int)Math.ceil((double)sessionCount/(double)range); int numPages = (int)Math.ceil((double)sessionCount/(double)range);
int curPage = (start/range) + 1; int curPage = (start/range) + 1;
// Date dateFormatter for all dates on this page:
DateFormat dateFormatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM,DateFormat.SHORT);
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
...@@ -178,7 +175,7 @@ ...@@ -178,7 +175,7 @@
<br> <br>
<p> <p>
<fmt:message key="session.summary.last_update" />: <%= dateFormatter.format(new Date()) %> <fmt:message key="session.summary.last_update" />: <%= JiveGlobals.formatDateTime(new Date()) %>
</p> </p>
<jsp:include page="bottom.jsp" flush="true" /> <jsp:include page="bottom.jsp" flush="true" />
...@@ -59,9 +59,6 @@ ...@@ -59,9 +59,6 @@
} }
PresenceManager presenceManager = webManager.getPresenceManager(); PresenceManager presenceManager = webManager.getPresenceManager();
// Date formatter for dates
DateFormat formatter = DateFormat.getDateInstance(DateFormat.MEDIUM);
%> %>
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
...@@ -202,7 +199,7 @@ ...@@ -202,7 +199,7 @@
<fmt:message key="user.properties.registered" />: <fmt:message key="user.properties.registered" />:
</td> </td>
<td> <td>
<%= formatter.format(user.getCreationDate()) %> <%= JiveGlobals.formatDate(user.getCreationDate()) %>
</td> </td>
</tr> </tr>
</tbody> </tbody>
......
...@@ -81,9 +81,6 @@ ...@@ -81,9 +81,6 @@
// paginator vars // paginator vars
int numPages = (int)Math.ceil((double)userCount/(double)range); int numPages = (int)Math.ceil((double)userCount/(double)range);
int curPage = (start/range) + 1; int curPage = (start/range) + 1;
// Formatter for dates
DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.MEDIUM);
%> %>
<p> <p>
...@@ -247,7 +244,7 @@ ...@@ -247,7 +244,7 @@
<%= user.getName() %> &nbsp; <%= user.getName() %> &nbsp;
</td> </td>
<td width="26%"> <td width="26%">
<%= dateFormatter.format(user.getCreationDate()) %> <%= JiveGlobals.formatDate(user.getCreationDate()) %>
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>" <a href="user-edit-form.jsp?username=<%= URLEncoder.encode(user.getUsername(), "UTF-8") %>"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment