Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2010-03-02 21:57:48 +0000
committerChris Goldthorpe2010-03-02 21:57:48 +0000
commit819b7a83c5b18420ad2b28774d9bce2889f28ae5 (patch)
treeed451002f6c34359c758e0e4eb1cf79fc1927869
parent3e850a41d806250c211281d1fa23725a3c0ba522 (diff)
downloadeclipse.platform.ua-819b7a83c5b18420ad2b28774d9bce2889f28ae5.tar.gz
eclipse.platform.ua-819b7a83c5b18420ad2b28774d9bce2889f28ae5.tar.xz
eclipse.platform.ua-819b7a83c5b18420ad2b28774d9bce2889f28ae5.zip
Rename Search resource, see Bug 303804 - 'Search:' label is not translated in some languages
Diffstat
-rw-r--r--org.eclipse.help.webapp/advanced/advanced.jsp4
-rw-r--r--org.eclipse.help.webapp/advanced/searchScoped.jsp6
-rw-r--r--org.eclipse.help.webapp/advanced/searchSimple.jsp6
-rw-r--r--org.eclipse.help.webapp/basic/tabs.jsp4
-rw-r--r--org.eclipse.help.webapp/basic/toolbar.jsp4
-rw-r--r--org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties2
6 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.help.webapp/advanced/advanced.jsp b/org.eclipse.help.webapp/advanced/advanced.jsp
index 15480971d..92f2da22d 100644
--- a/org.eclipse.help.webapp/advanced/advanced.jsp
+++ b/org.eclipse.help.webapp/advanced/advanced.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2004 IBM Corporation and others.
+ Copyright (c) 2000, 2010 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -218,7 +218,7 @@ for (int i=0; i<tocData.getTocCount(); i++)
<table cellspacing=10 cellpading=0 border=0 align=<%=isRTL?"left":"right"%> style="background:transparent;">
<tr>
<td>
- <input id="searchButton" class='button' type="button" onclick="doAdvancedSearch()" value='<%=ServletResources.getString("Search", request)%>' id="go" alt='<%=ServletResources.getString("Search", request)%>' title='<%=ServletResources.getString("Search", request)%>'>
+ <input id="searchButton" class='button' type="button" onclick="doAdvancedSearch()" value='<%=ServletResources.getString("SearchLabel", request)%>' id="go" alt='<%=ServletResources.getString("SearchLabel", request)%>' title='<%=ServletResources.getString("SearchLabel", request)%>'>
</td>
<td>
<input class='button' type="button" onclick="window.close()" type="button" value='<%=ServletResources.getString("Cancel", request)%>' id="cancel" alt='<%=ServletResources.getString("Cancel", request)%>' title='<%=ServletResources.getString("Cancel", request)%>'>
diff --git a/org.eclipse.help.webapp/advanced/searchScoped.jsp b/org.eclipse.help.webapp/advanced/searchScoped.jsp
index 1f61146d7..b897d5e24 100644
--- a/org.eclipse.help.webapp/advanced/searchScoped.jsp
+++ b/org.eclipse.help.webapp/advanced/searchScoped.jsp
@@ -21,7 +21,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title><%=ServletResources.getString("Search", request)%></title>
+<title><%=ServletResources.getString("SearchLabel", request)%></title>
<style type="text/css">
/* need this one for Mozilla */
@@ -284,8 +284,8 @@ function onloadHandler(e)
<table id="searchTable" align="<%=isRTL?"right":"left"%>" valign="middle" cellspacing="0" cellpadding="0" border="0">
<tr nowrap valign="middle">
<td <%=isRTL?"nowrap":""%> id="searchTD">
- <label id="searchLabel" for="searchWord" accesskey="<%=ServletResources.getAccessKey("Search", request)%>">
- &nbsp;<%=ServletResources.getLabel("Search", request)%>
+ <label id="searchLabel" for="searchWord" accesskey="<%=ServletResources.getAccessKey("SearchLabel", request)%>">
+ &nbsp;<%=ServletResources.getLabel("SearchLabel", request)%>
</label>
</td>
<td>
diff --git a/org.eclipse.help.webapp/advanced/searchSimple.jsp b/org.eclipse.help.webapp/advanced/searchSimple.jsp
index 3da3e7f74..a993fee38 100644
--- a/org.eclipse.help.webapp/advanced/searchSimple.jsp
+++ b/org.eclipse.help.webapp/advanced/searchSimple.jsp
@@ -20,7 +20,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title><%=ServletResources.getString("Search", request)%></title>
+<title><%=ServletResources.getString("SearchLabel", request)%></title>
<style type="text/css">
/* need this one for Mozilla */
@@ -211,8 +211,8 @@ function onloadHandler(e)
<table id="searchTable" align="<%=isRTL?"right":"left"%>" valign="middle" cellspacing="0" cellpadding="0" border="0">
<tr nowrap valign="middle">
<td <%=isRTL?"nowrap":""%>>
- <label id="searchLabel" for="searchWord" accesskey="<%=ServletResources.getAccessKey("Search", request)%>">
- &nbsp;<%=ServletResources.getLabel("Search", request)%>
+ <label id="searchLabel" for="searchWord" accesskey="<%=ServletResources.getAccessKey("SearchLabel", request)%>">
+ &nbsp;<%=ServletResources.getLabel("SearchLabel", request)%>
</label>
</td>
<td>
diff --git a/org.eclipse.help.webapp/basic/tabs.jsp b/org.eclipse.help.webapp/basic/tabs.jsp
index 3607423a2..1ccddf1a0 100644
--- a/org.eclipse.help.webapp/basic/tabs.jsp
+++ b/org.eclipse.help.webapp/basic/tabs.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2009 IBM Corporation and others.
+ Copyright (c) 2000, 2010 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -60,7 +60,7 @@ function resynch()
// search view is not called "advanced view"
String title = data.getTitle(views[i]);
if("search".equals(views[i].getName())){
- title=ServletResources.getString("Search", request);
+ title=ServletResources.getString("SearchLabel", request);
}
String viewHref="view.jsp?view="+views[i].getName();
diff --git a/org.eclipse.help.webapp/basic/toolbar.jsp b/org.eclipse.help.webapp/basic/toolbar.jsp
index b05d6154f..fee32d67a 100644
--- a/org.eclipse.help.webapp/basic/toolbar.jsp
+++ b/org.eclipse.help.webapp/basic/toolbar.jsp
@@ -1,5 +1,5 @@
<%--
- Copyright (c) 2000, 2004 IBM Corporation and others.
+ Copyright (c) 2000, 2010 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
@@ -27,7 +27,7 @@
String title=data.getTitle();
// search view is not called "advanced view"
if("search".equals(request.getParameter("view"))){
- title=ServletResources.getString("Search", request);
+ title=ServletResources.getString("SearchLabel", request);
}
%>
<b>
diff --git a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
index 53220a18c..4c4bd39b0 100644
--- a/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
+++ b/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/WebappResources.properties
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
###############################################################################
browserTitle = Help - {0}
-Search=&Search:
+SearchLabel=&Search:
SearchResults=Search Results
Content=Contents
Links=Links

Back to the top