From 3b9649263a3aca61676d08f7ca0901cd85be4144 Mon Sep 17 00:00:00 2001 From: Danny van Heumen Date: Tue, 5 Aug 2014 00:16:20 +0200 Subject: [PATCH] Created resource strings for text in IRC registration wizard. --- resources/languages/resources.properties | 2 ++ .../plugin/ircaccregwizz/FirstWizardPage.java | 32 +++++++++++-------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index 3d42dcf37..f9d4e12d8 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -1067,12 +1067,14 @@ plugin.ircaccregwizz.PROTOCOL_NAME=IRC plugin.ircaccregwizz.PROTOCOL_DESCRIPTION=IRC protocol. plugin.ircaccregwizz.USERNAME_AND_PASSWORD=UIN and password plugin.ircaccregwizz.USERNAME=Nickname: +plugin.ircaccregwizz.EXAMPLE_USERNAME=Ex: ircuser plugin.ircaccregwizz.INFO_PASSWORD=Most IRC servers do not require password. plugin.ircaccregwizz.AUTO_NICK_CHANGE=Automatically change nick when it's already used plugin.ircaccregwizz.USE_DEFAULT_PORT=Use default port plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED=My nickname doesn't require identification plugin.ircaccregwizz.HOST=Hostname: plugin.ircaccregwizz.IRC_SERVER=Server +plugin.ircaccregwizz.EXAMPLE_SERVER=Ex: chat.freenode.net plugin.ircaccregwizz.USE_SECURE_CONNECTION=Use secure connection # jabber accregwizz diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java index 4284cec45..fc0e2e248 100644 --- a/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java +++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/FirstWizardPage.java @@ -39,14 +39,20 @@ public class FirstWizardPage */ public static final String FIRST_PAGE_IDENTIFIER = "FirstPageIdentifier"; - // FIXME create resource string - public static final String USER_NAME_EXAMPLE = "Ex: ircuser"; + /** + * Example of IRC nick name. + */ + public static final String USER_NAME_EXAMPLE = Resources + .getString("plugin.ircaccregwizz.EXAMPLE_USERNAME"); + + /** + * Example of IRC server name. + */ + public static final String SERVER_EXAMPLE = Resources + .getString("plugin.ircaccregwizz.EXAMPLE_SERVER"); - // FIXME create resource string - public static final String SERVER_EXAMPLE = "Ex: chat.freenode.net"; - private static final String DEFAULT_PLAINTEXT_PORT = "6667"; - + private static final String DEFAULT_SECURE_PORT = "6697"; private JPanel userPassPanel = new TransparentPanel(new BorderLayout(10, 10)); @@ -110,7 +116,7 @@ public class FirstWizardPage private JCheckBox passwordNotRequired = new SIPCommCheckBox( Resources.getString("plugin.ircaccregwizz.PASSWORD_NOT_REQUIRED")); - + private JCheckBox useSecureConnection = new SIPCommCheckBox( Resources.getString("plugin.ircaccregwizz.USE_SECURE_CONNECTION")); @@ -235,7 +241,7 @@ private void init(String userId, String server) serverPanel.add(labelsServerPanel, BorderLayout.WEST); serverPanel.add(valuesServerPanel, BorderLayout.CENTER); - + JPanel serverSubPanel = new JPanel(new BorderLayout()); serverSubPanel.setOpaque(false); serverSubPanel.add(defaultPort, BorderLayout.WEST); @@ -437,7 +443,7 @@ public void loadAccount(ProtocolProviderService protocolProvider) String noPasswordRequired = accountID .getAccountPropertyString(ProtocolProviderFactory.NO_PASSWORD_REQUIRED); - + boolean useSecureConnection = accountID.getAccountPropertyBoolean( ProtocolProviderFactory.DEFAULT_ENCRYPTION, true); @@ -474,7 +480,7 @@ public void loadAccount(ProtocolProviderService protocolProvider) passField.setEnabled(isPassRequired); } - + this.useSecureConnection.setSelected(useSecureConnection); } @@ -507,7 +513,7 @@ public void actionPerformed(ActionEvent event) passField.setEnabled(true); rememberPassBox.setEnabled(true); } - + setNextButtonAccordingToUserID(); } @@ -550,12 +556,12 @@ public boolean isCommitted() { return isCommitted; } - + public String getCurrentUserId() { return this.userIDField.getText(); } - + public String getCurrentServer() { return this.serverField.getText();