Index: lams_central/web/jqGrid.i18n.jsp
===================================================================
diff -u -r5e3be74346e7113ae3a4b631a5ec190ac56f23cf -re0e6a792ce37ed11edf03478421c7a935eec48bc
--- lams_central/web/jqGrid.i18n.jsp	(.../jqGrid.i18n.jsp)	(revision 5e3be74346e7113ae3a4b631a5ec190ac56f23cf)
+++ lams_central/web/jqGrid.i18n.jsp	(.../jqGrid.i18n.jsp)	(revision e0e6a792ce37ed11edf03478421c7a935eec48bc)
@@ -1,13 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
-<%-- In order to use this file, a page needs to have
-	<c:import url="/jqGrid.i18n.jsp" context="/lams" />
-	Also disable-cross-context has to be set to false in WEB-INF/jboss-web.xml file in the calling webapp
-	See Gradebook for an example.
- --%>
-
-// JQGRID i18n
 <c:set var="language"><lams:user property="localeLanguage"/></c:set>
 <c:choose>
 	<c:when test="${language eq 'es'}">
Fisheye: Tag e0e6a792ce37ed11edf03478421c7a935eec48bc refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/jboss-web.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
===================================================================
diff -u -r59e208b2fd262829e189b4b1b8b6e1bbd0f3e143 -re0e6a792ce37ed11edf03478421c7a935eec48bc
--- lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision 59e208b2fd262829e189b4b1b8b6e1bbd0f3e143)
+++ lams_gradebook/web/includes/jsp/jqGridIncludes.jsp	(.../jqGridIncludes.jsp)	(revision e0e6a792ce37ed11edf03478421c7a935eec48bc)
@@ -9,9 +9,31 @@
 <link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet">
 <script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/free.jquery.jqgrid.min.js"></script>
 
+<c:set var="language"><lams:user property="localeLanguage"/></c:set>
+<c:choose>
+	<c:when test="${language eq 'es'}">
+		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jqgrid-i18n/grid.locale-es.js"></script>
+		<c:set var="jqGridInternationalised" value="true" />
+ 	</c:when>
+ 	 <c:when test="${language eq 'fr'}">
+ 	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jqgrid-i18n/grid.locale-fr.js"></script>
+ 	 	<c:set var="jqGridInternationalised" value="true" />
+ 	 </c:when>
+ 	 <c:when test="${language eq 'el'}">
+ 	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jqgrid-i18n/grid.locale-el.js"></script>
+ 	 	<c:set var="jqGridInternationalised" value="true" />
+ 	 </c:when>
+ 	<c:when test="${language eq 'no'}">
+ 		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jqgrid-i18n/grid.locale-no.js"></script>
+ 	 	<c:set var="jqGridInternationalised" value="true" />
+ 	 </c:when>
+</c:choose>
+	
 <script type="text/javascript">
 	<%-- Add jqGrid internationalisation snippet --%>
-	<c:import url="/jqGrid.i18n.jsp" context="/lams" />
+	<c:if test="${jqGridInternationalised}">
+		$.extend(true, $.jgrid,$.jgrid.regional['${language}']);
+	</c:if>
 		
 	var popupWidth = 1280,
 		popupHeight = 720;