Author: fjuma Date: 2009-06-12 16:02:07 -0400 (Fri, 12 Jun 2009) New Revision: 525 Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties trunk/core/src/main/webapp/include/header.xhtml trunk/core/src/main/webapp/include/resourceDataScroller.xhtml trunk/core/src/main/webapp/login.xhtml trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml trunk/core/src/main/webapp/security_error.xhtml Log: Applying Yusuke Yamamoto's patch for EMBJOPR-182 so that hardcoded messages in .xhtml files are migrated to messages.properties. Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages.properties 2009-06-12 20:02:07 UTC (rev 525) @@ -104,7 +104,7 @@ summary.category.type=Type summary.category.types=Types -summary.category.confirmDelete=Are you sure you want to delete this Resource? +summary.category.confirmDelete=Are you sure you want to delete this Category? #Messages for resourceInstanceMetrics.xhtml metrics.resourceInstance.title=Metrics @@ -116,7 +116,12 @@ metrics.resourceInstance.description=Description metrics.resourceInstance.refresh=Refresh metrics.resourceInstance.pageDescription=View the numeric metrics and traits for this resource. +metrics.noNumericMetricsAvailable=There are currently no numeric metrics available. +#Messages for resourceDataScroller.xhtml +scroller.total=Total: +scroller.itemsPerPage=Items Per Page: + #Messages for resourceInstanceControl.xhtml control.resourceInstance.title=Control Operations control.resourceInstance.name=Name @@ -177,6 +182,9 @@ help.link=Help +login.welcome.paragraph1=Welcome to the +login.welcome.paragraph2=. +login.loginToProceed=Please login to proceed. security.username=Username security.password=Password @@ -201,3 +209,12 @@ javax.faces.validator.LongRangeValidator.MINIMUM=Value is less than allowable minimum of {0} javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=Specified attribute is not between the expected values of {0} and {1}. javax.faces.validator.LongRangeValidator.TYPE=Value is not a valid integer + +#Messages for header.xhtml +debugAction.dumpInventory=Dump Inventory +debugAction.runServerScan=Run Server Scan +debugAction.runServiceScan=Run Service Scan +debugAction.testErrorPage=Test Error Page + +#Messages for security_error.xhtml +securityError.title=Security Error Modified: trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties =================================================================== --- trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/WEB-INF/classes/messages_ja.properties 2009-06-12 20:02:07 UTC (rev 525) @@ -18,14 +18,14 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # # -# English message bundle for JBoss Admin Console GUI. +# Japanese message bundle for JBoss Admin Console GUI. # product.name=${product.name} product.version=${product.version} product.buildNumber=${buildNumber} -product.copyright=&copy; 2002-2009 Red Hat Middleware, LLC. All rights reserved. JBoss is a registered trademark of Red Hat, Inc. +product.copyright=&copy; 2002-2009 Red Hat Middleware, LLC. All rights reserved. JBoss \u306f Red Hat, Inc. \u306e\u767b\u9332\u5546\u6a19\u3067\u3059. -default.windowTitle=JBoss Application Server \u30b3\u30f3\u30bd\u30fc\u30eb +default.windowTitle=${product.name} #default.header=JBoss Application Server Console default.breadcrumb=default breadcrumb @@ -49,13 +49,14 @@ resource.configuration.null=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u8a2d\u5b9a\u306e\u53d6\u5f97\u4e2d\u306b\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f resource.status.create.failure=\u30ea\u30bd\u30fc\u30b9\u306e\u8ffd\u52a0\u306b\u5931\u6557\u3057\u307e\u3057\u305f. \u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30b5\u30fc\u30d0\u30fc\u30ed\u30b0\u3092\u3054\u89a7\u304f\u3060\u3055\u3044. -resource.status.create.success=\u30ea\u30bd\u30fc\u30b9\u304c\u6b63\u5e38\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f. +resource.status.create.success={0} \u304c\u6b63\u5e38\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f. resource.status.update.validationErrors=\u4e0d\u6b63\u306a\u5024\u304c\u6307\u5b9a\u3055\u308c\u307e\u3057\u305f.\u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044. resource.status.update.failure=\u30ea\u30bd\u30fc\u30b9\u306e\u66f4\u65b0\u306b\u5931\u6557\u3057\u307e\u3057\u305f. \u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30b5\u30fc\u30d0\u30fc\u30ed\u30b0\u3092\u3054\u89a7\u304f\u3060\u3055\u3044. -resource.status.update.success=\u30ea\u30bd\u30fc\u30b9\u304c\u6b63\u5e38\u306b\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f. -resource.status.remove.failure=\u30ea\u30bd\u30fc\u30b9\u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f. \u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u306e\u30a8\u30e9\u30fc\u30e1\u30c3\u30bb\u30fc\u30b8\u3068\u30b5\u30fc\u30d0\u30fc\u30ed\u30b0\u3092\u3054\u89a7\u304f\u3060\u3055\u3044. -resource.status.remove.success=\u30ea\u30bd\u30fc\u30b9\u304c\u6b63\u5e38\u306b\u524a\u9664\u3055\u308c\u307e\u3057\u305f. +resource.status.update.success={0} \u304c\u6b63\u5e38\u306b\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f '{1}' +resource.status.remove.failure={0} \u306e\u524a\u9664\u306b\u5931\u6557\u3057\u307e\u3057\u305f '{1}' - {2} +resource.status.remove.success={0} \u304c\u6b63\u5e38\u306b\u524a\u9664\u3055\u308c\u307e\u3057\u305f '{1}' resource.status.invalidProps=\u30d7\u30ed\u30d1\u30c6\u30a3\u306e\u5024\u304c\u4e0d\u6b63\u3067\u3059.\u8a73\u3057\u304f\u306f\u4ee5\u4e0b\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044. +resource.status.failedForUnknownReason=\u4e0d\u660e\u306a\u7406\u7531\u3067\u5931\u6557\u3057\u307e\u3057\u305f resource.edit.title=\u30ea\u30bd\u30fc\u30b9\u306e\u8a2d\u5b9a @@ -90,7 +91,7 @@ summary.resourceInstance.configuration.version=\u30d0\u30fc\u30b8\u30e7\u30f3: summary.resourceInstance.configuration.description=\u8aac\u660e: summary.resourceInstance.traits=\u30ea\u30bd\u30fc\u30b9\u306e\u7279\u6027 -summary.resourceInstance.metrics=\u30e1\u30c8\u30ea\u30af\u30b9\u306e\u30b5\u30de\u30ea +summary.resourceInstance.metrics=\u30e1\u30c8\u30ea\u30af\u30b9 summary.resourceInstance.metrics.name=\u540d\u524d summary.resourceInstance.metrics.value=\u5024 @@ -103,10 +104,11 @@ summary.category.type=\u30bf\u30a4\u30d7 summary.category.types=\u30bf\u30a4\u30d7 +summary.category.confirmDelete=\u672c\u5f53\u306b\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u3092\u524a\u9664\u3057\u3066\u826f\u3044\u3067\u3059\u304b? #Messages for resourceInstanceMetrics.xhtml metrics.resourceInstance.title=\u30e1\u30c8\u30ea\u30af\u30b9 -metrics.resourceInstance.numericMetricValues=\u30e1\u30c8\u30ea\u30af\u30b9\u5024 +metrics.resourceInstance.numericMetricValues=\u30e1\u30c8\u30ea\u30af\u30b9 metrics.resourceInstance.traitValues=\u7279\u6027\u5024 metrics.resourceInstance.category=\u30ab\u30c6\u30b4\u30ea metrics.resourceInstance.name=\u540d\u524d @@ -114,16 +116,21 @@ metrics.resourceInstance.description=\u8aac\u660e metrics.resourceInstance.refresh=\u30ea\u30d5\u30ec\u30c3\u30b7\u30e5 metrics.resourceInstance.pageDescription=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306e\u30d1\u30d5\u30a9\u30fc\u30de\u30f3\u30b9\u30e1\u30c8\u30ea\u30af\u30b9\u3092\u898b\u308b. +metrics.noNumericMetricsAvailable=\u8868\u793a\u53ef\u80fd\u306a\u30e1\u30c8\u30ea\u30af\u30b9\u306f\u3042\u308a\u307e\u305b\u3093. +#Messages for resourceDataScroller.xhtml +scroller.total=\u8a08: +scroller.itemsPerPage=\u8868\u793a\u4ef6\u6570: + #Messages for resourceInstanceControl.xhtml control.resourceInstance.title=\u7ba1\u7406\u64cd\u4f5c control.resourceInstance.name=\u540d\u524d control.resourceInstance.error.noOperations=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u53ef\u80fd\u306a\u64cd\u4f5c\u306f\u3042\u308a\u307e\u305b\u3093 control.resourceInstance.select=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u53ef\u80fd\u306a\u64cd\u4f5c: control.resourceInstance.button.execute=\u5b9f\u884c -control.resourceInstance.previous=\u4ee5\u524d\u306e\u64cd\u4f5c +control.resourceInstance.operationHistory=\u64cd\u4f5c\u5c65\u6b74 control.resourceInstance.error.noPrevious=\u3053\u306e\u30ea\u30bd\u30fc\u30b9\u306b\u5bfe\u3057\u3066\u884c\u308f\u308c\u305f\u4ee5\u524d\u306e\u64cd\u4f5c\u306f\u3042\u308a\u307e\u305b\u3093 -control.resourceInstance.previous.executedAt=\u5b9f\u884c\u6642: +control.resourceInstance.previous.executedAt=\u5b9f\u884c\u6642\u523b: control.resourceInstance.previous.operation=\u64cd\u4f5c\u540d control.resourceInstance.previous.status=\u30b9\u30c6\u30fc\u30bf\u30b9 control.resourceInstance.previous.viewLog=(\u30ed\u30b0\u3092\u898b\u308b) @@ -175,6 +182,9 @@ help.link=\u30d8\u30eb\u30d7 +login.welcome.paragraph1=\u3088\u3046\u3053\u305d +login.welcome.paragraph2= \u3078 +login.loginToProceed=\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u304f\u3060\u3055\u3044. security.username=\u30e6\u30fc\u30b6\u540d security.password=\u30d1\u30b9\u30ef\u30fc\u30c9 @@ -199,3 +209,12 @@ javax.faces.validator.LongRangeValidator.MINIMUM=\u5024\u304c\u6700\u5c0f\u5024 {0} \u3092\u8d85\u3048\u3066\u3044\u307e\u3059 javax.faces.validator.LongRangeValidator.NOT_IN_RANGE=\u5024\u306f {0} \u301c {1} \u306e\u7bc4\u56f2\u5185\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059. javax.faces.validator.LongRangeValidator.TYPE=\u5024\u306f\u6574\u6570\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 + +#Messages for header.xhtml +debugAction.dumpInventory=\u30a4\u30f3\u30d9\u30f3\u30c8\u30ea\u3092\u30c0\u30f3\u30d7 +debugAction.runServerScan=\u30b5\u30fc\u30d0\u30b9\u30ad\u30e3\u30f3\u3092\u5b9f\u884c +debugAction.runServiceScan=\u30b5\u30fc\u30d3\u30b9\u30b9\u30ad\u30e3\u30f3\u3092\u5b9f\u884c +debugAction.testErrorPage=\u30a8\u30e9\u30fc\u30da\u30fc\u30b8\u306e\u30c6\u30b9\u30c8 + +#Messages for security_error.xhtml +securityError.title=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u30a8\u30e9\u30fc Modified: trunk/core/src/main/webapp/include/header.xhtml =================================================================== --- trunk/core/src/main/webapp/include/header.xhtml 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/include/header.xhtml 2009-06-12 20:02:07 UTC (rev 525) @@ -59,13 +59,13 @@ </ui:remove> <h:outputText rendered="#{debug}"> | - [<s:link action="#{debugAction.dumpInventory()}">Dump Inventory</s:link>] + [<s:link action="#{debugAction.dumpInventory()}">#{messages['debugAction.dumpInventory']}</s:link>] | - [<s:link action="#{debugAction.runServerScan()}">Run Server Scan</s:link>] + [<s:link action="#{debugAction.runServerScan()}">#{messages['debugAction.runServerScan']}</s:link>] | - [<s:link action="#{debugAction.runServiceScan()}">Run Service Scan</s:link>] + [<s:link action="#{debugAction.runServiceScan()}">#{messages['debugAction.runServiceScan']}</s:link>] | - [<s:link action="#{debugAction.testErrorPage()}">Test Error Page</s:link>] + [<s:link action="#{debugAction.testErrorPage()}">#{messages['debugAction.testErrorPage']}</s:link>] </h:outputText> </div> </div> Modified: trunk/core/src/main/webapp/include/resourceDataScroller.xhtml =================================================================== --- trunk/core/src/main/webapp/include/resourceDataScroller.xhtml 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/include/resourceDataScroller.xhtml 2009-06-12 20:02:07 UTC (rev 525) @@ -110,13 +110,13 @@ </f:facet> </rich:datascroller> <h:panelGroup layout="block" style=" margin-top: -4px; float: right; font-size:11px;"> - <h:outputText id="paginationTotalItems" value="Total: #{paginationDataModel.size}" - style="margin-right: 1em;"/> + <h:outputText id="paginationTotalItems" + style="margin-right: 1em;">#{messages['scroller.total']}#{paginationDataModel.size}</h:outputText> <!-- Allow the user to configure the number of items per page displayed in a data table. --> - <h:outputText value="Items Per Page:" style="margin-right: .2em;" - rendered="#{paginationDataModel.size > tableManager.minimumPageSize}"/> + <h:outputText style="margin-right: .2em;" + rendered="#{paginationDataModel.size > tableManager.minimumPageSize}">#{messages['scroller.itemsPerPage']}</h:outputText> <h:selectOneListbox style="margin-right: 1em; width: 3.5em; height: 1.8em; position: relative; top: -0.05em; left: 0.1em;" id="currentPageSize" size="1" Modified: trunk/core/src/main/webapp/login.xhtml =================================================================== --- trunk/core/src/main/webapp/login.xhtml 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/login.xhtml 2009-06-12 20:02:07 UTC (rev 525) @@ -61,9 +61,9 @@ <h:messages layout="table" styleClass="loginerror-msg"/> <h:form id="login_form"> <div> - <h2>Welcome to the #{messages['product.name']}.</h2> + <h2>#{messages['login.welcome.paragraph1']}#{messages['product.name']}#{messages['login.welcome.paragraph2']}</h2> - <h2>Please login to proceed.</h2> + <h2>#{messages['login.loginToProceed']}</h2> <p/> <h:outputLabel for="name" value="#{messages['security.username']}"/><br/> Modified: trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/secure/resourceInstanceMetrics.xhtml 2009-06-12 20:02:07 UTC (rev 525) @@ -106,7 +106,7 @@ </rich:dataTable> <h:panelGroup layout="block" rendered="#{empty measurementCategoryList}"> - There are currently no numeric metrics available. + #{messages['metrics.noNumericMetricsAvailable']} </h:panelGroup> <h:form rendered="#{(not empty traitDisplayList) or (not empty measurementCategoryList)}" Modified: trunk/core/src/main/webapp/security_error.xhtml =================================================================== --- trunk/core/src/main/webapp/security_error.xhtml 2009-06-12 16:36:09 UTC (rev 524) +++ trunk/core/src/main/webapp/security_error.xhtml 2009-06-12 20:02:07 UTC (rev 525) @@ -28,7 +28,7 @@ <ui:composition template="/layout.xhtml"> <!-- page title --> - <ui:define name="header">Security Error</ui:define> + <ui:define name="header">#{messages['securityError.title']}Security Error</ui:define> <!-- body --> <ui:define name="body">