[sword-svn] r433 - in trunk/webapp: admin admin/login admin/translate layouts

scribe at crosswire.org scribe at crosswire.org
Thu Sep 1 12:41:27 MST 2016


Author: scribe
Date: 2016-09-01 12:41:26 -0700 (Thu, 01 Sep 2016)
New Revision: 433

Added:
   trunk/webapp/admin/login/
   trunk/webapp/admin/login/index.jsp
   trunk/webapp/admin/translate/
   trunk/webapp/admin/translate/index.jsp
Removed:
   trunk/webapp/admin/logon.jsp
   trunk/webapp/admin/translate.jsp
Modified:
   trunk/webapp/layouts/base-layout.jsp
Log:
updated to use non .jsp urls for admin i18n


Copied: trunk/webapp/admin/login/index.jsp (from rev 424, trunk/webapp/admin/logon.jsp)
===================================================================
--- trunk/webapp/admin/login/index.jsp	                        (rev 0)
+++ trunk/webapp/admin/login/index.jsp	2016-09-01 19:41:26 UTC (rev 433)
@@ -0,0 +1,5 @@
+<%
+	session.setAttribute("translator", "true");
+%>
+<h2>You are now logged in as a translator</h2>
+<a href="../../passagestudy.jsp">Go to website</a> and use "translate this page" link at the bottom of each page.

Deleted: trunk/webapp/admin/logon.jsp
===================================================================
--- trunk/webapp/admin/logon.jsp	2016-06-17 09:51:37 UTC (rev 432)
+++ trunk/webapp/admin/logon.jsp	2016-09-01 19:41:26 UTC (rev 433)
@@ -1,5 +0,0 @@
-<%
-	session.setAttribute("translator", "true");
-%>
-<h2>You are now logged in as a translator</h2>
-<a href="../passagestudy.jsp">Go to website</a> and use "translate this page" link at the bottom of each page.

