You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by sh...@apache.org on 2012/10/26 02:15:46 UTC

svn commit: r1402357 - in /manifoldcf/trunk: ./ framework/crawler-ui/src/main/webapp/ framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/

Author: shinichiro
Date: Fri Oct 26 00:15:45 2012
New Revision: 1402357

URL: http://svn.apache.org/viewvc?rev=1402357&view=rev
Log:
Fix for CONNECTORS-559

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
    manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1402357&r1=1402356&r2=1402357&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Oct 26 00:15:45 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.1-dev =====================
 
+CONNECTORS-559: Help link of navigation.jsp is incorrect by locale.
+(Shinichiro Abe)
+
 CONNECTORS-558: Fix 'Insert Here' button.
 (Shinichiro Abe)
 

Modified: manifoldcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp?rev=1402357&r1=1402356&r2=1402357&view=diff
==============================================================================
--- manifoldcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp (original)
+++ manifoldcf/trunk/framework/crawler-ui/src/main/webapp/navigation.jsp Fri Oct 26 00:15:45 2012
@@ -82,6 +82,6 @@
 <p class="menumain"><nobr><%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Miscellaneous")%></nobr></p>
 <ul class="menusecond">
 	<li class="menuitem">
-		<nobr><a class="menulink" href='<%="http://manifoldcf.apache.org/release/trunk/"+pageContext.getRequest().getLocale().toString()+"/end-user-documentation.html"%>' alt="Help"><%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Help")%></a></nobr>
+		<nobr><a class="menulink" href='<%="http://manifoldcf.apache.org/release/trunk/"+Messages.getString(pageContext.getRequest().getLocale(),"navigation.Locale")+"/end-user-documentation.html"%>' alt="Help"><%=Messages.getString(pageContext.getRequest().getLocale(),"navigation.Help")%></a></nobr>
 	</li>
 </ul>

Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties?rev=1402357&r1=1402356&r2=1402357&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties (original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties Fri Oct 26 00:15:45 2012
@@ -60,6 +60,7 @@ navigation.MaximumActivity=Maximum Activ
 navigation.MaximumBandwidth=Maximum Bandwidth
 navigation.ResultHistogram=Result Histogram
 navigation.Miscellaneous=Miscellaneous
+navigation.Locale=en_US
 navigation.Help=Help
 
 listoutputs.ApacheManifoldCFListOutputConnections=Apache ManifoldCF: List Output Connections

Modified: manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties?rev=1402357&r1=1402356&r2=1402357&view=diff
==============================================================================
--- manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties (original)
+++ manifoldcf/trunk/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties Fri Oct 26 00:15:45 2012
@@ -60,6 +60,7 @@ navigation.MaximumActivity=最大�
 navigation.MaximumBandwidth=最大バンド幅
 navigation.ResultHistogram=結果履歴
 navigation.Miscellaneous=その他
+navigation.Locale=ja_JP
 navigation.Help=ヘルプ
 
 listoutputs.ApacheManifoldCFListOutputConnections=Apache ManifoldCF：出力コネクション一覧