Author: aron.gombas Date: 2005-11-20 09:20:58 -0500 (Sun, 20 Nov 2005) New Revision: 1603 Modified: trunk/labs/kosmos/build/build.xml trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java trunk/labs/kosmos/web-portlet/WEB-INF/web.xml trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring_help.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp trunk/labs/kosmos/web-portlet/pages/sf_monitoring_help.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_help.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp trunk/labs/kosmos/web-server/WEB-INF/web.xml trunk/labs/kosmos/xdocs/reference/reference-manual.xml Log: Server and portlets use the same localized resources Modified: trunk/labs/kosmos/build/build.xml =================================================================== --- trunk/labs/kosmos/build/build.xml 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/build/build.xml 2005-11-20 14:20:58 UTC (rev 1603) @@ -20,6 +20,7 @@ <!-- generated paths --> <property name="build.dir" location="build"/> <property name="conf.dir" location="conf-${module.name}"/> + <property name="i18n.dir" location="web-portlet/WEB-INF/classes/hu/midori/kosmos/portlet"/> <property name="src.dir" location="src"/> <property name="web.dir" location="web-${module.name}"/> <property name="xdocs.dir" location="xdocs"/> @@ -56,9 +57,7 @@ </target> <target name="clean" depends="init" description="Cleans up temporary files created during previous builds"> - <delete dir="${dist.root.dir}"/> - <delete dir="${dist-bin.root.dir}"/> - <delete dir="${dist-src.root.dir}"/> + <delete dir="${dist-bin.dir}"/> <delete dir="${test-out.dir}"/> </target> @@ -75,8 +74,8 @@ </filterset> </copy> <!-- convert resource files --> - <native2ascii encoding="ISO-8859-1" src="${web.dir}" dest="${dist-bin.bin.dir}" includes="**/portlet/**/*portlet.properties"/> - <native2ascii encoding="ISO-8859-2" src="${web.dir}" dest="${dist-bin.bin.dir}" includes="**/portlet/**/*portlet_hu.properties"/> + <native2ascii encoding="ISO-8859-1" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring.properties"/> + <native2ascii encoding="ISO-8859-2" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_hu.properties"/> <!-- copy other binary files --> <copy todir="${dist-bin.bin.dir}"> <fileset dir="${web.dir}" excludes="**/*.jsp"> Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/cc/CcServiceImpl.java 2005-11-20 14:20:58 UTC (rev 1603) @@ -134,11 +134,11 @@ List<Map.Entry<ColorCodedKey, Integer>> testsPerCategory = new ArrayList<Map.Entry<ColorCodedKey, Integer>>(); int success = tests - errors - failures; if(success > 0) - testsPerCategory.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.cc.ccmonitoringportlet", "ccproject.testsSucceded"), CcConstants.SUCCESS_COLOR), success).entrySet()); + testsPerCategory.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.cc.cc_monitoring", "ccproject.testsSucceded"), CcConstants.SUCCESS_COLOR), success).entrySet()); if(failures > 0) - testsPerCategory.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.cc.ccmonitoringportlet", "ccproject.failures"), CcConstants.FAILURE_COLOR), failures).entrySet()); + testsPerCategory.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.cc.cc_monitoring", "ccproject.failures"), CcConstants.FAILURE_COLOR), failures).entrySet()); if(errors > 0) - testsPerCategory.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.cc.ccmonitoringportlet", "ccproject.errors"), CcConstants.ERROR_COLOR), errors).entrySet()); + testsPerCategory.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.cc.cc_monitoring", "ccproject.errors"), CcConstants.ERROR_COLOR), errors).entrySet()); ByteArrayOutputStream out = new ByteArrayOutputStream(); ChartUtils.writeChartAsPng(ChartUtils.generateColorCodedPieChart(ChartUtils.collectionToPieDataset(testsPerCategory)), out); Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/jira/JiraServiceImpl.java 2005-11-20 14:20:58 UTC (rev 1603) @@ -224,15 +224,15 @@ // generate issues-per-status chart List<Map.Entry<ColorCodedKey, Integer>> issuesPerStatusMap = new ArrayList<Map.Entry<ColorCodedKey, Integer>>(); if(openIssues > 0) - issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.openIssues"), JiraConstants.OPEN_COLOR), openIssues).entrySet()); + issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.openIssues"), JiraConstants.OPEN_COLOR), openIssues).entrySet()); if(codingInProgressIssues > 0) - issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.codingInProgressIssues"), JiraConstants.CODING_IN_PROGRESS_COLOR), codingInProgressIssues).entrySet()); + issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.codingInProgressIssues"), JiraConstants.CODING_IN_PROGRESS_COLOR), codingInProgressIssues).entrySet()); if(reopenedIssues > 0) - issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.reopenedIssues"), JiraConstants.REOPENED_COLOR), reopenedIssues).entrySet()); + issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.reopenedIssues"), JiraConstants.REOPENED_COLOR), reopenedIssues).entrySet()); if(resolvedIssues > 0) - issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.resolvedIssues"), JiraConstants.RESOLVED_COLOR), resolvedIssues).entrySet()); + issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.resolvedIssues"), JiraConstants.RESOLVED_COLOR), resolvedIssues).entrySet()); if(closedIssues > 0) - issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.closedIssues"), JiraConstants.CLOSED_COLOR), closedIssues).entrySet()); + issuesPerStatusMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.closedIssues"), JiraConstants.CLOSED_COLOR), closedIssues).entrySet()); out.reset(); ChartUtils.writeChartAsPng(ChartUtils.generateColorCodedPieChart(ChartUtils.collectionToPieDataset(issuesPerStatusMap)), out); @@ -241,17 +241,17 @@ // generate issues-per-priority chart List<Map.Entry<ColorCodedKey, Integer>> openIssuesPerPriorityMap = new ArrayList<Map.Entry<ColorCodedKey, Integer>>(); if(blockerOpenIssues > 0) - openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.blockerOpenIssues"), JiraConstants.BLOCKER_COLOR), blockerOpenIssues).entrySet()); + openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.blockerOpenIssues"), JiraConstants.BLOCKER_COLOR), blockerOpenIssues).entrySet()); if(criticalOpenIssues > 0) - openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.criticalOpenIssues"), JiraConstants.CRITICAL_COLOR), criticalOpenIssues).entrySet()); + openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.criticalOpenIssues"), JiraConstants.CRITICAL_COLOR), criticalOpenIssues).entrySet()); if(majorOpenIssues > 0) - openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.majorOpenIssues"), JiraConstants.MAJOR_COLOR), majorOpenIssues).entrySet()); + openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.majorOpenIssues"), JiraConstants.MAJOR_COLOR), majorOpenIssues).entrySet()); if(minorOpenIssues > 0) - openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.minorOpenIssues"), JiraConstants.MINOR_COLOR), minorOpenIssues).entrySet()); + openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.minorOpenIssues"), JiraConstants.MINOR_COLOR), minorOpenIssues).entrySet()); if(trivialOpenIssues > 0) - openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.trivialOpenIssues"), JiraConstants.TRIVIAL_COLOR), trivialOpenIssues).entrySet()); + openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.trivialOpenIssues"), JiraConstants.TRIVIAL_COLOR), trivialOpenIssues).entrySet()); if(optionalOpenIssues > 0) - openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jiramonitoringportlet", "jiraproject.optionalOpenIssues"), JiraConstants.OPTIONAL_COLOR), optionalOpenIssues).entrySet()); + openIssuesPerPriorityMap.addAll(Collections.singletonMap(new ColorCodedKey(getResourcexxx("hu.midori.kosmos.server.jira.jira_monitoring", "jiraproject.optionalOpenIssues"), JiraConstants.OPTIONAL_COLOR), optionalOpenIssues).entrySet()); out.reset(); ChartUtils.writeChartAsPng(ChartUtils.generateColorCodedPieChart(ChartUtils.collectionToPieDataset(openIssuesPerPriorityMap)), out); Modified: trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java =================================================================== --- trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/src/java/hu/midori/kosmos/server/svn/SvnServiceImpl.java 2005-11-20 14:20:58 UTC (rev 1603) @@ -96,7 +96,7 @@ } } - public Object reloadData(Object key) {// TODO localize charts + public Object reloadData(Object key) { String url = key.toString(); List<SvnRepository> repositories = new ArrayList<SvnRepository>(); Modified: trunk/labs/kosmos/web-portlet/WEB-INF/web.xml =================================================================== --- trunk/labs/kosmos/web-portlet/WEB-INF/web.xml 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/WEB-INF/web.xml 2005-11-20 14:20:58 UTC (rev 1603) @@ -12,6 +12,6 @@ <!-- JSTL configuration --> <context-param> <param-name>javax.servlet.jsp.jstl.fmt.locale</param-name> - <param-value>en</param-value> + <param-value>hu</param-value> </context-param> </web-app> Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.cc.ccmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.cc.cc_monitoring" scope="application"/> <display:table name="${projects}" id="projectsIt" requestURI="<%=renderResponse.createRenderURL().toString() %>" requestURIcontext="false"> <c:set var="id" scope="page" value="${projectsIt.id}"/> Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_help.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.cc.ccmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.cc.cc_monitoring" scope="application"/> <%@include file="includes/about.jsp"%> Modified: trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/cc_monitoring_test_details.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.cc.ccmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.cc.cc_monitoring" scope="application"/> <table> <tr class="portlet-section-body"> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jiramonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jira_monitoring" scope="application"/> <display:table name="${projects}" id="projectsIt" requestURI="<%=renderResponse.createRenderURL().toString() %>" requestURIcontext="false"> <c:set var="id" scope="page" value="${projectsIt.id}"/> @@ -26,24 +26,24 @@ <display:column titleKey="jiraproject.lead" style="white-space:nowrap" property="lead" sortable="true"/> <display:column titleKey="jiraproject.openIssues" style="white-space:nowrap" sortProperty="openIssues" sortable="true"> <c:if test="${projectsIt.openIssues > 10}"><span class="portlet-msg-error"></c:if> - <c:out value="${projectsIt.openIssues}"/> + <fmt:formatNumber value="${projectsIt.openIssues}"/> (<fmt:formatNumber value="${projectsIt.openIssues / projectsIt.totalIssues}" type="percent"/>) <c:if test="${projectsIt.openIssues > 10}"></span></c:if> </display:column> <display:column titleKey="jiraproject.codingInProgressIssues" style="white-space:nowrap" sortProperty="codingInProgressIssues" sortable="true"> - <c:out value="${projectsIt.codingInProgressIssues}"/> + <fmt:formatNumber value="${projectsIt.codingInProgressIssues}"/> (<fmt:formatNumber value="${projectsIt.codingInProgressIssues / projectsIt.totalIssues}" type="percent"/>) </display:column> <display:column titleKey="jiraproject.reopenedIssues" style="white-space:nowrap" sortProperty="reopenedIssues" sortable="true"> - <c:out value="${projectsIt.reopenedIssues}"/> + <fmt:formatNumber value="${projectsIt.reopenedIssues}"/> (<fmt:formatNumber value="${projectsIt.reopenedIssues / projectsIt.totalIssues}" type="percent"/>) </display:column> <display:column titleKey="jiraproject.resolvedIssues" style="white-space:nowrap" sortProperty="resolvedIssues" sortable="true"> - <c:out value="${projectsIt.resolvedIssues}"/> + <fmt:formatNumber value="${projectsIt.resolvedIssues}"/> (<fmt:formatNumber value="${projectsIt.resolvedIssues / projectsIt.totalIssues}" type="percent"/>) </display:column> <display:column titleKey="jiraproject.closedIssues" style="white-space:nowrap" sortProperty="closedIssues" sortable="true"> - <c:out value="${projectsIt.closedIssues}"/> + <fmt:formatNumber value="${projectsIt.closedIssues}"/> (<fmt:formatNumber value="${projectsIt.closedIssues / projectsIt.totalIssues}" type="percent"/>) </display:column> <display:column titleKey="jiraproject.issuesByStatus" sortProperty="openIssues" sortable="true"> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_help.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_help.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_help.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jiramonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jira_monitoring" scope="application"/> <%@include file="includes/about.jsp"%> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_issue_details.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jiramonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jira_monitoring" scope="application"/> <table> <tr class="portlet-section-body"> @@ -10,22 +10,22 @@ <td valign="top"> <table> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.blockerOpenIssues"/>:</td><td><c:out value="${project.blockerOpenIssues}"/></td> + <td><fmt:message key="jiraproject.blockerOpenIssues"/>:</td><td><fmt:formatNumber value="${project.blockerOpenIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.criticalOpenIssues"/>:</td><td><c:out value="${project.criticalOpenIssues}"/></td> + <td><fmt:message key="jiraproject.criticalOpenIssues"/>:</td><td><fmt:formatNumber value="${project.criticalOpenIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.majorOpenIssues"/>:</td><td><c:out value="${project.majorOpenIssues}"/></td> + <td><fmt:message key="jiraproject.majorOpenIssues"/>:</td><td><fmt:formatNumber value="${project.majorOpenIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.minorOpenIssues"/>:</td><td><c:out value="${project.minorOpenIssues}"/></td> + <td><fmt:message key="jiraproject.minorOpenIssues"/>:</td><td><fmt:formatNumber value="${project.minorOpenIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.trivialOpenIssues"/>:</td><td><c:out value="${project.trivialOpenIssues}"/></td> + <td><fmt:message key="jiraproject.trivialOpenIssues"/>:</td><td><fmt:formatNumber value="${project.trivialOpenIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.optionalOpenIssues"/>:</td><td><c:out value="${project.optionalOpenIssues}"/></td> + <td><fmt:message key="jiraproject.optionalOpenIssues"/>:</td><td><fmt:formatNumber value="${project.optionalOpenIssues}"/></td> </tr> </table> </td> Modified: trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/jira_monitoring_project_details.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jiramonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.jira.jira_monitoring" scope="application"/> <table> <tr class="portlet-section-body"> @@ -18,19 +18,19 @@ <td valign="top"> <table> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.openIssues"/>:</td><td><c:out value="${project.openIssues}"/></td> + <td><fmt:message key="jiraproject.openIssues"/>:</td><td><fmt:formatNumber value="${project.openIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.codingInProgressIssues"/>:</td><td><c:out value="${project.codingInProgressIssues}"/></td> + <td><fmt:message key="jiraproject.codingInProgressIssues"/>:</td><td><fmt:formatNumber value="${project.codingInProgressIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.reopenedIssues"/>:</td><td><c:out value="${project.reopenedIssues}"/></td> + <td><fmt:message key="jiraproject.reopenedIssues"/>:</td><td><fmt:formatNumber value="${project.reopenedIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.resolvedIssues"/>:</td><td><c:out value="${project.resolvedIssues}"/></td> + <td><fmt:message key="jiraproject.resolvedIssues"/>:</td><td><fmt:formatNumber value="${project.resolvedIssues}"/></td> </tr> <tr class="portlet-section-alternate"> - <td><fmt:message key="jiraproject.closedIssues"/>:</td><td><c:out value="${project.closedIssues}"/></td> + <td><fmt:message key="jiraproject.closedIssues"/>:</td><td><fmt:formatNumber value="${project.closedIssues}"/></td> </tr> </table> </td> Modified: trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/sf_monitoring.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.sf.sfmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.sf.sf_monitoring" scope="application"/> <display:table name="${releases}" id="releasesIt" requestURI="<%=renderResponse.createRenderURL().toString() %>" requestURIcontext="false"> <display:column style="width:20px"> Modified: trunk/labs/kosmos/web-portlet/pages/sf_monitoring_help.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/sf_monitoring_help.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/sf_monitoring_help.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.sf.sfmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.sf.sf_monitoring" scope="application"/> <%@include file="includes/about.jsp"%> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svnmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svn_monitoring" scope="application"/> <display:table name="${repositories}" id="repositoriesIt" requestURI="<%=renderResponse.createRenderURL().toString() %>" requestURIcontext="false"> <c:set var="id" scope="page" value="${repositoriesIt.id}"/> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_activity_details.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svnmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svn_monitoring" scope="application"/> <table> <tr class="portlet-section-body"> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_help.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_help.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_help.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svnmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svn_monitoring" scope="application"/> <%@include file="includes/about.jsp"%> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_repository_details.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svnmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svn_monitoring" scope="application"/> <table> <tr class="portlet-section-body"> Modified: trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp =================================================================== --- trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-portlet/pages/svn_monitoring_revision_details.jsp 2005-11-20 14:20:58 UTC (rev 1603) @@ -1,7 +1,7 @@ <%@include file="includes/taglibs.jsp"%> <portlet:defineObjects/> -<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svnmonitoringportlet" scope="application"/> +<fmt:setBundle basename="hu.midori.kosmos.portlet.svn.svn_monitoring" scope="application"/> <table> <tr class="portlet-section-alternate"> Modified: trunk/labs/kosmos/web-server/WEB-INF/web.xml =================================================================== --- trunk/labs/kosmos/web-server/WEB-INF/web.xml 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/web-server/WEB-INF/web.xml 2005-11-20 14:20:58 UTC (rev 1603) @@ -11,7 +11,7 @@ <context-param> <param-name>locale</param-name> - <param-value>en</param-value> + <param-value>hu</param-value> </context-param> <servlet> Modified: trunk/labs/kosmos/xdocs/reference/reference-manual.xml =================================================================== --- trunk/labs/kosmos/xdocs/reference/reference-manual.xml 2005-11-20 13:21:12 UTC (rev 1602) +++ trunk/labs/kosmos/xdocs/reference/reference-manual.xml 2005-11-20 14:20:58 UTC (rev 1603) @@ -1497,7 +1497,7 @@ <portlet-class>hu.midori.kosmos.portlet.sf.SfMonitoringPortlet</portlet-class> <supported-locale>en</supported-locale> <supported-locale>hu</supported-locale> - <resource-bundle>hu.midori.kosmos.portlet.sf.sfmonitoringportlet</resource-bundle> + <resource-bundle>hu.midori.kosmos.portlet.sf.sf_monitoring</resource-bundle> <init-param> <name>monitored.resource</name> <value>Kosmos Dependencies</value> |