You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/12/30 23:55:01 UTC
svn commit: r730264 - in /continuum/trunk/continuum-webapp/src/main:
resources/localization/ webapp/WEB-INF/jsp/admin/
webapp/WEB-INF/jsp/components/ webapp/WEB-INF/jsp/navigations/
Author: olamy
Date: Tue Dec 30 14:55:01 2008
New Revision: 730264
URL: http://svn.apache.org/viewvc?rev=730264&view=rev
Log:
[CONTINUUM-1969] Externalize all strings and make continuum fully localizable.
Submitted by Christian Schulte
Modified:
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties Tue Dec 30 14:55:01 2008
@@ -705,6 +705,7 @@
# ----------------------------------------------------------------------
profilesList.page.title= Build Environments
profilesList.section.title= Build Environments
+profilesList.installations.label = Installations
# ----------------------------------------------------------------------
# Page: Profile Edit
@@ -720,6 +721,8 @@
profile.name.already.exists = A Build Environment with the same name already exists
profile.name.required = You must define a name.
profile.remove.error = The Build Environment can't be removed, it is probably used by a build definition.
+profile.installation.name.label = Installation Name
+profile.actionError = Action Error
# ----------------------------------------------------------------------
# Page: Installations List
@@ -942,6 +945,17 @@
deleteReleaseResults.confirmation.message = Are you sure you want to delete {0} release results ?
# ----------------------------------------------------------------------
+# Component: Failure
+# ----------------------------------------------------------------------
+failureComponent.section.title = This Component Failed to Render
+
+# ----------------------------------------------------------------------
+# Component: Project Group Notifier Summary
+# ----------------------------------------------------------------------
+projectGroupNotifierSummaryComponent.groupNotifiers = Project Group Notifiers of group {0}
+projectGroupNotifierSummaryComponent.projectNotifiers = Project Notifiers
+
+# ----------------------------------------------------------------------
# Page: ScmResult
# ----------------------------------------------------------------------
scmResult.page.title = Continuum - SCM result
@@ -949,4 +963,38 @@
scmResult.state = State
scmResult.projectGroupName = Project Group Name
scmResult.scmRootAddress = SCM Root URL
-scmResult.scmError = SCM Error
\ No newline at end of file
+scmResult.scmError = SCM Error
+
+# ----------------------------------------------------------------------
+# Page: Appearance
+# ----------------------------------------------------------------------
+appearance.page.title = Configure Appearance
+appearance.section.title = Appearance
+appearance.companyDetails = Company Details
+appearance.description = The logo in the top right of the screen is controlled by your selected 'company POM'.
+appearance.noCompanyPom = You have not yet specified a company POM.
+appearance.selectCompanyPom = Select a Company POM
+appearance.detailsIntroduction = Your selected company POM is below.
+appearance.maybeChange = If you would like to change the organization name, url or logo, you can
+appearance.editThePomLink = edit the POM
+appearance.companyPom.groupId = Group ID
+appearance.companyPom.artifactId = Artifact ID
+appearance.companyPom.version = Version
+appearance.editCompanyPom = Edit Company POM
+appearance.companyPom.section.title = POM Information
+appearance.companyPom.organizationName.label = Name
+appearance.companyPom.organizationUrl.label = URL
+appearance.companyPom.organizationLogoUrl.label = Logo URL
+appearance.companyPomDoesNotExist = Company POM ''{0}'' doesn't exist.
+appearance.createCompanyPom = Create company POM
+appearance.htmlContent.label = HTML Content
+appearance.enterCompanyPom = Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read from it.
+appearance.footerContent = Footer Content
+
+# ----------------------------------------------------------------------
+# Page: Edit Company POM
+# ----------------------------------------------------------------------
+companyPom.page.title = Edit Company POM
+companyPom.section.title = Company POM
+companyPom.autoIncrementVersion = The version will automatically be incremented when you save this form.
+companyPom.organization = Organization
\ No newline at end of file
Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum_de.properties Tue Dec 30 14:55:01 2008
@@ -108,7 +108,7 @@
about.section.title = \u00DCber Continuum
about.version.label = Version
about.version.number = ${project.version}
-about.buildnumber.label = Buildnummer
+about.buildnumber.label = Build
about.buildnumber = ${buildNumber}
# ----------------------------------------------------------------------
@@ -119,7 +119,7 @@
login.username = Benutzername
login.password = Passwort
login.rememberMe = Daten merken
-login.submit = Verbinden
+login.submit = \u00DCbertragen
# ----------------------------------------------------------------------
# Page: Summary
@@ -166,8 +166,8 @@
projectGroup.tab.notifiers = Berichterstatter
projectGroup.actions.title = Gruppen-Aktionen
projectGroup.release.error.emptyGroup = Es kann keine leere Gruppe ver\u00F6ffentlicht werden.
-projectGroup.release.error.severalParentProjects = Es k\u00F6nnen nicht mehrere Eltern-Projekte derselben Gruppe in demselben Vorgang ver\u00F6ffentlicht werden.
-projectGroup.release.error.projectNotInSuccess = Gruppe kann nicht ver\u00F6ffentlicht werden. Ein oder mehrere Projekte konnten nicht erfolgreich verarbeitet werden.
+projectGroup.release.error.severalParentProjects = Mehrere Eltern-Projekte derselben Gruppe k\u00F6nnen nicht in demselben Vorgang ver\u00F6ffentlicht werden.
+projectGroup.release.error.projectNotInSuccess = Die Gruppe kann nicht ver\u00F6ffentlicht werden. Ein oder mehrere Projekte konnten nicht erfolgreich verarbeitet werden.
projectGroup.deleteGroup = Gruppe l\u00F6schen
projectGroup.buildGroup = Gruppenvorg\u00E4nge starten
projectGroup.buildGroupNow = Gruppenvorg\u00E4nge jetzt starten
@@ -235,8 +235,8 @@
configuration.deploymentRepositoryDirectory.message = Bitte geben Sie das Ausgabeverzeichnis f\u00FCr Bereitstellungsdateien der Continuum Web-Anwendung an.
configuration.baseUrl.message = Bitte geben Sie den Basis-URL der Continuum Web-Anwendung an.
configuration.companyName.message = Bitte geben Sie den Firmennamen an.
-configuration.companyLogo.message = Bitte geben Sie das Firmen-Logo an.
-configuration.companyUrl.message = Bitte geben Sie den URL der offiziellen Firmen-Internetpr\u00E4senz an.
+configuration.companyLogo.message = Bitte geben Sie das Firmenlogo an.
+configuration.companyUrl.message = Bitte geben Sie den URL der offiziellen Internetpr\u00E4senz der Firma an.
configuration.releaseOutputDirectory.label = Ausgabeverzeichnis Ver\u00F6ffentlichungen
configuration.releaseOutputDirectory.message = Bitte geben Sie das Ausgabeverzeichnis f\u00FCr Ver\u00F6ffentlichungen der Continuum Web-Anwendung an.
configuration.releaseOutputDirectory.required = Es mu\u00DF ein Ausgabeverzeichnis f\u00FCr Ver\u00F6ffentlichungen angegeben werden.
@@ -348,7 +348,7 @@
# ----------------------------------------------------------------------
deleteProject.page.title = Continuum - Continuum Projekte l\u00F6schen
deleteProject.section.title = Continuum Projekte l\u00F6schen
-deleteProject.confirmation.message = Soll das Projekt "{0}" wirklich gel\u00F6scht werden ?
+deleteProject.confirmation.message = Soll das Projekt "{0}" wirklich gel\u00F6scht werden ?
# ----------------------------------------------------------------------
# Page: ProjectView
@@ -479,7 +479,7 @@
notifier.msn.password.label = MSN Passwort
notifier.msn.address.label = MSN Empf\u00E4nger-Adresse
notifier.wagon.url.label = URL des Projekts
-notifier.wagon.id.label = Server-Bezeichner (aus der settings.xml Datei zur Authentifikation)
+notifier.wagon.id.label = Server-Bezeichner (aus der settings.xml Datei zur Authentifizierung)
notifier.event.sendOnSuccess = Bei Erfolg senden
notifier.event.sendOnFailure = Bei Fehlversuch senden
notifier.event.sendOnError = Bei Fehler senden
@@ -620,7 +620,7 @@
surefireReport.errors = Fehler
surefireReport.failures = Fehlschl\u00E4ge
surefireReport.successRate = Erfolgsrate
-surefireReport.time = Zeit
+surefireReport.time = Dauer
surefireReport.packageList = Paketliste
surefireReport.testCases = Testf\u00E4lle
surefireReport.package = Paketname
@@ -632,7 +632,7 @@
# Page: Continuum Release Support
# ----------------------------------------------------------------------
releaseProject.page.title=Continuum - Projekt ver\u00F6ffentlichen
-releaseProject.section.title=Bitte w\u00E4hlen Sie ein Ver\u00F6ffentlichungs-Goal f\u00FCr {0}.
+releaseProject.section.title=Bitte geben Sie ein ''Maven-Goal'' f\u00FCr die Ver\u00F6ffentlichung von {0} an.
releaseProject.prepareReleaseOption=Projekt zur Ver\u00F6ffentlichung vorbereiten
releaseProject.performReleaseOption=Projekt ver\u00F6ffentlichen
releaseProject.provideReleaseParameters=Bitte geben Sie Paramter f\u00FCr die Ver\u00F6ffentlichung an.
@@ -642,7 +642,7 @@
releasePrepare.nextDevelopmentVersion=N\u00E4chste Entwicklungs-Version*
releasePerform.section.title=Projekt ver\u00F6ffentlichen
releasePerform.parameters=Ver\u00F6ffentlichungs-Parameter
-releaseInProgress.section.title=F\u00FChrt Ver\u00F6ffentlichungs-Goal aus
+releaseInProgress.section.title=Ver\u00F6ffentlichung
releaseInProgress.status=Status
releaseInProgress.phase=Phase
releaseInProgress.viewOutput=Ergebnis anzeigen
@@ -656,12 +656,12 @@
releaseViewResult.output=Ergebnis der Ver\u00F6ffentlichung
releaseViewResult.noOutput=Kein Inhalt
releaseViewResult.projectName=Projektname
-releaseViewResult.releaseGoal=Ver\u00F6ffentlichungs-Goal
+releaseViewResult.releaseGoal=''Maven-Goal'' der Ver\u00F6ffentlichung
releasePrepare.scmUsername.label=SCM Benutzername
releasePrepare.scmPassword.label=SCM Passwort
releasePrepare.scmTag.label=SCM Markierung
releasePrepare.scmTagBase.label=SCM Markierungs-Basis
-releasePrepare.prepareGoals.label=Vorbereitungs-Goals
+releasePrepare.prepareGoals.label=''Maven-Goals'' der Vorbereitung
releasePrepare.buildEnvironment.label=Umgebung
releasePerformFromScm.scmUrl.label=SCM Verbindungs-URL
releasePerformFromScm.scmUsername.label=SCM Benutzername
@@ -700,6 +700,7 @@
# ----------------------------------------------------------------------
profilesList.page.title= Umgebungen
profilesList.section.title= Umgebungen
+profilesList.installations.label=Installationen
# ----------------------------------------------------------------------
# Page: Profile Edit
@@ -715,6 +716,8 @@
profile.name.already.exists = Eine Umgebung mit demselben Namen existiert bereits.
profile.name.required = Es mu\u00DF ein Name angegeben werden.
profile.remove.error = Die Umgebung kann nicht entfernt werden, solange es Vorgangsdefinitionen gibt, die sich darauf beziehen.
+profile.installation.name.label=Installationsname
+profile.actionError = Fehler
# ----------------------------------------------------------------------
# Page: Installations List
@@ -808,8 +811,8 @@
# ----------------------------------------------------------------------
buildResult.delete.confirmation.page.title = Continuum - Vorgangs-Ergebnisse l\u00F6schen
buildResult.delete.confirmation.section.title = Vorgangs-Ergebnisse l\u00F6schen
-buildResult.delete.confirmation.message = Sollen die Vorgangs-Ergebnisse "{0}" wirklich gel\u00F6scht werden ?
-buildResult.cannot.delete = Der Vorgang wird momentan ausgef\u00FChrt. L\u00F6schen nicht m\u00F6glich.
+buildResult.delete.confirmation.message = Sollen diese {0} Vorgangs-Ergebnisse wirklich gel\u00F6scht werden ?
+buildResult.cannot.delete = Der Vorgang wird momentan ausgef\u00FChrt. L\u00F6schung nicht m\u00F6glich.
# ----------------------------------------------------------------------
# Legend
@@ -934,4 +937,59 @@
# ----------------------------------------------------------------------
deleteReleaseResults.page.title = Continuum - Ergebnisse der Ver\u00F6ffentlichung l\u00F6schen
deleteReleaseResults.section.title = Ergebnisse der Ver\u00F6ffentlichung l\u00F6schen
-deleteReleaseResults.confirmation.message = Sollen die Ergebnisse der Ver\u00F6ffentlichung "{0}" wirklich gel\u00F6scht werden ?
+deleteReleaseResults.confirmation.message = Sollen diese {0} Ergebnisse der Ver\u00F6ffentlichung wirklich gel\u00F6scht werden ?
+
+# ----------------------------------------------------------------------
+# Component: Failure
+# ----------------------------------------------------------------------
+failureComponent.section.title=Darstellung dieser Komponente fehlgeschlagen.
+
+# ----------------------------------------------------------------------
+# Component: Project Group Notifier Summary
+# ----------------------------------------------------------------------
+projectGroupNotifierSummaryComponent.projectNotifiers=Projekt Berichterstatter
+projectGroupNotifierSummaryComponent.groupNotifiers=Berichterstatter der Gruppe {0}
+
+# ----------------------------------------------------------------------
+# Page: ScmResult
+# ----------------------------------------------------------------------
+scmResult.page.title = Continuum - SCM Ergebnis
+scmResult.section.title = SCM Ergebnis
+scmResult.state = Status
+scmResult.projectGroupName = Projektgruppenname
+scmResult.scmRootAddress = SCM Wurzel-Verzeichnis-URL
+scmResult.scmError = SCM Fehler
+
+# ----------------------------------------------------------------------
+# Page: Appearance
+# ----------------------------------------------------------------------
+appearance.page.title = Erscheinungsbild konfigurieren
+appearance.section.title = Erscheinungsbild
+appearance.companyDetails = Firmen-Details
+appearance.description = Das Logo in der rechten, oberen Ecke wird durch das von Ihnen ausw\u00E4hlbare ''Firmen-POM'' gesteuert.
+appearance.noCompanyPom = Es wurde noch kein ''Firmen-POM'' angegeben.
+appearance.selectCompanyPom = Bitte w\u00E4hlen Sie ein ''Firmen-POM''.
+appearance.detailsIntroduction = Es folgt das ausgew\u00E4hlte ''Firmen-POM''.
+appearance.maybeChange = Wenn Sie den Firmen-Namen, URL oder das Logo \u00E4ndern m\u00F6chten, k\u00F6nnen Sie
+appearance.editThePomLink = das POM bearbeiten
+appearance.companyPom.groupId = Gruppenbezeichner
+appearance.companyPom.artifactId = Artefaktbereichner
+appearance.companyPom.version = Version
+appearance.editCompanyPom = Firmen-POM bearbeiten
+appearance.companyPom.section.title = POM Informationen
+appearance.companyPom.organizationName.label = Name
+appearance.companyPom.organizationUrl.label = URL
+appearance.companyPom.organizationLogoUrl.label = Logo URL
+appearance.companyPomDoesNotExist = Firmen-POM ''{0}'' existiert nicht.
+appearance.createCompanyPom = Firmen-POM erstellen
+appearance.htmlContent.label = HTML-Inhalt
+appearance.enterCompanyPom = Bitte geben Sie die Details zum gew\u00FCnschten Firmen-POM an. Sollte es existieren, werden Firmen-Name, URL und Logo daraus \u00FCbernommen.
+appearance.footerContent=Inhalt der Fu\u00DFzeile
+companyPom.organization=Organisation
+companyPom.page.title=Firmen-POM bearbeiten
+companyPom.section.title=Firmen-POM
+companyPom.autoIncrementVersion=Die Version wird beim Speichern automatisch inkrementiert.
+notifier.event.sendOnScmFailure=Bei SCM-Fehler senden
+projectGroup.scmRoot.label=SCM Wurzel-Verzeichnis-URL
+projectGroup.scmRoot.title=Projektgruppen SCM Wurzel-Verzeichnis
+releasePrepare.useEditMode.label=''Editmodus'' verwenden
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/appearance.jsp Tue Dec 30 14:55:01 2008
@@ -21,66 +21,67 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib uri="continuum" prefix="c1" %>
<html>
+<s:i18n name="localization.Continuum">
<head>
- <title>Configure Appearance</title>
+ <title><s:text name="appearance.page.title"/></title>
<s:head/>
</head>
<body>
-<h1>Appearance</h1>
+<h1><s:text name="appearance.section.title"/></h1>
<div style="float: right">
- <a href="<s:url action='editAppearance' />">Edit</a>
+ <a href="<s:url action='editAppearance' />"><s:text name="edit"/></a>
</div>
-<h2>Company Details</h2>
+<h2><s:text name="appearance.companyDetails"/></h2>
<p>
- The logo in the top right of the screen is controlled by your selected 'company POM'.
+ <s:text name="appearance.description"/>
</p>
<s:set name="companyPom" value="companyPom"/>
<c:if test="${empty (companyPom.groupId) || empty (companyPom.artifactId)}">
<p>
- You have not yet specified a company POM. <a href="<s:url action='editAppearance' />">Select a Company POM</a>
+ <s:text name="appearance.noCompanyPom"/> <a href="<s:url action='editAppearance' />"><s:text name="appearance.selectCompanyPom"/></a>
</p>
</c:if>
<c:if test="${!empty (companyPom.groupId) && !empty (companyPom.artifactId)}">
<p>
- Your selected company POM is below. If you would like to change the organization name, url or logo, you can
- <a href="<s:url action='editCompanyPom'/>">edit the POM</a>.
+ <s:text name="appearance.detailsIntroduction"/> <s:text name="appearance.maybeChange"/>
+ <a href="<s:url action='editCompanyPom'/>"><s:text name="appearance.editThePomLink"/></a>.
</p>
<s:set name="companyModel" value="companyModel"/>
<table>
- <s:label name="companyPom.groupId" label="Group ID"/>
- <s:label name="companyPom.artifactId" label="Artifact ID"/>
+ <s:label name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
+ <s:label name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
<c:if test="${companyModel != null}">
- <s:label name="companyModel.version" label="Version"/>
+ <s:label name="companyModel.version" label="%{getText('appearance.companyPom.version')}"/>
</c:if>
</table>
<div style="float: right">
- <a href="<s:url action='editCompanyPom' />">Edit Company POM</a>
+ <a href="<s:url action='editCompanyPom' />"><s:text name="appearance.editCompanyPom"/></a>
</div>
- <h3>POM Information</h3>
+ <h3><s:text name="appearance.companyPom.section.title"/></h3>
<c:choose>
<c:when test="${companyModel != null}">
<table>
<tr>
- <th>Name</th>
+ <th><s:text name="appearance.companyPom.organizationName.label"/></th>
<td>${companyModel.organization.name}</td>
</tr>
<tr>
- <th>URL</th>
+ <th><s:text name="appearance.companyPom.organizationUrl.label"/></th>
<td><a href="${companyModel.organization.url}" target="_blank">
<code>${companyModel.organization.url}</code>
</a></td>
</tr>
<tr>
- <th>Logo URL</th>
+ <th><s:text name="appearance.companyPom.organizationLogoUrl.label"/></th>
<td>
<code>${companyModel.properties['organization.logo']}</code>
</td>
@@ -88,18 +89,18 @@
</table>
</c:when>
<c:otherwise>
- Company POM '${companyPom.groupId}:${companyPom.artifactId}' doesn't exist.
- <a href="<s:url action='editCompanyPom' />">Create company POM</a>
+ <s:text name="appearance.companyPomDoesNotExist"><s:param>${companyPom.groupId}:${companyPom.artifactId}</s:param></s:text>
+ <a href="<s:url action='editCompanyPom' />"><s:text name="appearance.createCompanyPom"/></a>
</c:otherwise>
</c:choose>
</c:if>
<s:form action="saveFooter!saveFooter.action" method="get" namespace="/admin">
<div id="axial" class="h3">
- <h3>footer content</h3>
+ <h3><s:text name="appearance.footerContent"/></h3>
<div class="axial">
<table>
<tbody>
- <s:textarea cols="120" rows="3" label="HTML Content" name="footer" />
+ <s:textarea cols="120" rows="3" label="%{getText('appearance.htmlContent.label')}" name="footer" />
</tbody>
</table>
<div class="functnbar3">
@@ -109,5 +110,5 @@
</div>
</s:form>
</body>
-
+</s:i18n>
</html>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editAppearance.jsp Tue Dec 30 14:55:01 2008
@@ -19,27 +19,27 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
+<s:i18n name="localization.Continuum">
<head>
- <title>Configure Appearance</title>
+ <title><s:text name="appearance.page.title"/></title>
<s:head/>
</head>
<body>
- <h1>Appearance</h1>
+ <h1><s:text name="appearance.section.title"/></h1>
- <h2>Company Details</h2>
+ <h2><s:text name="appearance.companyDetails"/></h2>
<p>
- Enter the details of the company super POM below. If it exists, the organization name, URL and logo will be read
- from it.
+ <s:text name="appearance.enterCompanyPom"/>
</p>
<s:actionmessage/>
<s:form method="post" action="saveAppearance" namespace="/admin" validate="true" theme="xhtml">
- <s:textfield name="companyPom.groupId" label="Group ID"/>
- <s:textfield name="companyPom.artifactId" label="Artifact ID"/>
- <s:submit value="Save"/>
+ <s:textfield name="companyPom.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
+ <s:textfield name="companyPom.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
+ <s:submit value="%{getText('save')}"/>
</s:form>
</body>
-
-</html>
\ No newline at end of file
+</s:i18n>
+</html>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPom.jsp Tue Dec 30 14:55:01 2008
@@ -19,36 +19,37 @@
<%@ taglib prefix="s" uri="/struts-tags" %>
<html>
+<s:i18n name="localization.Continuum">
<head>
- <title>Edit Company POM</title>
+ <title><s:text name="companyPom.page.title"/></title>
<s:head/>
</head>
<body>
-<h1>Company POM</h1>
+<h1><s:text name="companyPom.section.title"/></h1>
<s:actionmessage/>
<s:form method="post" action="saveCompanyPom" namespace="/admin" validate="true" theme="xhtml">
- <s:label name="companyModel.groupId" label="Group ID"/>
- <s:label name="companyModel.artifactId" label="Artifact ID"/>
+ <s:label name="companyModel.groupId" label="%{getText('appearance.companyPom.groupId')}"/>
+ <s:label name="companyModel.artifactId" label="%{getText('appearance.companyPom.artifactId')}"/>
<tr>
- <td>Version</td>
+ <td><s:text name="appearance.companyPom.version"/></td>
<td>
<s:property value="companyModel.version"/>
- <i>(The version will automatically be incremented when you save this form)</i>
+ <i>(<s:text name="companyPom.autoIncrementVersion"/>)</i>
</td>
</tr>
<tr>
<td></td>
- <td><h2>Organization</h2></td>
+ <td><h2><s:text name="companyPom.organization"/></h2></td>
</tr>
- <s:textfield name="companyModel.organization.name" size="40" label="Name"/>
- <s:textfield name="companyModel.organization.url" size="70" label="URL"/>
+ <s:textfield name="companyModel.organization.name" size="40" label="%{getText('appearance.companyPom.organizationName.label')}"/>
+ <s:textfield name="companyModel.organization.url" size="70" label="%{getText('appearance.companyPom.organizationUrl.label')}"/>
<%-- TODO: how to get it to be a string, not a String[]? --%>
- <s:textfield name="companyModel.properties['organization.logo']" size="70" label="Logo URL"/>
- <s:submit value="Save"/>
+ <s:textfield name="companyModel.properties['organization.logo']" size="70" label="%{getText('appearance.companyPom.organizationLogoUrl.label')}"/>
+ <s:submit value="%{getText('save')}"/>
</s:form>
</body>
-
-</html>
\ No newline at end of file
+</s:i18n>
+</html>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editProfile.jsp Tue Dec 30 14:55:01 2008
@@ -37,11 +37,11 @@
<div class="axial">
<s:if test="hasActionErrors()">
- <h3>Action Error</h3>
+ <h3><s:text name="profile.actionError"/></h3>
+ <p>
+ <s:actionerror/>
+ </p>
</s:if>
- <p>
- <s:actionerror/>
- </p>
</div>
<table>
<tr>
@@ -83,13 +83,13 @@
width="100%"
autoIncludeParameters="false">
<ec:row highlightRow="true">
- <ec:column property="nameEdit" title="Installation Name" style="white-space: nowrap" width="50%">
+ <ec:column property="nameEdit" title="profile.installation.name.label" style="white-space: nowrap" width="50%">
<a href="editInstallation!edit.action?installation.installationId=<c:out value="${profileInstallation.installationId}"/>">
<c:out value="${profileInstallation.name}"/>
</a>
(<c:out value="${profileInstallation.varValue}"/>)
</ec:column>
- <ec:column property="type" title="Type" style="white-space: nowrap" width="49%"/>
+ <ec:column property="type" title="installation.type.label" style="white-space: nowrap" width="49%"/>
<ec:column property="id" title=" " width="1%">
<a href="removeBuildEnvInstallation!removeInstallation.action?profile.id=<c:out value="${profile.id}"/>&installationId=<c:out value="${profileInstallation.installationId}"/>">
<img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/installationsList.jsp Tue Dec 30 14:55:01 2008
@@ -42,10 +42,10 @@
sortable="false"
filterable="false">
<ec:row highlightRow="true">
- <ec:column property="name" title="Name" style="white-space: nowrap" />
- <ec:column property="type" title="Type" style="white-space: nowrap" />
- <ec:column property="varName" title="Env Var Name" style="white-space: nowrap" />
- <ec:column property="varValue" title="Value/Path" style="white-space: nowrap" />
+ <ec:column property="name" title="installation.name.label" style="white-space: nowrap" />
+ <ec:column property="type" title="installation.type.label" style="white-space: nowrap" />
+ <ec:column property="varName" title="installation.varName.label" style="white-space: nowrap" />
+ <ec:column property="varValue" title="installation.value.label" style="white-space: nowrap" />
<ec:column property="id" title=" " width="1%">
<a href="editInstallation!edit.action?installation.installationId=<c:out value="${installation.installationId}"/>">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/profilesList.jsp Tue Dec 30 14:55:01 2008
@@ -50,8 +50,8 @@
sortable="false"
filterable="false">
<ec:row highlightRow="true">
- <ec:column property="name" title="Name" style="white-space: nowrap" />
- <ec:column property="Installations" title="Installations" style="white-space: nowrap">
+ <ec:column property="name" title="profile.name.label" style="white-space: nowrap" />
+ <ec:column property="Installations" title="profilesList.installations.label" style="white-space: nowrap">
<ul>
<s:if test='profile.jdk != null'>
<li><c:out value="${profile.jdk.name}"/> (<c:out value="${profile.jdk.type}"/>)</li>
@@ -64,7 +64,7 @@
<li><c:out value="${envVar.name}" /></li>
</c:forEach>
</s:if>
- <ul>
+ </ul>
</ec:column>
<ec:column property="id" title=" " width="1%">
<a href="editBuildEnv!edit.action?profile.id=<c:out value="${pageScope.profile.id}"/>">
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/failureComponent.jsp Tue Dec 30 14:55:01 2008
@@ -26,7 +26,7 @@
<div class="axial">
<table>
<tr>
- <td><center>This Component Failed to Render</center></td>
+ <td><center><s:text name="failureComponent.section.title"/></center></td>
</tr>
</table>
</div>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/projectGroupNotifierSummaryComponent.jsp Tue Dec 30 14:55:01 2008
@@ -24,7 +24,7 @@
<%@ taglib uri="http://plexus.codehaus.org/redback/taglib-1.0" prefix="redback" %>
<s:i18n name="localization.Continuum">
- <h3>Project Group Notifiers of ${projectGroup.name} group</h3>
+ <h3><s:text name="projectGroupNotifierSummaryComponent.groupNotifiers"><s:param>${projectGroup.name}</s:param></s:text></h3>
<c:if test="${not empty projectGroupNotifierSummaries}">
<ec:table items="projectGroupNotifierSummaries"
var="projectGroupNotifierSummary"
@@ -84,7 +84,7 @@
</redback:ifAuthorized>
<c:if test="${not empty projectNotifierSummaries}">
- <h3>Project Notifiers</h3>
+ <h3><s:text name="projectGroupNotifierSummaryComponent.projectNotifiers"/></h3>
<ec:table items="projectNotifierSummaries"
var="projectNotifierSummary"
showExports="false"
@@ -93,7 +93,7 @@
filterable="false"
sortable="false">
<ec:row>
- <ec:column property="projectName" title="PROJECT NAME">
+ <ec:column property="projectName" title="projectView.project.name">
<s:url id="projectUrl" action="projectView" namespace="/" includeParams="none">
<s:param name="projectId">${pageScope.projectNotifierSummary.projectId}</s:param>
</s:url>
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=730264&r1=730263&r2=730264&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Tue Dec 30 14:55:01 2008
@@ -177,7 +177,7 @@
</redback:ifAnyAuthorized>
<div id="projectmenu" class="toolgroup">
- <div class="label">Legend</div>
+ <div class="label"><s:text name="legend.title"/></div>
<div id="legend">
<div id="litem1" class="body"><s:text name="legend.buildNow"/></div>
<div id="litem2" class="body"><s:text name="legend.buildHistory"/></div>