Added resource bundlers for vcard mapping work.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5652 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/wildfire_i18n_en.properties

@@ -1404,6 +1404,21 @@ setup.ldap.server.debug_help=Write trace information about LDAP connections to S
 setup.ldap.server.referral=Follow Referrals
 setup.ldap.server.referral_help=Automatically follow LDAP referrals when found
 
+setup.ldap.server.test.error-auth=Error authenticating with the LDAP server. Check supplied credentials.
+setup.ldap.server.test.error-connection=Error connecting to the LDAP server. Ensure that the directory \
+    server is running at the specified host name and port and that a firewall is not blocking access \
+    to the server.
+setup.ldap.server.test.error-unknownhost=Unknown host address.
+setup.ldap.server.test.invalid-name=Invalid DN syntax or naming violation.
+setup.ldap.server.test.name-not-found=Error verifying base DN. Verify that the value is correct.
+setup.ldap.server.test.close=Close
+setup.ldap.server.test.title=Test
+setup.ldap.server.test.title-desc=Connection Settings
+setup.ldap.server.test.status-success=Status: Success!
+setup.ldap.server.test.status-success.detail=A connection was successfully established to the LDAP \
+    server using the settings above. Close this test panel and continue to the next step.
+setup.ldap.server.test.status-error=Status: Error
+
 setup.ldap.user.description=Configure how Wildfire finds and loads users from your LDAP directory. \
   If you need additional information about a field, hover your mouse over the corresponsing help icon.
 setup.ldap.user.username_field=Username Field
@@ -1426,6 +1441,31 @@ setup.ldap.user.user_filter_description=An optional user filter to append to the
   user filter would be "(uid={0})" where {0} is dynamically replaced with the username \
   being searched for.
 
+setup.ldap.user.vcard.mapping=User Profiles (vCard)
+setup.ldap.user.vcard.description=Use the form below to specify the LDAP fields that match the profile \
+    fields. Fields that are left empty will not be mapped. Values enclosed in {} will be replaced with \
+    actual LDAP content.
+setup.ldap.user.vcard.label1=Profile Field
+setup.ldap.user.vcard.label2=Value
+setup.ldap.user.vcard.name=Name
+setup.ldap.user.vcard.email=Email
+setup.ldap.user.vcard.fullname=Full Name
+setup.ldap.user.vcard.nickname=Nickname
+setup.ldap.user.vcard.birthday=Birthday
+setup.ldap.user.vcard.home=Home
+setup.ldap.user.vcard.street=Street Address
+setup.ldap.user.vcard.city=City
+setup.ldap.user.vcard.state=State/Province
+setup.ldap.user.vcard.pcode=Postal Code
+setup.ldap.user.vcard.country=Country
+setup.ldap.user.vcard.phone=Phone Number
+setup.ldap.user.vcard.mobile=Mobile Number
+setup.ldap.user.vcard.fax=Fax
+setup.ldap.user.vcard.pager=Pager
+setup.ldap.user.vcard.business=Business
+setup.ldap.user.vcard.title=Job Title
+setup.ldap.user.vcard.department=Department
+
 setup.ldap.group.description=Configure how Wildfire finds and loads groups from your LDAP directory. \
   If you need additional information about a field, hover your mouse over the corresponsing help icon.
 setup.ldap.group.name_field=Group Field

src/web/setup/setup-ldap-server_test.jsp

-<%@ page import="org.jivesoftware.wildfire.ldap.LdapManager" %>
-<%@ page import="java.util.Map, java.net.UnknownHostException, javax.naming.ldap.LdapContext, javax.naming.*" %>
+<%@ page import="org.jivesoftware.util.LocaleUtils" %>
+<%@ page import="org.jivesoftware.wildfire.ldap.LdapManager, javax.naming.*, javax.naming.ldap.LdapContext, java.net.UnknownHostException" %>
+<%@ page import="java.util.Map" %>
+
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
+
 <%
     boolean success = false;
     String errorDetail = "";
@@ -16,25 +21,22 @@
         }
         catch (NamingException e) {
             if (e instanceof AuthenticationException) {
-                errorDetail =
-                        "Error authenticating with the LDAP server. Check supplied credentials.";
+                errorDetail = LocaleUtils.getLocalizedString("setup.ldap.server.test.error-auth");
             }
             else if (e instanceof CommunicationException) {
-                errorDetail = "Error connecting to the LDAP server. Ensure that the directory " +
-                        "server is running at the specified host name and port and that a firewall " +
-                        "is not blocking access to the server.";
+                errorDetail = LocaleUtils.getLocalizedString("setup.ldap.server.test.error-connection");
                 Throwable cause = e.getCause();
                 if (cause != null) {
                     if (cause instanceof UnknownHostException) {
-                        errorDetail = "Unknown host address.";
+                        errorDetail = LocaleUtils.getLocalizedString("setup.ldap.server.test.error-unknownhost");
                     }
                 }
             }
             else if (e instanceof InvalidNameException) {
-                errorDetail = "Invalid DN syntax or naming violation.";
+                errorDetail = LocaleUtils.getLocalizedString("setup.ldap.server.test.invalid-name");
             }
             else if (e instanceof NameNotFoundException) {
-                errorDetail = "Error verifying base DN. Verify that the value is correct.";   
+                errorDetail = LocaleUtils.getLocalizedString("setup.ldap.server.test.name-not-found");
             }
             else {
                 errorDetail = e.getExplanation();
@@ -57,18 +59,17 @@
 		<div class="jive-testPanel-content">
 		
 			<div align="right" class="jive-testPanel-close">
-				<a href="#" class="lbAction" rel="deactivate">Close</a>
+				<a href="#" class="lbAction" rel="deactivate"><fmt:message key="setup.ldap.server.test.close" /></a>
 			</div>
 			
 			
-			<h2>Test: <span>Connection Settings</span></h2>
+			<h2><fmt:message key="setup.ldap.server.test.title" />: <span><fmt:message key="setup.ldap.server.test.title-desc" /></span></h2>
             <% if (success) { %>
-            <h4 class="jive-testSuccess">Status: Success!</h4>
+            <h4 class="jive-testSuccess"><fmt:message key="setup.ldap.server.test.status-success" /></h4>
 
-			<p>A connection was successfully established to the LDAP server using the settings above.
-			Close this test panel and continue to the next step.</p>
+			<p><fmt:message key="setup.ldap.server.test.status-success.detail" /></p>
             <% } else { %>
-            <h4 class="jive-testError">Status: Error</h4>
+            <h4 class="jive-testError"><fmt:message key="setup.ldap.server.test.status-error" /></h4>
             <p><%= errorDetail %></p>
             <% } %>