From 7a2b6bfe63f1a5a6d93fdbedcaa2eba32424b86e Mon Sep 17 00:00:00 2001
From: Sebastien Vincent <seb@jitsi.org>
Date: Wed, 22 Jun 2011 12:03:20 +0000
Subject: [PATCH] Adds languages resources for LDAP fields configuration tab.

---
 resources/languages/resources.properties      | 10 +++++++++
 .../configform/DirectorySettingsForm.java     | 21 ++++++++++++-------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties
index 51e2e76c6..63c6e19b1 100644
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@@ -604,6 +604,16 @@ impl.ldap.PASSWORD=Password
 impl.ldap.SEARCH_BASE=Search base
 impl.ldap.SCOPE=Scope
 impl.ldap.WRONG_CREDENTIALS=Wrong credentials for LDAP directory {0}
+impl.ldap.MAIL_FIELD_NAME=Mail field(s)
+impl.ldap.MAILSUFFIX_FIELD_NAME=Mail suffix field(s)
+impl.ldap.WORKPHONE_FIELD_NAME=Work phone field(s)
+impl.ldap.MOBILEPHONE_FIELD_NAME=Mobile phone field(s)
+impl.ldap.HOMEPHONE_FIELD_NAME=Home phone field(s)
+impl.ldap.MAIL_FIELD_EXAMPLE=mail
+impl.ldap.MAILSUFFIX_FIELD_EXAMPLE=@domain.org (do not forget to add \'@\')
+impl.ldap.WORKPHONE_FIELD_EXAMPLE=companyPhone
+impl.ldap.MOBILEPHONE_FIELD_EXAMPLE=mobilePhone
+impl.ldap.HOMEPHONE_FIELD_EXAMPLE=homePhone
 
 # Address book plugin
 plugin.addrbook.ADDRESS_BOOKS=Address book
diff --git a/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java b/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java
index eac38bfa7..b2ec77c97 100644
--- a/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java
+++ b/src/net/java/sip/communicator/plugin/ldap/configform/DirectorySettingsForm.java
@@ -170,9 +170,9 @@ public DirectorySettingsForm()
 
         this.setTitle(Resources.getString("impl.ldap.CONFIG_FORM_TITLE"));
 
-        setMinimumSize(new Dimension(400, getMinimumSize().height));
-        setSize(new Dimension(400, getMinimumSize().height));
-        setPreferredSize(new Dimension(400, getMinimumSize().height));
+        setMinimumSize(new Dimension(400, 400));
+        setSize(new Dimension(400, 400));
+        setPreferredSize(new Dimension(400, 400));
 
         pane.addTab("General", getContentPanel());
         pane.addTab("Fields", getFieldsPanel());
@@ -198,7 +198,8 @@ public JPanel getFieldsPanel()
         JPanel basePanel = new TransparentPanel(new GridBagLayout());
         GridBagConstraints c = new GridBagConstraints();
 
-        JLabel mailLabel = new JLabel("Mail field(s)");
+        JLabel mailLabel = new JLabel(
+            Resources.getString("impl.ldap.MAIL_FIELD_NAME"));
         c.gridx = 0;
         c.gridy = 0;
         c.weightx = 0;
@@ -231,7 +232,8 @@ public JPanel getFieldsPanel()
         c.anchor = GridBagConstraints.LINE_START;
         basePanel.add(mailExampleLabel, c);
 
-        JLabel mailSuffixLabel = new JLabel("Mail suffix");
+        JLabel mailSuffixLabel = new JLabel(
+            Resources.getString("impl.ldap.MAILSUFFIX_FIELD_NAME"));
         c.gridx = 0;
         c.gridy = 2;
         c.weightx = 0;
@@ -265,7 +267,8 @@ public JPanel getFieldsPanel()
         c.anchor = GridBagConstraints.LINE_START;
         basePanel.add(mailSuffixExampleLabel, c);
 
-        JLabel workPhoneLabel = new JLabel("Work phone field(s)");
+        JLabel workPhoneLabel = new JLabel(
+            Resources.getString("impl.ldap.WORKPHONE_FIELD_NAME"));
         c.gridx = 0;
         c.gridy = 4;
         c.weightx = 0;
@@ -299,7 +302,8 @@ public JPanel getFieldsPanel()
         c.anchor = GridBagConstraints.LINE_START;
         basePanel.add(workPhoneExampleLabel, c);
 
-        JLabel mobilePhoneLabel = new JLabel("Mobile phone field(s)");
+        JLabel mobilePhoneLabel = new JLabel(
+            Resources.getString("impl.ldap.MOBILEPHONE_FIELD_NAME"));
         c.gridx = 0;
         c.gridy = 6;
         c.weightx = 0;
@@ -333,7 +337,8 @@ public JPanel getFieldsPanel()
         c.anchor = GridBagConstraints.LINE_START;
         basePanel.add(mobilePhoneExampleLabel, c);
 
-        JLabel homePhoneLabel = new JLabel("Home phone field(s)");
+        JLabel homePhoneLabel = new JLabel(
+            Resources.getString("impl.ldap.HOMEPHONE_FIELD_NAME"));
         c.gridx = 0;
         c.gridy = 8;
         c.weightx = 0;