Skip to content

O
Openfire
Commit b76f1a6c authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

[GATE-36] Fixed via "hack" 

Added lots of new translatable strings.
Added german translation from dna.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5426 b35dd754-fafc-0310-a699-88a17e54d16e
parent b87a7322
Show whitespace changes
Inline Side-by-side
Showing with 171 additions and 47 deletions
src/plugins/gateway/src/i18n/gateway_i18n.properties
View file @ b76f1a6c
......@@ -27,7 +27,7 @@
##
## REVISION HISTORY (by IM Gateway version):
##
## 0.1
## 1.0 Beta 1
## Added key: 'gateway.aim.name'
## Added key: 'gateway.aim.username'
## Added key: 'gateway.aim.password'
......@@ -49,34 +49,117 @@
## Added key: 'gateway.irc.password'
## Added key: 'gateway.irc.nickname'
## Added key: 'gateway.irc.registration'
##
## 1.0 Beta 2
## Added key: 'login.title'
## Added key: 'global.add'
## Added key: 'global.edit'
## Added key: 'global.cancel'
## Added key: 'global.save_changes'
## Added key: 'gateway.aim.shortservice'
## Added key: 'gateway'aim.service'
## Added key: 'gateway.icq.shortservice'
## Added key: 'gateway'icq.service'
## Added key: 'gateway.irc.shortservice'
## Added key: 'gateway'irc.service'
## Added key: 'gateway.msn.shortservice'
## Added key: 'gateway'msn.service'
## Added key: 'gateway.yahoo.shortservice'
## Added key: 'gateway'yahoo.service'
## Added key: 'gateway.web.settings.instructions'
## Added key: 'gateway.web.registrations.instructions'
## Added key: 'gateway.web.registrations.addnewreg'
## Added key: 'gateway.web.registrations.cancelnewreg'
## Added key: 'gateway.web.registrations.username'
## Added key: 'gateway.web.registrations.password'
## Added key: 'gateway.web.registrations.nickname'
## Added key: 'gateway.web.registrations.jid'
## Added key: 'gateway.web.registrations.gateway'
## Added key: 'gateway.web.registrations.signedon'
## Added key: 'gateway.web.registrations.update'
## Added key: 'gateway.web.registrations.regsuccess'
## Added key: 'gateway.web.registrations.regfailure'
## Added key: 'gateway.web.registrations.next'
## Added key: 'gateway.web.registrations.prev'
## Added key: 'gateway.web.registrations.remove'
## Added key: 'gateway.web.registrations.edit'
## Added key: 'gateway.web.registrations.lastlogin'
## Added key: 'gateway.web.registrations.serviceusername'
## Added key: 'gateway.web.registrations.user'
## Added key: 'gateway.web.registrations.confirmdelete'
## Added key: 'gateway.web.registrations.registrations'
# Temporary Tags Until Fixed Properly
login.title=Admin Console
global.add=Add
global.edit=Edit
global.cancel=Cancel
global.save_changes=Save Changes
# AIM Transport
gateway.aim.shortservice=AIM
gateway.aim.service=AOL Instant Messenger
gateway.aim.name=AIM Transport
gateway.aim.username=ScreenName
gateway.aim.password=Password
gateway.aim.registration=Please enter your AIM ScreenName and password.
# ICQ Transport
gateway.icq.shortservice=ICQ
gateway.icq.service=ICQ
gateway.icq.name=ICQ Transport
gateway.icq.username=UIN/ICQ#
gateway.icq.password=Password
gateway.icq.registration=Please enter your ICQ# (UIN) and password.
# MSN Transport
gateway.msn.shortservice=MSN
gateway.msn.service=MSN Messenger
gateway.msn.name=MSN Transport
gateway.msn.username=E-Mail Address
gateway.msn.password=Password
gateway.msn.registration=Please enter your MSN Passport e-mail address and password.
# Yahoo Transport
gateway.yahoo.shortservice=Yahoo
gateway.yahoo.service=Yahoo! Messenger
gateway.yahoo.name=Yahoo! Transport
gateway.yahoo.username=Yahoo! ID
gateway.yahoo.password=Password
gateway.yahoo.registration=Please enter your Yahoo! ID and password.
# IRC Transport
gateway.irc.shortservice=IRC
gateway.irc.service=IRC
gateway.irc.name=IRC Transport
gateway.irc.username=Username
gateway.irc.password=Password
gateway.irc.nickname=Nickname
gateway.irc.registration=Please enter your IRC username, password, and nickname. Nickname is the primary username used while username and password are used for authentication. If no password is required, leave it blank.
# Web Interface (Settings)
gateway.web.settings.instructions=Select which gateways will be allowed, what features are available, and who can connect to each gateway service. Checking a gateway enables the service.
# Web Interface (Registrations)
gateway.web.registrations.instructions=Below is a list of all gateway service registrations. To filter by active sessions and/or specific gateways select the options below and update the view.
gateway.web.registrations.addnewreg=Add a new registration
gateway.web.registrations.cancelnewreg=Cancel adding new registration
gateway.web.registrations.username=username
gateway.web.registrations.password=password
gateway.web.registrations.nickname=nickname
gateway.web.registrations.jid=user (JID)
gateway.web.registrations.gateway=gateway
gateway.web.registrations.signedon=Signed on only
gateway.web.registrations.update=Update
gateway.web.registrations.regsuccess=Registration successfully updated.
gateway.web.registrations.regfailure=Registration update failed.
gateway.web.registrations.next=Next
gateway.web.registrations.prev=Prev
gateway.web.registrations.remove=Remove
gateway.web.registrations.edit=Edit
gateway.web.registrations.lastlogin=Last Login
gateway.web.registrations.serviceusername=Service/Username
gateway.web.registrations.user=User
gateway.web.registrations.confirmdelete=Are you sure you want to delete this registration?
gateway.web.registrations.registrations=Registrations
\ No newline at end of file
src/plugins/gateway/src/i18n/gateway_i18n_de.properties 0 → 100644
View file @ b76f1a6c
##
## IM Gateway Resource Bundle - German locale (de)
##
## For a full changelog, refer to the English bundle, gateway_i18n.properties.
# AIM Transport
gateway.aim.name=AIM Transport
gateway.aim.username=ScreenName
gateway.aim.password=Passwort
gateway.aim.registration=Bitte geben Sie ihr AIM ScreenName und das Passwort ein.
# ICQ Transport
gateway.icq.name=ICQ Transport
gateway.icq.username=UIN/ICQ#
gateway.icq.password=Passwort
gateway.icq.registration=Bitte geben Sie Ihre ICQ Nummer (UIN) und das Passwort ein.
# MSN Transport
gateway.msn.name=MSN Transport
gateway.msn.username=E-Mail Address
gateway.msn.password=Password
gateway.msn.registration=Bitte geben Sie Ihre E-Mailadresse und Passwort f\u00fcr das MSN Passport ein.
# Yahoo Transport
gateway.yahoo.name=Yahoo! Transport
gateway.yahoo.username=Yahoo! ID
gateway.yahoo.password=Passwort
gateway.yahoo.registration=Bitte geben Sie Ihre Yahoo! ID und das Passwort ein.
# IRC Transport
gateway.irc.name=IRC Transport
gateway.irc.username=Benutzername
gateway.irc.password=Passwort
gateway.irc.nickname=Nickname
gateway.irc.registration=Bitte geben Sie Ihren IRC Benutzername, das Passwort und den Nickname ein. Der Benutzername und das Passwort werden f\u00fcr die Authentifizierung benutzt. Wird kein Passwort ben\u00f6tigt, lassen Sie das Feld frei.
\ No newline at end of file
src/plugins/gateway/src/web/gateway-registrations.jsp
View file @ b76f1a6c
......@@ -60,7 +60,7 @@
try {
Registration reg = new Registration(regId);
reg.setUsername(ParamUtils.getParameter(request, "username"));
reg.setPassword(ParamUtils.getParameter(request, "password")); reg.setPassword(ParamUtils.getParameter(request, "password"));
reg.setPassword(ParamUtils.getParameter(request, "password"));
reg.setNickname(ParamUtils.getParameter(request, "nickname"));
response.sendRedirect("gateway-registrations.jsp?success=true");
return;
......@@ -113,6 +113,7 @@
public long id = -1;
public String type = null;
public String username = null;
public String nickname = null;
public String status = "unavailable";
public String linestatus = "offline";
public String lastLogin = null;
......@@ -157,6 +158,7 @@
res.id = registration.getRegistrationID();
res.jid = registration.getJID();
res.username = registration.getUsername();
res.nickname = registration.getNickname();
res.type = registration.getTransportType().toString();
if (!filteropts.contains(res.type)) { continue; }
......@@ -239,8 +241,7 @@
<body>
<p>Below is a list of all gateway service registrations. To filter by active sessions and/or specific gateways select the options
below and update the view.</p>
<p><fmt:message key="gateway.web.registrations.instructions" /></p>
<%
if (success != null) {
......@@ -253,7 +254,7 @@ below and update the view.</p>
<tr><td class="jive-icon"><img src="/images/success-16x16.gif" width="16"
height="16" border="0" alt=""></td>
<td class="jive-icon-label">
Registration successfully updated.
<fmt:message key="gateway.web.registrations.regsuccess" />
</td></tr>
</tbody>
</table>
......@@ -270,7 +271,7 @@ below and update the view.</p>
<tr><td class="jive-icon"><img src="/images/error-16x16.gif" width="16"
height="16" border="0" alt=""></td>
<td class="jive-icon-label">
Registration update failed.
<fmt:message key="gateway.web.registrations.regfailure" />
</td></tr>
</tbody>
</table>
......@@ -283,7 +284,7 @@ below and update the view.</p>
<!-- BEGIN add registration -->
<div class="jive-gateway-addregBtn" id="jiveAddRegButton">
<a href="" onClick="toggleAdd(); return false" id="jiveAddRegLink">Add a new registration</a>
<a href="" onClick="toggleAdd(); return false" id="jiveAddRegLink"><fmt:message key="gateway.web.registrations.addnewreg" /></a>
</div>
<div class="jive-gateway-addreg" id="jiveAddRegPanel" style="display: none;">
<div class="jive-gateway-addregPad">
......@@ -291,34 +292,34 @@ below and update the view.</p>
<input type="hidden" name="action" value="add" />
<div class="jive-registrations-addJid">
<input type="text" name="gatewayJID" size="12" maxlength="50" value=""><br>
<strong>user (JID)</strong>
<strong><fmt:message key="gateway.web.registrations.jid" /></strong>
</div>
<div class="jive-registrations-addGateway">
<select name="gatewayType" size="1">
<option value="0" SELECTED> -- select -- </option>
<% if (trEnabled.get("aim")) { %> <option value="aim">AIM</option> <% } %>
<% if (trEnabled.get("icq")) { %> <option value="icq">ICQ</option> <% } %>
<% if (trEnabled.get("irc")) { %> <option value="irc">IRC</option> <% } %>
<% if (trEnabled.get("msn")) { %> <option value="msn">MSN</option> <% } %>
<% if (trEnabled.get("yahoo")) { %> <option value="yahoo">Yahoo</option> <% } %>
<% if (trEnabled.get("aim")) { %> <option value="aim"><fmt:message key="gateway.aim.shortservice" /></option> <% } %>
<% if (trEnabled.get("icq")) { %> <option value="icq"><fmt:message key="gateway.icq.shortservice" /></option> <% } %>
<% if (trEnabled.get("irc")) { %> <option value="irc"><fmt:message key="gateway.irc.shortservice" /></option> <% } %>
<% if (trEnabled.get("msn")) { %> <option value="msn"><fmt:message key="gateway.msn.shortservice" /></option> <% } %>
<% if (trEnabled.get("yahoo")) { %> <option value="yahoo"><fmt:message key="gateway.yahoo.shortservice" /></option> <% } %>
</select><br>
<strong>gateway</strong>
<strong><fmt:message key="gateway.web.registrations.gateway" /></strong>
</div>
<div class="jive-registrations-addUsername">
<input type="text" name="gatewayUser" size="12" maxlength="50" value=""><br>
<strong>username</strong>
<strong><fmt:message key="gateway.web.registrations.username" /></strong>
</div>
<div class="jive-registrations-addPassword">
<input type="password" name="gatewayPass" size="12" maxlength="50" value=""><br>
<strong>password</strong>
<strong><fmt:message key="gateway.web.registrations.password" /></strong>
</div>
<div class="jive-registrations-addNickname">
<input type="text" name="gatewayNick" size="12" maxlength="50" value=""><br>
<strong>nickname</strong>
<strong><fmt:message key="gateway.web.registrations.nickname" /></strong>
</div>
<div class="jive-registrations-addButtons">
<input type="submit" name="Submit" value="Add" class="savechanges"> &nbsp;
<input type="reset" name="reset" value="Cancel" class="cancel" onClick="toggleAdd();">
<input type="submit" name="Submit" value="<fmt:message key="global.add" />" class="savechanges"> &nbsp;
<input type="reset" name="reset" value="<fmt:message key="global.cancel" />" class="cancel" onClick="toggleAdd();">
</div>
</form>
</div>
......@@ -334,7 +335,7 @@ below and update the view.</p>
<!-- BEGIN results -->
<div class="jive-registrations-results">
Registrations: <strong><%= (start+1) %>-<%= topRange %></strong> of <strong><%= resCount %></strong>
<fmt:message key="gateway.web.registrations.registrations" />: <strong><%= (start+1) %>-<%= topRange %></strong> of <strong><%= resCount %></strong>
</div>
<!-- END results -->
......@@ -359,7 +360,7 @@ below and update the view.</p>
<%
if (numPages > 1 && ((curPage) > 1)) {
%>
<a href="gateway-registrations.jsp?start=<%= ((curPage-2)*range) %>">&lt; Prev</a>
<a href="gateway-registrations.jsp?start=<%= ((curPage-2)*range) %>">&lt; <fmt:message key="gateway.web.registrations.prev" /></a>
<%
}
for (int i=0; i<numPages; i++) {
......@@ -377,7 +378,7 @@ below and update the view.</p>
}
if (numPages > 1 && ((curPage) < numPages)) {
%>
<a href="gateway-registrations.jsp?start=<%= (curPage*range) %>">Next &gt;</a>
<a href="gateway-registrations.jsp?start=<%= (curPage*range) %>"><fmt:message key="gateway.web.registrations.next" /> &gt;</a>
<%
}
%>
......@@ -393,33 +394,33 @@ below and update the view.</p>
<label for="filterAIMcheckbox">
<input type="checkbox" name="filter[]" value="aim" <%= ((filteropts.contains("aim")) ? "checked" : "") %> id="filterAIMcheckbox">
<img src="images/aim.gif" alt="" border="0">
<span>AIM</span>
<span><fmt:message key="gateway.aim.shortservice" /></span>
</label>
<label for="filterICQcheckbox">
<input type="checkbox" name="filter[]" value="icq" <%= ((filteropts.contains("icq")) ? "checked" : "") %> id="filterICQcheckbox">
<img src="images/icq.gif" alt="" border="0">
<span>ICQ</span>
<span><fmt:message key="gateway.icq.shortservice" /></span>
</label>
<label for="filterIRCcheckbox">
<input type="checkbox" name="filter[]" value="irc" <%= ((filteropts.contains("irc")) ? "checked" : "") %> id="filterIRCcheckbox">
<img src="images/irc.gif" alt="" border="0">
<span>IRC</span>
<span><fmt:message key="gateway.irc.shortservice" /></span>
</label>
<label for="filterMSNcheckbox">
<input type="checkbox" name="filter[]" value="msn" <%= ((filteropts.contains("msn")) ? "checked" : "") %> id="filterMSNcheckbox">
<img src="images/msn.gif" alt="" border="0">
<span>MSN</span>
<span><fmt:message key="gateway.msn.shortservice" /></span>
</label>
<label for="filterYAHOOcheckbox">
<input type="checkbox" name="filter[]" value="yahoo" <%= ((filteropts.contains("yahoo")) ? "checked" : "") %> id="filterYAHOOcheckbox">
<img src="images/yahoo.gif" alt="" border="0">
<span>Yahoo</span>
<span><fmt:message key="gateway.yahoo.shortservice" /></span>
</label>
<label for="filterActiveOnly">
<input type="checkbox" name="filter[]" value="signedon" <%= ((filteropts.contains("signedon")) ? "checked" : "") %> id="filterActiveOnly">
<span>Signed on only</span>
<span><fmt:message key="gateway.web.registrations.signedon" /></span>
</label>
<input type="submit" name="submit" value="Update" class="filterBtn">
<input type="submit" name="submit" value="<fmt:message key="gateway.web.registrations.update" />" class="filterBtn">
</div>
</div>
</form>
......@@ -432,11 +433,11 @@ below and update the view.</p>
<thead>
<tr>
<th width="20" class="border-left">&nbsp;</th>
<th width="25%">User</th>
<th>Service/Username</th>
<th>Last Login</th>
<th width="1%"><div align="center">Edit</div></th>
<th width="1%" class="border-right">Remove</th>
<th width="25%"><fmt:message key="gateway.web.registrations.user" /></th>
<th><fmt:message key="gateway.web.registrations.serviceusername" /></th>
<th><fmt:message key="gateway.web.registrations.lastlogin" /></th>
<th width="1%"><div align="center"><fmt:message key="gateway.web.registrations.edit" /></div></th>
<th width="1%" class="border-right"><fmt:message key="gateway.web.registrations.remove" /></th>
</tr>
</thead>
<tbody>
......@@ -455,7 +456,7 @@ below and update the view.</p>
<td><span class="jive-gateway-<%= result.linestatus %> jive-gateway-<%= result.type.toUpperCase() %><%= ((result.sessionActive) ? "on" : "off") %>"><%= result.username %></span></td>
<td><%= result.lastLogin %></td>
<td align="center"><a href="" onClick="toggleEdit(<%= result.id %>); return false"><img src="/images/edit-16x16.gif" alt="" border="0"></a></td>
<td align="center"><form method="post" id="deleteRegistration<%= result.id %>" name="deleteRegistration<%= result.id %>" action="gateway-registrations.jsp"><input type="hidden" name="action" value="delete" /><input type="hidden" name="deleteid" value="<%= result.id %>" /><a href="" onClick="if (confirm('Are you sure you want to delete this registration?')) { document.getElementById('deleteRegistration<%= result.id %>').submit(); return false; } else { return false; }"><img src="/images/delete-16x16.gif" alt="" border="0"></a></form></td>
<td align="center"><form method="post" id="deleteRegistration<%= result.id %>" name="deleteRegistration<%= result.id %>" action="gateway-registrations.jsp"><input type="hidden" name="action" value="delete" /><input type="hidden" name="deleteid" value="<%= result.id %>" /><a href="" onClick="if (confirm('<fmt:message key="gateway.web.registrations.confirmdelete" />')) { document.getElementById('deleteRegistration<%= result.id %>').submit(); return false; } else { return false; }"><img src="/images/delete-16x16.gif" alt="" border="0"></a></form></td>
</tr>
<tr id="jiveRegistrationEdit<%= result.id %>" style="display: none;">
<td align="center"><img src="images/im_<%= result.status %>.gif" alt="<%= result.status %>" border="0"></td>
......@@ -464,15 +465,19 @@ below and update the view.</p>
<span class="jive-gateway-<%= result.linestatus %> jive-gateway-<%= result.type.toUpperCase() %>on">
<div class="jive-registrations-editUsername">
<input type="text" name="username" size="12" maxlength="50" value="<%= result.username %>"><br>
<strong>username</strong>
<strong><fmt:message key="gateway.web.registrations.username" /></strong>
</div>
<div class="jive-registrations-editPassword">
<input type="password" name="password" size="12" maxlength="50" value="*********"><br>
<strong>password</strong>
<strong><fmt:message key="gateway.web.registrations.password" /></strong>
</div>
<div class="jive-registrations-editNickname">
<input type="text" name="nickname" size="12" maxlength="50" value="<%= result.nickname %>"><br>
<strong><fmt:message key="gateway.web.registrations.nickname" /></strong>
</div>
<div class="jive-registrations-editButtons">
<input type="submit" name="Submit" value="Save Changes" class="savechanges" onClick="document.getElementById.submit()"> &nbsp;
<input type="reset" name="reset" value="Cancel" class="cancel" onClick="toggleEdit(<%= result.id %>);">
<input type="submit" name="Submit" value="<fmt:message key="global.save_changes" />" class="savechanges" onClick="document.getElementById.submit()"> &nbsp;
<input type="reset" name="reset" value="<fmt:message key="global.cancel" />" class="cancel" onClick="toggleEdit(<%= result.id %>);">
</div>
</span>
</form></td>
......
src/plugins/gateway/src/web/gateway-settings.jsp
View file @ b76f1a6c
......@@ -4,6 +4,7 @@
org.jivesoftware.wildfire.gateway.TransportType"
errorPage="error.jsp"
%>
<%@ page import="org.jivesoftware.util.LocaleUtils"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......@@ -71,11 +72,11 @@
}
}
GatewaySettings aimSettings = new GatewaySettings(out, plugin, TransportType.aim, "AOL Instant Messenger");
GatewaySettings icqSettings = new GatewaySettings(out, plugin, TransportType.icq, "ICQ");
GatewaySettings ircSettings = new GatewaySettings(out, plugin, TransportType.irc, "IRC");
GatewaySettings msnSettings = new GatewaySettings(out, plugin, TransportType.msn, "MSN Messenger");
GatewaySettings yahooSettings = new GatewaySettings(out, plugin, TransportType.yahoo, "Yahoo! Messenger");
GatewaySettings aimSettings = new GatewaySettings(out, plugin, TransportType.aim, LocaleUtils.getLocalizedString("gateway.aim.service", "gateway"));
GatewaySettings icqSettings = new GatewaySettings(out, plugin, TransportType.icq, LocaleUtils.getLocalizedString("gateway.icq.service", "gateway"));
GatewaySettings ircSettings = new GatewaySettings(out, plugin, TransportType.irc, LocaleUtils.getLocalizedString("gateway.irc.service", "gateway"));
GatewaySettings msnSettings = new GatewaySettings(out, plugin, TransportType.msn, LocaleUtils.getLocalizedString("gateway.msn.service", "gateway"));
GatewaySettings yahooSettings = new GatewaySettings(out, plugin, TransportType.yahoo, LocaleUtils.getLocalizedString("gateway.yahoo.service", "gateway"));
%>
......@@ -95,7 +96,7 @@
<body>
<p>Select which gateways will be allowed, what features are available, and who can connect to each gateway service. Checking a gateway enables the service.</p>
<p><fmt:message key="gateway.web.settings.instructions" /></p>
<form action="" name="gatewayForm">
......
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

Technounit-GROUP 2023