Author: kwright
Date: Mon Feb 10 14:31:02 2014
New Revision: 1566637
URL: http://svn.apache.org/r1566637
Log:
Pull up fix for CONNECTORS-870 from trunk
Modified:
manifoldcf/branches/release-1.5-branch/ (props changed)
manifoldcf/branches/release-1.5-branch/CHANGES.txt
manifoldcf/branches/release-1.5-branch/framework/crawler-ui/src/main/webapp/login.jsp
Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/trunk:r1561928
Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1566637&r1=1566636&r2=1566637&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Mon Feb 10 14:31:02 2014
@@ -4,6 +4,10 @@ $Id$
======================= Release 1.5.1 =====================
+CONNECTORS-870: Avoid line break for login.jsp description
+when locale is Japanese.
+(Shinichiro Abe)
+
CONNECTORS-877: Missing Solr i18n key.
(Erlend Garåsen, Karl Wright)
Modified:
manifoldcf/branches/release-1.5-branch/framework/crawler-ui/src/main/webapp/login.jsp
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/framework/crawler-ui/src/main/webapp/login.jsp?rev=1566637&r1=1566636&r2=1566637&view=diff
==============================================================================
---
manifoldcf/branches/release-1.5-branch/framework/crawler-ui/src/main/webapp/login.jsp
(original)
+++
manifoldcf/branches/release-1.5-branch/framework/crawler-ui/src/main/webapp/login.jsp
Mon Feb 10 14:31:02 2014
@@ -62,13 +62,13 @@ if (value != null && value.equals("true"
}
%>
<tr>
- <td
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></td>
+ <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.UserIDColon")%></nobr></td>
<td
class="value">
<input
name="userID" type="text" size="32" value=""/>
</td>
</tr>
<tr>
- <td
class="description"><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></td>
+ <td
class="description"><nobr><%=Messages.getBodyString(pageContext.getRequest().getLocale(),"index.PasswordColon")%></nobr></td>
<td
class="value">
<input
name="password" type="password" size="32" value=""/>
</td>
