Author: sshyrkov Date: Tue Oct 16 11:40:17 2007 New Revision: 18874 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18874&repname= =3Djahia Log: JAHIA-2509: Jahia Administration - Statistics - Language mix =
http://www.jahia.net/jira/browse/JAHIA-2509 Resolution: use current locale instead of the platform's default one Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/statistics/M= anageStatistics.java Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/statis= tics/ManageStatistics.java URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/java/org/jahia/admin/statistics/ManageStatistics.java&rev= =3D18874&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/statistics/M= anageStatistics.java (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/admin/statistics/M= anageStatistics.java Tue Oct 16 11:40:17 2007 @@ -37,6 +37,7 @@ import org.jahia.exceptions.JahiaException; import org.jahia.params.ProcessingContext; import org.jahia.registries.ServicesRegistry; +import org.jahia.resourcebundle.JahiaResourceBundle; import org.jahia.services.sites.JahiaSite; import org.jahia.services.sites.JahiaSitesService; import org.jahia.services.statistics.JahiaStatisticsListener; @@ -275,7 +276,10 @@ public void displayStatisticsSummary(HttpServletRequest request, HttpS= ervletResponse response, HttpSession session) throws IOException, ServletException { = - ResourceBundle resourceBundle =3D ResourceBundle.getBundle("JahiaA= dministrationResources", Locale.getDefault()); + ProcessingContext jParams =3D (ProcessingContext) request + .getAttribute("org.jahia.params.ParamBean"); + ResourceBundle resourceBundle =3D JahiaResourceBundle + .getAdminDefaultResourceBundle(jParams, jParams.getLocale(= )); = // get request parameters String siteId =3D (String) request.getParameter("siteId"); @@ -338,7 +342,10 @@ public void displayStatisticsDetails(HttpServletRequest request, HttpS= ervletResponse response, HttpSession session) throws IOException, ServletException { = - ResourceBundle resourceBundle =3D ResourceBundle.getBundle("JahiaA= dministrationResources", Locale.getDefault()); + ProcessingContext jParams =3D (ProcessingContext) request + .getAttribute("org.jahia.params.ParamBean"); + ResourceBundle resourceBundle =3D JahiaResourceBundle + .getAdminDefaultResourceBundle(jParams, jParams.getLocale(= )); // get request parameters String siteId =3D (String)request.getParameter("siteId"); String objectType =3D (String)request.getParameter("objectType"); @@ -515,7 +522,10 @@ List listActionsGroups =3D new ArrayList(); List listActionsPages =3D new ArrayList(); List listActionsTemplates =3D new ArrayList(); - ResourceBundle resourceBundle =3D ResourceBundle.getBundle("JahiaA= dministrationResources", Locale.getDefault()); + ProcessingContext jParams =3D (ProcessingContext) request + .getAttribute("org.jahia.params.ParamBean"); + ResourceBundle resourceBundle =3D JahiaResourceBundle + .getAdminDefaultResourceBundle(jParams, jParams.getLocale(= )); = String[] actionsUsers =3D getListActions(JahiaStatisticsListener.O= BJECT_USER); String[] actionsGroups =3D getListActions(JahiaStatisticsListener.= OBJECT_GROUP); @@ -615,7 +625,10 @@ = = List listObjectTypes =3D new ArrayList(); - ResourceBundle resourceBundle =3D ResourceBundle.getBundle("JahiaA= dministrationResources", Locale.getDefault()); + ProcessingContext jParams =3D (ProcessingContext) request + .getAttribute("org.jahia.params.ParamBean"); + ResourceBundle resourceBundle =3D JahiaResourceBundle + .getAdminDefaultResourceBundle(jParams, jParams.getLocale(= )); = String[] objects =3D { = JahiaStatisticsListener.OBJECT_USER, @@ -649,8 +662,11 @@ String statisticType, HttpServletRequest request) throws IOException, ServletException { = - ResourceBundle resourceBundle =3D ResourceBundle.getBundle("JahiaA= dministrationResources", Locale.getDefault()); - = + ProcessingContext jParams =3D (ProcessingContext) request + .getAttribute("org.jahia.params.ParamBean"); + ResourceBundle resourceBundle =3D JahiaResourceBundle + .getAdminDefaultResourceBundle(jParams, jParams.getLocale(= )); + // ObjectType - Title Level 1 if (objectType !=3D null && !objectType.equalsIgnoreCase("")) { try { @@ -706,7 +722,10 @@ private void setStatisticsDetailsTitles(HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException, ServletException { - ResourceBundle resourceBundle =3D ResourceBundle.getBundle("JahiaA= dministrationResources", Locale.getDefault()); + ProcessingContext jParams =3D (ProcessingContext) request + .getAttribute("org.jahia.params.ParamBean"); + ResourceBundle resourceBundle =3D JahiaResourceBundle + .getAdminDefaultResourceBundle(jParams, jParams.getLocale(= )); String objectType =3D (String)request.getParameter("objectType"); String actionId =3D (String)request.getParameter("actionId"); String statisticType =3D (String)request.getParameter("statisticTy= pe"); _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
