diff --git a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java index 9ce3cd2c7..74f250042 100644 --- a/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java +++ b/ccm-sci-project-navigation/src/com/arsdigita/cms/sciproject/navigation/SciProjectList.java @@ -33,7 +33,7 @@ public class SciProjectList extends AbstractComponent { + "JOIN cms_pages ON cms_items.item_id = cms_pages.item_id " + "JOIN content_types ON cms_items.type_id = content_types.type_id " + "JOIN ct_sci_projects ON cms_items.item_id = ct_sci_projects.project_id " - + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND version = 'live' %s" + + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND language = ? AND version = 'live' %s" + "%s" + "LIMIT ? OFFSET ?"; @@ -144,17 +144,19 @@ public class SciProjectList extends AbstractComponent { whereBuffer.toString(), orderBy)); projectsQueryStatement.setString(1, categoryId); - projectsQueryStatement.setInt(2, limit); + projectsQueryStatement.setString(2, GlobalizationHelper + .getNegotiatedLocale().getLanguage()); + projectsQueryStatement.setInt(3, limit); if (request.getParameter("page") == null) { page = 1; - projectsQueryStatement.setInt(3, 0); + projectsQueryStatement.setInt(4, 0); offset = 0; } else { page = Integer.parseInt(request.getParameter("page")); offset = (page - 1) * limit; - projectsQueryStatement.setInt(3, offset); + projectsQueryStatement.setInt(4, offset); } } catch (SQLException ex) { diff --git a/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java b/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java index 6d3b2df9b..3b3ac6770 100644 --- a/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java +++ b/ccm-sci-publications-navigation/src/com/arsdigita/cms/scipublications/navigation/PublicationList.java @@ -10,6 +10,7 @@ import com.arsdigita.cms.contenttypes.Proceedings; import com.arsdigita.cms.contenttypes.Publication; import com.arsdigita.cms.contenttypes.UnPublished; import com.arsdigita.cms.contenttypes.WorkingPaper; +import com.arsdigita.globalization.GlobalizationHelper; import com.arsdigita.navigation.Navigation; import com.arsdigita.navigation.ui.AbstractComponent; import com.arsdigita.persistence.SessionManager; @@ -84,7 +85,7 @@ public class PublicationList extends AbstractComponent { + "LEFT JOIN ct_unpublished ON ct_publications.publication_id = ct_unpublished.unpublished_id " + "LEFT JOIN ct_grey_literature ON ct_unpublished.unpublished_id = ct_grey_literature.grey_literature_id " + "%s" - + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND version = 'live' %s" + + "WHERE parent_id IN (SELECT object_id FROM cat_object_category_map WHERE category_id = ?) AND language = ? AND version = 'live' %s" + "%s " + "LIMIT ? OFFSET ?"; /** @@ -355,17 +356,19 @@ public class PublicationList extends AbstractComponent { orderBy)); publicationsQueryStatement.setString(1, categoryId); - publicationsQueryStatement.setInt(2, limit); + publicationsQueryStatement.setString(2, GlobalizationHelper + .getNegotiatedLocale().getLanguage()); + publicationsQueryStatement.setInt(3, limit); if (request.getParameter("page") == null) { page = 1; - publicationsQueryStatement.setInt(3, 0); + publicationsQueryStatement.setInt(4, 0); offset = 0; } else { page = Integer.parseInt(request.getParameter("page")); offset = (page - 1) * limit; - publicationsQueryStatement.setInt(3, offset); + publicationsQueryStatement.setInt(4, offset); } } catch (SQLException ex) {