Commit 6c0ea581 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger

[GATE-27] Adjusted transports to use i18n strings.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5309 b35dd754-fafc-0310-a699-88a17e54d16e
parent 6b0d8cc1
......@@ -15,6 +15,7 @@ import org.jivesoftware.wildfire.gateway.TransportSession;
import org.jivesoftware.wildfire.gateway.Registration;
import org.jivesoftware.wildfire.gateway.PresenceType;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.xmpp.packet.JID;
/***
......@@ -31,28 +32,28 @@ public class IRCTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername()
*/
public String getTerminologyUsername() {
return "Username";
return LocaleUtils.getLocalizedString("gateway.irc.username", "gateway");
}
/**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword()
*/
public String getTerminologyPassword() {
return "Password";
return LocaleUtils.getLocalizedString("gateway.irc.password", "gateway");
}
/**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyNickname()
*/
public String getTerminologyNickname() {
return "Nickname";
return LocaleUtils.getLocalizedString("gateway.irc.nickname", "gateway");
}
/**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration()
*/
public String getTerminologyRegistration() {
return "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.";
return LocaleUtils.getLocalizedString("gateway.irc.registration", "gateway");
}
/**
......
......@@ -11,6 +11,7 @@
package org.jivesoftware.wildfire.gateway.protocols.msn;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.BaseTransport;
import org.jivesoftware.wildfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.Registration;
......@@ -33,14 +34,14 @@ public class MSNTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername()
*/
public String getTerminologyUsername() {
return "E-mail Address";
return LocaleUtils.getLocalizedString("gateway.msn.username", "gateway");
}
/**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword()
*/
public String getTerminologyPassword() {
return "Password";
return LocaleUtils.getLocalizedString("gateway.msn.password", "gateway");
}
/**
......@@ -54,7 +55,7 @@ public class MSNTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration()
*/
public String getTerminologyRegistration() {
return "Please enter your MSN Passport e-mail address and password.";
return LocaleUtils.getLocalizedString("gateway.msn.registration", "gateway");
}
/**
......
......@@ -11,6 +11,7 @@
package org.jivesoftware.wildfire.gateway.protocols.oscar;
import org.jivesoftware.wildfire.gateway.*;
import org.jivesoftware.util.LocaleUtils;
import org.xmpp.packet.JID;
/**
......@@ -27,19 +28,14 @@ public class OSCARTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername()
*/
public String getTerminologyUsername() {
if (getType().equals(TransportType.icq)) {
return "UIN/ICQ#";
}
else {
return "ScreenName";
}
return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".username", "gateway");
}
/**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword()
*/
public String getTerminologyPassword() {
return "Password";
return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".password", "gateway");
}
/**
......@@ -53,12 +49,7 @@ public class OSCARTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration()
*/
public String getTerminologyRegistration() {
if (getType().equals(TransportType.icq)) {
return "Please enter your ICQ# (UIN) and password.";
}
else {
return "Please enter your AIM ScreenName and password.";
}
return LocaleUtils.getLocalizedString("gateway."+getType().toString()+".registration", "gateway");
}
/**
......
......@@ -11,6 +11,7 @@
package org.jivesoftware.wildfire.gateway.protocols.yahoo;
import org.jivesoftware.util.Log;
import org.jivesoftware.util.LocaleUtils;
import org.jivesoftware.wildfire.gateway.BaseTransport;
import org.jivesoftware.wildfire.gateway.PresenceType;
import org.jivesoftware.wildfire.gateway.Registration;
......@@ -33,14 +34,14 @@ public class YahooTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyUsername()
*/
public String getTerminologyUsername() {
return "Yahoo! ID";
return LocaleUtils.getLocalizedString("gateway.yahoo.username", "gateway");
}
/**
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyPassword()
*/
public String getTerminologyPassword() {
return "Password";
return LocaleUtils.getLocalizedString("gateway.yahoo.password", "gateway");
}
/**
......@@ -54,7 +55,7 @@ public class YahooTransport extends BaseTransport {
* @see org.jivesoftware.wildfire.gateway.BaseTransport#getTerminologyRegistration()
*/
public String getTerminologyRegistration() {
return "Please enter your Yahoo! ID and password.";
return LocaleUtils.getLocalizedString("gateway.yahoo.registration", "gateway");
}
/**
......
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