litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

translate page titles of search result page and login page

Browse source
This commit is contained in:
Stefan Wolff 2016-11-01 16:38:41 +01:00
parent f518e78760
commit 71db92490d
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/freemarker/StaticPageController.java
View file

@ -5,12 +5,14 @@ package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues; import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
/* /*
* Servlet that only specifies a template, without putting any data * Servlet that only specifies a template, without putting any data
@ -33,7 +35,7 @@ public class StaticPageController extends FreemarkerHttpServlet {
String requestedUrl = vreq.getServletPath(); String requestedUrl = vreq.getServletPath();
String title = null; String title = null;
if (requestedUrl.equals("/login")) { if (requestedUrl.equals("/login")) {
title = "Log in to " + siteName; title = StringUtils.capitalize(I18n.text(vreq, "log_in")) + " - " + siteName;
} }
return title; return title;
} }

4
api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/PagedSearchController.java
View file

@ -262,8 +262,8 @@ public class PagedSearchController extends FreemarkerHttpServlet {
.getIndividualTemplateModels(individuals, vreq)); .getIndividualTemplateModels(individuals, vreq));
body.put("querytext", queryText); body.put("querytext", queryText);
body.put("title", queryText + " - " + appBean.getApplicationName() body.put("title", new StringBuilder().append(appBean.getApplicationName()).append(" - ").
+ " Search Results"); append(I18n.text(vreq, "search_results_for")).append(" '").append(queryText).append("'").toString());
body.put("hitCount", hitCount); body.put("hitCount", hitCount);
body.put("startIndex", startIndex); body.put("startIndex", startIndex);