Author: chris.laprun(a)jboss.com Date: 2008-06-05 07:52:50 -0400 (Thu, 05 Jun 2008) New Revision: 10928 Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml Log: - More i18n and l10n. Still need to i18n bean messages. Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-05 11:52:34 UTC (rev 10927) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource.properties 2008-06-05 11:52:50 UTC (rev 10928) @@ -33,3 +33,63 @@ path_consumers_active = active path_consumers_inactive = inactive path_consumers_refreshNeeded = (refresh needed) + +confirm_delete_consumer_title = Delete ''{0}'' consumer? +confirm_delete_consumer_message = You are about to delete the ''{0}'' consumer! +confirm_detete_consumer_proceed = Are you sure you want to proceed? +confirm_delete_consumer_submit = Delete consumer +confirm_delete_consumer_cancel = Cancel + +confirm_delete_registration_title = Delete local registration for ''{0}'' consumer? +confirm_delete_registration_message = You are about to delete the local registration information for the ''{0}'' consumer! \n\ +This is only needed if this consumer had previously registered with the remote producer and this producer \n\ +has been modified to not require registration anymore.<br/><br/> \n\ +Only erase local registration information if you experience errors with the producer due to this \n\ +particular situation. Erasing local registration when not required might lead to inability to work with \n\ +this producer anymore. +confirm_delete_registration_proceed = Are you sure you want to proceed? +confirm_delete_registration_submit = Erase local registration +confirm_delete_registration_cancel = Cancel + +consumers_title = Manage Consumers +consumers_create_title = Create a consumer named: +consumers_create_submit = Create Consumer + +consumers_table_column_consumer = Consumer +consumers_table_column_consumer_status = status: +consumers_table_column_actions = Actions +consumers_table_action_configure = Configure +consumers_table_action_refresh = Refresh +consumers_table_action_activate = Activate +consumers_table_action_deactivate = Deactivate +consumers_table_action_register = Register +consumers_table_action_deregister = Deregister +consumers_table_action_delete = Delete + +edit_consumer_producer = Producer id: +edit_consumer_cache = Cache expiration: +edit_consumer_cache_seconds = (seconds before expiration) +edit_consumer_endpoint = Endpoint configuration: +edit_consumer_endpoint_wsdl = Use WSDL? +edit_consumer_endpoint_sd = Service Description URL: +edit_consumer_endpoint_m = Markup URL: +edit_consumer_endpoint_r = Registration URL: +edit_consumer_endpoint_pm = Portlet Management URL: +edit_consumer_registration = Registration information: +edit_consumer_registration_current = Current registration information: +edit_consumer_prop_name = Name +edit_consumer_prop_desc = Description +edit_consumer_prop_value = Value +edit_consumer_registration_update_props = Update properties +edit_consumer_registration_no_props = Registration is indicated as required without registration properties. +edit_consumer_registration_modify = Modify registration +edit_consumer_registration_modify_title = Modify the registration held with this producer +edit_consumer_registration_expected = Expected registration information: +edit_consumer_no_registration = Producer doesn't require registration. +edit_consumer_registration_context = Registration context: +edit_consumer_registration_context_handle = Handle: +edit_consumer_registration_context_erase = Erase local registration +edit_consumer_registration_context_erase_title = Erase local registration information (potentially dangerous!) +edit_consumer_refresh = Refresh &amp; Save +edit_consumer_refresh_title = Save changes and refresh information from producer +edit_consumer_cancel = Cancel Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-05 11:52:34 UTC (rev 10927) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/classes/WSRPConfigurationResource_fr.properties 2008-06-05 11:52:50 UTC (rev 10928) @@ -33,3 +33,58 @@ path_consumers_active = actif path_consumers_inactive = inactif path_consumers_refreshNeeded = (rafra\u00eechissement requis) +confirm_delete_consumer_cancel=Annuler +confirm_delete_consumer_message=Vous \u00eates sur le point d'effacer le concommateur ''{0}''! +confirm_delete_consumer_submit=Effacer consommateur +confirm_delete_consumer_title=Voulez-vous r\u00e9ellement effacer le consommateur ''{0}''? +confirm_detete_consumer_proceed=\u00cates-vous certains de vouloir proc\u00e9der? +confirm_delete_registration_cancel=Annuler +confirm_delete_registration_message=Vous \u00eates sur le point d'effacer les informations locales d'enregistrement pour le consommateur ''{0}''! \n\ +Ceci n'est uniquement requis dans le cas o\u00f9 ce consommateur se serait enregistr\u00e9 aupr\u00e8s d'un producteur distant \n\ +qui aurait ensuite \u00e9t\u00e9 modifi\u00e9 pour ne plus requerir d'enregistrement.<br/><br/> \n\ +N'effacez les informations locales d'enregistrement que si vous rencontrez des probl\u00e8mes, sp\u00e9cifiques \u00e0 cette \n\ +situation, avec le producteur distant. Effacer les donn\u00e9es d'enregistrement quand ce n'est pas requis peut entra\u00eener \n\ +l'incapacit\u00e9 future d'acc\u00e9der \u00e0 ce producteur. +confirm_delete_registration_proceed=\u00cates-vous certains de vouloir proc\u00e9der? +confirm_delete_registration_submit=Effacer enregistrement +confirm_delete_registration_title=Voulez-vous r\u00e9ellement effacer l'enregistrement du consommateur ''{0}''? +consumers_create_submit=Cr\u00e9er Consommateur +consumers_create_title=Cr\u00e9er un consommateur nomm\u00e9: +consumers_table_action_activate=Activer +consumers_table_action_configure=Configurer +consumers_table_action_deactivate=D\u00e9sactiver +consumers_table_action_delete=Effacer +consumers_table_action_deregister=D\u00e9senregistrer +consumers_table_action_refresh=Rafra\u00eechir +consumers_table_action_register=Enregister +consumers_table_column_actions=Actions +consumers_table_column_consumer=Consommateur +consumers_table_column_consumer_status=status: +consumers_title=Gestion des Consommateurs +edit_consumer_cache=Expiration du cache: +edit_consumer_cache_seconds=(secondes avant expiration) +edit_consumer_cancel=Annuler +edit_consumer_endpoint=Configuration du endpoint: +edit_consumer_endpoint_m=URL Markup: +edit_consumer_endpoint_pm=URL Portlet Management: +edit_consumer_endpoint_r=URL Registration: +edit_consumer_endpoint_sd=URL Service Description: +edit_consumer_endpoint_wsdl=Utiliser WSDL? +edit_consumer_no_registration=Enregistrement non-requis par le producteur. +edit_consumer_producer=Identifiant du producteur: +edit_consumer_prop_desc=Description +edit_consumer_prop_name=Nom +edit_consumer_prop_value=Valeur +edit_consumer_refresh=Rafra\u00eechir &amp; Sauvegarder +edit_consumer_refresh_title=Sauvegarde des changements et rafra\u00eechissement \u00e0 partir du producteur +edit_consumer_registration=Information d'enregistrement: +edit_consumer_registration_context=Contexte d'enregistrement: +edit_consumer_registration_context_erase=Effacer enregistrement local +edit_consumer_registration_context_erase_title=Effacer l'information locale d'enregistrement (potentiellement dangereux!) +edit_consumer_registration_context_handle=Identifiant: +edit_consumer_registration_current=Information actuelle d'enregistrement: +edit_consumer_registration_expected=Information attendue d'enregistrement: +edit_consumer_registration_modify=Modifier l'enregistrement +edit_consumer_registration_modify_title=Modifier l'enregistrement avec ce producteur +edit_consumer_registration_no_props=Enregistrement indiqu\u00e9 sans besoin de propri\u00e9t\u00e9s d'enregistrement +edit_consumer_registration_update_props=Mettre les propri\u00e9t\u00e9s \u00e0 jour \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-05 11:52:34 UTC (rev 10927) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmDeleteConsumer.xhtml 2008-06-05 11:52:50 UTC (rev 10928) @@ -11,20 +11,26 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>Delete '#{consumersMgr.selectedConsumer.producerId}' consumer?</h3> + <h3> + <h:outputFormat value="#{i18n.confirm_delete_consumer_title}"> + <f:param value="#{consumersMgr.selectedConsumer.producerId}"/> + </h:outputFormat> + </h3> <p class="portlet-msg-alert"> - You are about to delete the '#{consumersMgr.selectedConsumer.producerId}' consumer! + <h:outputFormat value="#{i18n.confirm_delete_consumer_message}"> + <f:param value="#{consumersMgr.selectedConsumer.producerId}"/> + </h:outputFormat> </p> - <p class="portlet-class">Are you sure you want to proceed?</p> + <p class="portlet-class">#{i18n.confirm_detete_consumer_proceed}</p> <h:form> - <h:commandLink value="Delete consumer" action="#{consumersMgr.destroyConsumer}" + <h:commandLink value="#{i18n.confirm_delete_consumer_submit}" action="#{consumersMgr.destroyConsumer}" styleClass="portlet-form-button portlet-section-buttonrow"> <f:param name="id" value="#{consumersMgr.selectedConsumer.producerId}"/> </h:commandLink> - <h:commandButton value="Cancel" action="#{consumersMgr.listConsumers}" + <h:commandButton value="#{i18n.confirm_delete_consumer_cancel}" action="#{consumersMgr.listConsumers}" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-06-05 11:52:34 UTC (rev 10927) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/confirmEraseRegistration.xhtml 2008-06-05 11:52:50 UTC (rev 10928) @@ -11,24 +11,24 @@ <div class="portlet-msg"> <div class="portlet-msg-icon"><h:graphicImage url="/img/msgIcon_Warning.gif" alt="/!\"/></div> <div class="portlet-msg-body"> - <h3>Delete local registration for '#{consumer.id}' consumer?</h3> + <h3> + <h:outputFormat value="#{i18n.confirm_delete_registration_title"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> + </h3> <p class="portlet-msg-alert"> - You are about to delete the local registration information for the '#{consumer.id}' consumer! - This is only needed if this consumer had previously registered with the remote producer and this producer - has been modified to not require registration anymore.<br/><br/> - - Only erase local registration information if you experience errors with the producer due to this - particular situation. Erasing local registration when not required might lead to inability to work with - this producer anymore. + <h:outputFormat value="#{i18n.confirm_delete_registration_message"> + <f:param value="#{consumer.id}"/> + </h:outputFormat> </p> - <p class="portlet-class">Are you sure you want to proceed?</p> + <p class="portlet-class">#{i18n.confirm_delete_registration_proceed}</p> <h:form> - <h:commandButton value="Erase local registration" action="#{consumer.eraseLocalRegistration}" + <h:commandButton value="#{i18n.confirm_delete_registration_submit}" action="#{consumer.eraseLocalRegistration}" styleClass="portlet-form-button portlet-section-buttonrow"/> - <h:commandButton value="Cancel" action="configureConsumer" + <h:commandButton value="#{i18n.confirm_delete_registration_cancel}" action="configureConsumer" styleClass="portlet-form-button portlet-section-buttonrow"/> </h:form> </div> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-06-05 11:52:34 UTC (rev 10927) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/consumers.xhtml 2008-06-05 11:52:50 UTC (rev 10928) @@ -4,16 +4,16 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:c="http://java.sun.com/jstl/core"> - <ui:param name="title" value="Manage Consumers"/> + <ui:param name="title" value="#{i18n.consumers_title}"/> <ui:define name="content"> <!-- Consumer creation --> <h:form styleClass="createObjectForm"> - <span class="portlet-font">Create a consumer named: </span> + <span class="portlet-font">#{i18n.consumers_create_title}</span> <h:inputText value="#{consumersMgr.selectedId}" id="consumerName" styleClass="portlet-form-input-field" required="true"/> - <h:commandButton action="#{consumersMgr.createConsumer}" value="Create Consumer" + <h:commandButton action="#{consumersMgr.createConsumer}" value="#{i18n.consumers_create_submit}" styleClass="portlet-form-button"/> <h:message for="consumerName" errorClass="portlet-msg-error"/> </h:form> @@ -24,13 +24,14 @@ <table width="100%" class="portlet-table-body" style="margin-bottom: 1em;"> <thead class="portlet-section-header"> <tr> - <th>Consumer + <th>#{i18n.consumers_table_column_consumer} <div style="font-size: 90%; display:inline; font-weight: normal;"> - [status: <span class="active">active</span>, <span class="inactive">inactive</span>, - <span class="needsRefresh">needs refresh</span>] + [#{i18n.consumers_table_column_consumer_status} <span class="active">#{i18n.path_consumers_active}</span>, + <span class="inactive">#{i18n.path_consumers_inactive}</span>, + <span class="needsRefresh">#{i18n.path_consumers_refreshNeeded}</span>] </div> </th> - <th>Actions</th> + <th>#{i18n.consumers_table_column_actions}</th> </tr> </thead> <tbody> @@ -39,34 +40,34 @@ <tr> <td class="#{consumer.active ? 'active' : 'inactive'} #{consumer.refreshNeeded ? 'needsRefresh' : ''}"> - <h:outputText value="#{consumer.producerId} (#{consumer.active ? 'active' : 'inactive'}) - #{consumer.refreshNeeded ? '(refresh needed)' : ''}"/> + <h:outputText value="#{consumer.producerId} (#{consumer.active ? i18n.path_consumers_active : i18n.path_consumers_inactive}) + #{consumer.refreshNeeded ? i18n.path_consumers_refreshNeeded : ''}"/> </td> <td class="#{status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate'}"> <h:commandLink action="#{consumersMgr.configureConsumer}" styleClass="actionConfigure"> <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Configure"/> + <h:outputText value="#{i18n.consumers_table_action_configure}"/> </h:commandLink> | <h:commandLink action="#{consumersMgr.refreshConsumer}" styleClass="actionRefresh"> <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Refresh"/> + <h:outputText value="#{i18n.consumers_table_action_refresh}"/> </h:commandLink> | <h:commandLink action="#{consumersMgr.activateConsumer}" styleClass="#{consumer.active ? 'actionDeactivate' : 'actionActivate'}"> <f:param name="id" value="#{consumer.producerId}"/> <f:param name="activate" value="#{!consumer.active}"/> - <h:outputText value="#{consumer.active ? 'Deactivate' : 'Activate'}"/> + <h:outputText value="#{consumer.active ? i18n.consumers_table_action_deactivate : i18n.consumers_table_action_activate}"/> </h:commandLink> <c:if test="#{!consumer.refreshNeeded and consumer.active and consumer.producerInfo.registrationRequired}"> | <h:commandLink action="#{consumersMgr.registerConsumer}" styleClass="action#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"> <f:param name="id" value="#{consumer.producerId}"/> <f:param name="register" value="#{!consumer.producerInfo.registered}"/> - <h:outputText value="#{consumer.producerInfo.registered ? 'Deregister' : 'Register'}"/> + <h:outputText value="#{consumer.producerInfo.registered ? i18n.consumers_table_action_deregister : i18n.consumers_table_action_register}"/> </h:commandLink> </c:if> | <h:commandLink action="confirmDeleteConsumer" styleClass="actionDelete" actionListener="#{consumersMgr.selectConsumer}"> <f:param name="id" value="#{consumer.producerId}"/> - <h:outputText value="Delete"/> + <h:outputText value="#{i18n.consumers_table_action_delete}"/> </h:commandLink> </td> </tr> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-06-05 11:52:34 UTC (rev 10927) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/consumers/editConsumer.xhtml 2008-06-05 11:52:50 UTC (rev 10928) @@ -12,24 +12,24 @@ <h:form> <table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}"> <tr> - <th>Producer id:</th> + <th>#{i18n.edit_consumer_producer}</th> <td> <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/> </td> </tr> <tr> - <th>Cache expiration:</th> + <th>#{i18n.edit_consumer_cache}</th> <td> - <h:inputText id="cache" value="#{consumer.cache}"/> (seconds before expiration) <h:message - styleClass="portlet-msg-error" - for="cache"/> + <h:inputText id="cache" value="#{consumer.cache}"/> #{i18n.edit_consumer_cache_seconds} + <h:message styleClass="portlet-msg-error" for="cache"/> </td> </tr> <tr> - <th>Endpoint configuration:</th> + <th>#{i18n.edit_consumer_endpoint}</th> <td> <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()" - valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>Use WSDL? + valueChangeListener="#{consumer.useWSDLListener}" + immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} <h:message styleClass="portlet-msg-error" for="useWSDL"/> <c:choose> <c:when test="#{consumer.useWSDL}"> @@ -40,32 +40,32 @@ <c:otherwise> <table border="0" class='portlet-table-body'> <tr> - <th>Service Description URL:</th> + <th>#{i18n.edit_consumer_endpoint_sd}</th> <td> <h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message - styleClass="portlet-msg-error" for="sd"/> + styleClass="portlet-msg-error" for="sd"/> </td> </tr> <tr> - <th>Markup URL:</th> + <th>#{i18n.edit_consumer_endpoint_m}</th> <td> <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message - styleClass="portlet-msg-error" for="m"/> + styleClass="portlet-msg-error" for="m"/> </td> </tr> <tr> - <th>Registration URL:</th> + <th>#{i18n.edit_consumer_endpoint_r}</th> <td> <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message - styleClass="portlet-msg-error" - for="r"/> + styleClass="portlet-msg-error" + for="r"/> </td> </tr> <tr> - <th>Portlet Management URL:</th> + <th>#{i18n.edit_consumer_endpoint_pm}</th> <td> <h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message - styleClass="portlet-msg-error" for="pm"/> + styleClass="portlet-msg-error" for="pm"/> </td> </tr> </table> @@ -75,19 +75,19 @@ </tr> <c:if test="#{consumer.localInfoPresent}"> <tr> - <th>Registration information:</th> + <th>#{i18n.edit_consumer_registration}</th> <td> <c:choose> <c:when test="#{consumer.localInfoPresent}"> - <h3 class="portlet-area-header">Current registration information:</h3> + <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3> <h:panelGroup styleClass="portlet-area-body"> <c:choose> <c:when test="#{!empty consumer.producerInfo.registrationInfo.registrationProperties}"> <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}"> <tr> - <th class="nameColumn">Name</th> - <th class="descColumn">Description</th> - <th>Value</th> + <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th> + <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th> + <th>#{i18n.edit_consumer_prop_value}</th> </tr> <c:forEach items="#{consumer.producerInfo.registrationInfo.registrationProperties}" var="prop"> @@ -104,17 +104,18 @@ </tr> </c:forEach> </table> - <h:commandLink action="#{consumer.update}" value="Update properties" + <h:commandLink action="#{consumer.update}" + value="#{i18n.edit_consumer_registration_update_props}" rendered="#{consumer.registered}" styleClass="portlet-form-button portlet-section-buttonrow"/> </c:when> <c:otherwise> - Registration is indicated as required without registration properties. + #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration" + <h:commandLink action="#{consumer.modifyRegistration}" value="#{i18n.edit_consumer_registration_modify}" rendered="#{consumer.registrationLocallyModified}" - title="Modify the registration held with this Producer" + title="#{i18n.edit_consumer_registration_modify_title}" styleClass="portlet-form-button portlet-section-buttonrow"/> <br style="clear:both;"/> </h:panelGroup> @@ -122,15 +123,15 @@ <br/> <c:if test="#{consumer.registrationModified}"> - <h3 class="portlet-area-header">Expected registration information:</h3> + <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3> <h:panelGroup styleClass="portlet-area-body"> <c:choose> <c:when test="#{!empty consumer.expectedRegistrationInfo.registrationProperties}"> <table class="registration-prop-table #{consumer.active ? 'active' : 'inactive'}"> <tr> - <th class="nameColumn">Name</th> - <th class="descColumn">Description</th> - <th>Value</th> + <th class="nameColumn">#{i18n.edit_consumer_prop_name}</th> + <th class="descColumn">#{i18n.edit_consumer_prop_desc}</th> + <th>#{i18n.edit_consumer_prop_value}</th> </tr> <c:forEach items="#{consumer.expectedRegistrationInfo.registrationProperties}" var="prop"> <tr title="#{prop.description.label.value}"> @@ -146,29 +147,30 @@ </table> </c:when> <c:otherwise> - Registration is indicated as required without registration properties. + #{i18n.edit_consumer_registration_no_props} </c:otherwise> </c:choose> - <h:commandLink action="#{consumer.modifyRegistration}" value="Modify registration" - title="Modify the registration held with this Producer" - styleClass="portlet-form-button portlet-section-buttonrow"/> + <h:commandLink action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}" + styleClass="portlet-form-button portlet-section-buttonrow"/> <br style="clear:both;"/> </h:panelGroup> </c:if> </c:when> <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}"> - Producer doesn't require registration. + #{i18n.edit_consumer_no_registration} </c:when> </c:choose> </td> </tr> <c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}"> <tr> - <th>Registration context:</th> + <th>#{i18n.edit_consumer_registration_context}</th> <td id="handle"> - Handle: <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <h:commandLink action="confirmEraseRegistration" value="Erase local registration" - title="Erase local registration information (potentially dangerous!)" + #{i18n.edit_consumer_registration_context_handle} <h:outputText value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> + <h:commandLink action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}" styleClass="portlet-form-button"/> </td> </tr> @@ -177,10 +179,10 @@ <tr> <th/> <td class="portlet-section-buttonrow"> - <h:commandButton action="#{consumer.refreshConsumer}" value="Refresh &amp; Save" - title="Save changes and refresh information from Producer" + <h:commandButton action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}" styleClass="portlet-form-button"/> - <h:commandLink action="#{consumersMgr.listConsumers}" value="Cancel" immediate="true" + <h:commandLink action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true" styleClass="portlet-form-button"/> </td> </tr>