Copied: trunk/webapp/admin/translate/index.jsp (from rev 424, trunk/webapp/admin/translate.jsp)
===================================================================
--- trunk/webapp/admin/translate/index.jsp	                        (rev 0)
+++ trunk/webapp/admin/translate/index.jsp	2016-09-01 19:41:26 UTC (rev 433)
@@ -0,0 +1,90 @@
+<%@ page
+    language="java"
+    contentType="text/html;charset=utf-8"
+%>
+<%@ page import="java.util.Set" %>
+<%@ page import="java.util.Properties" %>
+<%@ page import="java.io.File" %>
+<%@ page import="java.io.FileOutputStream" %>
+<%@ page import="org.crosswire.web.i18n.*" %>
+<%@ page import="org.crosswire.utils.*" %>
+
+<html>
+<body>
+<%
+	Set pageTags = (Set)session.getAttribute("pageTags");
+	if (pageTags != null) {
+
+		
+		String lang = request.getParameter("lang");
+		if (lang != null) {
+			session.setAttribute("lang", lang);
+		}
+		else {
+			lang = (String)session.getAttribute("lang");
+		}
+
+		if (lang == null) lang = "en_US";
+
+		if (request.getParameter("t0") != null) {
+			Properties locale = TranslateTag.getSessionLocale(pageContext);
+			int i = 0;
+			for (Object k : pageTags) {
+				String key = (String)k;
+				String value = (String)request.getParameter("t"+Integer.toString(i));
+				if ((key != null) && (value != null)) {
+					value = new String(value.getBytes("iso8859-1"), "UTF-8");
+					locale.setProperty(""+key.hashCode(), value);
+				}
+				++i;
+			}
+
+			File propName = new File(pageContext.getServletContext().getRealPath("/WEB-INF/classes/trans_"+lang+".properties"));
+			FileOutputStream propFile = new FileOutputStream(propName);
+			locale.store(propFile, null);
+			propFile.close();
+		}
+
+		String requestURL = (String)session.getAttribute("requestURL");
+	
+%>
+<p><a href="<%=requestURL%>">Return to website</a></p>
+	<form action="#">
+		<fieldset>
+			<legend>Language (use proper country codes (es, en, fr, etc.): </legend>
+			<input type="text" name="lang" size="10" value="<%=lang%>"/>
+			<input type="submit" value="switch" title="switch language" />
+		</fieldset>
+	</form>
+	<form action="#" method="POST">
+		<fieldset>
+			<legend>Strings which are marked for translation:</legend>
+<%
+		int i = 0;
+		for (Object k : pageTags) {
+			String key   = (String)k;
+			String value = TranslateTag.getTranslation(pageContext, key, false);
+%>
+	<p>
+			<%= HTTPUtils.canonize(key) %><br/>
+			<input type="text" name="t<%=i%>" size="120" value="<%= HTTPUtils.canonize(value)%>"/>
+	</p>
+<%
+			++i;
+		}
+%>
+			<input type="submit" value="save" title="Save translation strings" />
+		</fieldset>
+	</form>
+<%
+	}
+	else {
+%>
+
+<p>No strings which are marked for translation.</p>
+<p><a href="<%= session.getAttribute("requestURL") %>">Return to website</a></p>
+<%
+	}
+%>
+</body>
+</html>

Deleted: trunk/webapp/admin/translate.jsp
===================================================================
--- trunk/webapp/admin/translate.jsp	2016-06-17 09:51:37 UTC (rev 432)
+++ trunk/webapp/admin/translate.jsp	2016-09-01 19:41:26 UTC (rev 433)
@@ -1,90 +0,0 @@
-<%@ page
-    language="java"
-    contentType="text/html;charset=utf-8"
-%>
-<%@ page import="java.util.Set" %>
-<%@ page import="java.util.Properties" %>
-<%@ page import="java.io.File" %>
-<%@ page import="java.io.FileOutputStream" %>
-<%@ page import="org.crosswire.web.i18n.*" %>
-<%@ page import="org.crosswire.utils.*" %>
-
-<html>
-<body>
-<%
-	Set pageTags = (Set)session.getAttribute("pageTags");
-	if (pageTags != null) {
-
-		
-		String lang = request.getParameter("lang");
-		if (lang != null) {
-			session.setAttribute("lang", lang);
-		}
-		else {
-			lang = (String)session.getAttribute("lang");
-		}
-
-		if (lang == null) lang = "en_US";
-
-		if (request.getParameter("t0") != null) {
-			Properties locale = TranslateTag.getSessionLocale(pageContext);
-			int i = 0;
-			for (Object k : pageTags) {
-				String key = (String)k;
-				String value = (String)request.getParameter("t"+Integer.toString(i));
-				if ((key != null) && (value != null)) {
-					value = new String(value.getBytes("iso8859-1"), "UTF-8");
-					locale.setProperty(""+key.hashCode(), value);
-				}
-				++i;
-			}
-
-			File propName = new File(pageContext.getServletContext().getRealPath("/WEB-INF/classes/trans_"+lang+".properties"));
-			FileOutputStream propFile = new FileOutputStream(propName);
-			locale.store(propFile, null);
-			propFile.close();
-		}
-
-		String requestURL = (String)session.getAttribute("requestURL");
-	
-%>
-<p><a href="<%=requestURL%>">Return to website</a></p>
-	<form action="translate.jsp">
-		<fieldset>
-			<legend>Language (use proper country codes (es, en, fr, etc.): </legend>
-			<input type="text" name="lang" size="10" value="<%=lang%>"/>
-			<input type="submit" value="switch" title="switch language" />
-		</fieldset>
-	</form>
-	<form action="translate.jsp" method="POST">
-		<fieldset>
-			<legend>Strings which are marked for translation:</legend>
-<%
-		int i = 0;
-		for (Object k : pageTags) {
-			String key   = (String)k;
-			String value = TranslateTag.getTranslation(pageContext, key, false);
-%>
-	<p>
-			<%= HTTPUtils.canonize(key) %><br/>
-			<input type="text" name="t<%=i%>" size="120" value="<%= HTTPUtils.canonize(value)%>"/>
-	</p>
-<%
-			++i;
-		}
-%>
-			<input type="submit" value="save" title="Save translation strings" />
-		</fieldset>
-	</form>
-<%
-	}
-	else {
-%>
-
-<p>No strings which are marked for translation.</p>
-<p><a href="<%= session.getAttribute("requestURL") %>">Return to website</a></p>
-<%
-	}
-%>
-</body>
-</html>

Modified: trunk/webapp/layouts/base-layout.jsp
===================================================================
--- trunk/webapp/layouts/base-layout.jsp	2016-06-17 09:51:37 UTC (rev 432)
+++ trunk/webapp/layouts/base-layout.jsp	2016-09-01 19:41:26 UTC (rev 433)
@@ -111,7 +111,7 @@
 	String translator = (String)session.getAttribute("translator");
 	if (translator != null) {
 %>
-	<center><i><a href="admin/translate.jsp">Translate this page</a></i></center>
+	<center><i><a href="admin/translate/">Translate this page</a></i></center>
 <%
 	}
 %>




More information about the sword-cvs mailing list