Mercurial > hg > LightPIT / changeset

     1.1 --- a/src/main/resources/localization/projects.properties	Sat May 30 15:26:15 2020 +0200
     1.2 +++ b/src/main/resources/localization/projects.properties	Sat May 30 15:28:27 2020 +0200
     1.3 @@ -35,18 +35,18 @@
     1.4  
     1.5  menu.issues=Issues
     1.6  
     1.7 -thead.name=Name
     1.8 -thead.description=Description
     1.9 -thead.repoUrl=Repository
    1.10 -thead.owner=Project Lead
    1.11 -thead.issues.open=Open
    1.12 -thead.issues.active=In Progress
    1.13 -thead.issues.done=Done
    1.14 +name=Name
    1.15 +description=Description
    1.16 +repoUrl=Repository
    1.17 +owner=Project Lead
    1.18 +issues.open=Open
    1.19 +issues.active=In Progress
    1.20 +issues.done=Done
    1.21  
    1.22 -thead.version.project=Project
    1.23 -thead.version.name=Version
    1.24 -thead.version.status=Status
    1.25 -thead.version.ordinal=Custom Ordering
    1.26 +version.project=Project
    1.27 +version.name=Version
    1.28 +version.status=Status
    1.29 +version.ordinal=Custom Ordering
    1.30  tooltip.ordinal=Use to override lexicographic ordering.
    1.31  
    1.32  placeholder.null-owner=Unassigned
    1.33 @@ -64,21 +64,21 @@
    1.34  version.statistics.resolved=Resolved Issues
    1.35  version.statistics.total=Total
    1.36  
    1.37 -thead.issue.project=Project
    1.38 -thead.issue.subject=Subject
    1.39 -thead.issue.description=Description
    1.40 -thead.issue.assignee=Assignee
    1.41 -thead.issue.affected-version=Affected Version
    1.42 -thead.issue.affected-versions=Affected Versions
    1.43 -thead.issue.scheduled-version=Scheduled for Version
    1.44 -thead.issue.scheduled-versions=Scheduled for Versions
    1.45 -thead.issue.resolved-version=Resolved in Version
    1.46 -thead.issue.resolved-versions=Resolved in Versions
    1.47 -thead.issue.category=Category
    1.48 -thead.issue.status=Status
    1.49 -thead.issue.created=Created
    1.50 -thead.issue.updated=Updated
    1.51 -thead.issue.eta=ETA
    1.52 +issue.project=Project
    1.53 +issue.subject=Subject
    1.54 +issue.description=Description
    1.55 +issue.assignee=Assignee
    1.56 +issue.affected-version=Affected Version
    1.57 +issue.affected-versions=Affected Versions
    1.58 +issue.scheduled-version=Scheduled for Version
    1.59 +issue.scheduled-versions=Scheduled for Versions
    1.60 +issue.resolved-version=Resolved in Version
    1.61 +issue.resolved-versions=Resolved in Versions
    1.62 +issue.category=Category
    1.63 +issue.status=Status
    1.64 +issue.created=Created
    1.65 +issue.updated=Updated
    1.66 +issue.eta=ETA
    1.67  
    1.68  issue.category.Feature=Feature
    1.69  issue.category.Improvement=Improvement

     2.1 --- a/src/main/resources/localization/projects_de.properties	Sat May 30 15:26:15 2020 +0200
     2.2 +++ b/src/main/resources/localization/projects_de.properties	Sat May 30 15:28:27 2020 +0200
     2.3 @@ -35,18 +35,18 @@
     2.4  
     2.5  menu.issues=Vorg\u00e4nge
     2.6  
     2.7 -thead.name=Name
     2.8 -thead.description=Beschreibung
     2.9 -thead.repoUrl=Repository
    2.10 -thead.owner=Projektleitung
    2.11 -thead.issues.open=Offen
    2.12 -thead.issues.active=In Arbeit
    2.13 -thead.issues.done=Erledigt
    2.14 +name=Name
    2.15 +description=Beschreibung
    2.16 +repoUrl=Repository
    2.17 +owner=Projektleitung
    2.18 +issues.open=Offen
    2.19 +issues.active=In Arbeit
    2.20 +issues.done=Erledigt
    2.21  
    2.22 -thead.version.project=Projekt
    2.23 -thead.version.name=Version
    2.24 -thead.version.status=Status
    2.25 -thead.version.ordinal=Sequenznummer
    2.26 +version.project=Projekt
    2.27 +version.name=Version
    2.28 +version.status=Status
    2.29 +version.ordinal=Sequenznummer
    2.30  tooltip.ordinal=\u00dcbersteuert die lexikographische Sortierung.
    2.31  
    2.32  placeholder.null-owner=Nicht Zugewiesen
    2.33 @@ -64,21 +64,21 @@
    2.34  version.statistics.resolved=Gel\u00f6ste Vorg\u00e4nge
    2.35  version.statistics.total=Summe
    2.36  
    2.37 -thead.issue.project=Projekt
    2.38 -thead.issue.subject=Thema
    2.39 -thead.issue.description=Beschreibung
    2.40 -thead.issue.assignee=Zugewiesen
    2.41 -thead.issue.affected-version=Betroffene Version
    2.42 -thead.issue.affected-versions=Betroffene Versionen
    2.43 -thead.issue.scheduled-version=Zielversion
    2.44 -thead.issue.scheduled-versions=Zielversionen
    2.45 -thead.issue.resolved-version=Gel\u00f6st in Version
    2.46 -thead.issue.resolved-versions=Gel\u00f6st in Versionen
    2.47 -thead.issue.category=Kategorie
    2.48 -thead.issue.status=Status
    2.49 -thead.issue.created=Erstellt
    2.50 -thead.issue.updated=Aktualisiert
    2.51 -thead.issue.eta=Zieldatum
    2.52 +issue.project=Projekt
    2.53 +issue.subject=Thema
    2.54 +issue.description=Beschreibung
    2.55 +issue.assignee=Zugewiesen
    2.56 +issue.affected-version=Betroffene Version
    2.57 +issue.affected-versions=Betroffene Versionen
    2.58 +issue.scheduled-version=Zielversion
    2.59 +issue.scheduled-versions=Zielversionen
    2.60 +issue.resolved-version=Gel\u00f6st in Version
    2.61 +issue.resolved-versions=Gel\u00f6st in Versionen
    2.62 +issue.category=Kategorie
    2.63 +issue.status=Status
    2.64 +issue.created=Erstellt
    2.65 +issue.updated=Aktualisiert
    2.66 +issue.eta=Zieldatum
    2.67  
    2.68  issue.category.Feature=Feature
    2.69  issue.category.Improvement=Verbesserung

     3.1 --- a/src/main/resources/localization/users.properties	Sat May 30 15:26:15 2020 +0200
     3.2 +++ b/src/main/resources/localization/users.properties	Sat May 30 15:28:27 2020 +0200
     3.3 @@ -27,9 +27,9 @@
     3.4  
     3.5  no-users=No developers have been configured yet.
     3.6  
     3.7 -thead.username=User Name
     3.8 -thead.givenname=Given Name
     3.9 -thead.lastname=Last Name
    3.10 -thead.mail=E-Mail
    3.11 +username=User Name
    3.12 +givenname=Given Name
    3.13 +lastname=Last Name
    3.14 +mail=E-Mail
    3.15  
    3.16 -thead.displayname=Developer
    3.17 +displayname=Developer

     4.1 --- a/src/main/resources/localization/users_de.properties	Sat May 30 15:26:15 2020 +0200
     4.2 +++ b/src/main/resources/localization/users_de.properties	Sat May 30 15:28:27 2020 +0200
     4.3 @@ -27,9 +27,9 @@
     4.4  
     4.5  no-users=Bislang wurden keine Entwickler hinterlegt.
     4.6  
     4.7 -thead.username=Benutzername
     4.8 -thead.givenname=Vorname
     4.9 -thead.lastname=Nachname
    4.10 -thead.mail=E-Mail
    4.11 +username=Benutzername
    4.12 +givenname=Vorname
    4.13 +lastname=Nachname
    4.14 +mail=E-Mail
    4.15  
    4.16 -thead.displayname=Entwickler
    4.17 +displayname=Entwickler

     5.1 --- a/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Sat May 30 15:26:15 2020 +0200
     5.2 +++ b/src/main/webapp/WEB-INF/jsp/issue-form.jsp	Sat May 30 15:28:27 2020 +0200
     5.3 @@ -42,7 +42,7 @@
     5.4          </colgroup>
     5.5          <tbody>
     5.6          <tr>
     5.7 -            <th><fmt:message key="thead.issue.project"/></th>
     5.8 +            <th><fmt:message key="issue.project"/></th>
     5.9              <td>
    5.10                  <select name="pid" required>
    5.11                      <c:forEach var="project" items="${projects}">
    5.12 @@ -54,7 +54,7 @@
    5.13              </td>
    5.14          </tr>
    5.15          <tr>
    5.16 -            <th><fmt:message key="thead.issue.category"/></th>
    5.17 +            <th><fmt:message key="issue.category"/></th>
    5.18              <td>
    5.19                  <select name="category">
    5.20                      <c:forEach var="category" items="${issueCategoryEnum}">
    5.21 @@ -68,7 +68,7 @@
    5.22              </td>
    5.23          </tr>
    5.24          <tr>
    5.25 -            <th><fmt:message key="thead.issue.status"/></th>
    5.26 +            <th><fmt:message key="issue.status"/></th>
    5.27              <td>
    5.28                  <select name="status">
    5.29                      <c:forEach var="status" items="${issueStatusEnum}">
    5.30 @@ -82,17 +82,17 @@
    5.31              </td>
    5.32          </tr>
    5.33          <tr>
    5.34 -            <th><fmt:message key="thead.issue.subject"/></th>
    5.35 +            <th><fmt:message key="issue.subject"/></th>
    5.36              <td><input name="subject" type="text" maxlength="20" required value="<c:out value="${issue.subject}"/>" /></td>
    5.37          </tr>
    5.38          <tr>
    5.39 -            <th class="vtop"><fmt:message key="thead.issue.description"/></th>
    5.40 +            <th class="vtop"><fmt:message key="issue.description"/></th>
    5.41              <td>
    5.42                  <textarea name="description"><c:out value="${issue.description}"/></textarea>
    5.43              </td>
    5.44          </tr>
    5.45          <tr>
    5.46 -            <th><fmt:message key="thead.issue.assignee"/></th>
    5.47 +            <th><fmt:message key="issue.assignee"/></th>
    5.48              <td>
    5.49                  <select name="assignee">
    5.50                      <option value="-1"><fmt:message key="placeholder.null-assignee"/></option>
    5.51 @@ -108,10 +108,10 @@
    5.52              <th>
    5.53                  <c:choose>
    5.54                      <c:when test="${issue.affectedVersions.size() gt 1}">
    5.55 -                        <fmt:message key="thead.issue.affected-versions"/>
    5.56 +                        <fmt:message key="issue.affected-versions"/>
    5.57                      </c:when>
    5.58                      <c:otherwise>
    5.59 -                        <fmt:message key="thead.issue.affected-version"/>
    5.60 +                        <fmt:message key="issue.affected-version"/>
    5.61                      </c:otherwise>
    5.62                  </c:choose>
    5.63              </th>
    5.64 @@ -121,10 +121,10 @@
    5.65              <th>
    5.66                  <c:choose>
    5.67                      <c:when test="${issue.scheduledVersions.size() gt 1}">
    5.68 -                        <fmt:message key="thead.issue.scheduled-versions"/>
    5.69 +                        <fmt:message key="issue.scheduled-versions"/>
    5.70                      </c:when>
    5.71                      <c:otherwise>
    5.72 -                        <fmt:message key="thead.issue.scheduled-version"/>
    5.73 +                        <fmt:message key="issue.scheduled-version"/>
    5.74                      </c:otherwise>
    5.75                  </c:choose>
    5.76              </th>
    5.77 @@ -134,25 +134,25 @@
    5.78              <th>
    5.79                  <c:choose>
    5.80                      <c:when test="${issue.resolvedVersions.size() gt 1}">
    5.81 -                        <fmt:message key="thead.issue.resolved-versions"/>
    5.82 +                        <fmt:message key="issue.resolved-versions"/>
    5.83                      </c:when>
    5.84                      <c:otherwise>
    5.85 -                        <fmt:message key="thead.issue.resolved-version"/>
    5.86 +                        <fmt:message key="issue.resolved-version"/>
    5.87                      </c:otherwise>
    5.88                  </c:choose>
    5.89              </th>
    5.90              <td>TODO</td>
    5.91          </tr>
    5.92          <tr>
    5.93 -            <th><fmt:message key="thead.issue.eta"/></th>
    5.94 +            <th><fmt:message key="issue.eta"/></th>
    5.95              <td><input name="eta" type="date" value="<fmt:formatDate value="${issue.eta}" pattern="YYYY-MM-dd" />" /> </td>
    5.96          </tr>
    5.97          <tr>
    5.98 -            <th><fmt:message key="thead.issue.created"/></th>
    5.99 +            <th><fmt:message key="issue.created"/></th>
   5.100              <td><fmt:formatDate value="${issue.created}" /></td>
   5.101          </tr>
   5.102          <tr>
   5.103 -            <th><fmt:message key="thead.issue.updated"/></th>
   5.104 +            <th><fmt:message key="issue.updated"/></th>
   5.105              <td><fmt:formatDate value="${issue.updated}" /></td>
   5.106          </tr>
   5.107          </tbody>

     6.1 --- a/src/main/webapp/WEB-INF/jsp/issues.jsp	Sat May 30 15:26:15 2020 +0200
     6.2 +++ b/src/main/webapp/WEB-INF/jsp/issues.jsp	Sat May 30 15:28:27 2020 +0200
     6.3 @@ -39,13 +39,13 @@
     6.4  <table id="issue-list" class="datatable medskip">
     6.5      <thead>
     6.6      <tr>
     6.7 -        <th><fmt:message key="thead.issue.subject"/></th>
     6.8 -        <th><fmt:message key="thead.issue.assignee"/></th>
     6.9 -        <th><fmt:message key="thead.issue.category"/></th>
    6.10 -        <th><fmt:message key="thead.issue.status"/></th>
    6.11 -        <th><fmt:message key="thead.issue.created"/></th>
    6.12 -        <th><fmt:message key="thead.issue.updated"/></th>
    6.13 -        <th><fmt:message key="thead.issue.eta"/></th>
    6.14 +        <th><fmt:message key="issue.subject"/></th>
    6.15 +        <th><fmt:message key="issue.assignee"/></th>
    6.16 +        <th><fmt:message key="issue.category"/></th>
    6.17 +        <th><fmt:message key="issue.status"/></th>
    6.18 +        <th><fmt:message key="issue.created"/></th>
    6.19 +        <th><fmt:message key="issue.updated"/></th>
    6.20 +        <th><fmt:message key="issue.eta"/></th>
    6.21      </tr>
    6.22      </thead>
    6.23      <tbody>

     7.1 --- a/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat May 30 15:26:15 2020 +0200
     7.2 +++ b/src/main/webapp/WEB-INF/jsp/project-details.jsp	Sat May 30 15:28:27 2020 +0200
     7.3 @@ -39,17 +39,17 @@
     7.4  
     7.5  <div id="project-attributes">
     7.6      <div class="row">
     7.7 -        <div class="caption"><fmt:message key="thead.name"/>:</div>
     7.8 +        <div class="caption"><fmt:message key="name"/>:</div>
     7.9          <div><c:out value="${project.name}"/></div>
    7.10 -        <div class="caption"><fmt:message key="thead.description"/>:</div>
    7.11 +        <div class="caption"><fmt:message key="description"/>:</div>
    7.12          <div><c:out value="${project.description}"/></div>
    7.13      </div>
    7.14      <div class="row">
    7.15 -        <div class="caption"><fmt:message key="thead.owner"/>:</div>
    7.16 +        <div class="caption"><fmt:message key="owner"/>:</div>
    7.17          <div>
    7.18              <c:if test="${not empty project.owner}"><c:out value="${project.owner.displayname}"/></c:if>
    7.19          </div>
    7.20 -        <div class="caption"><fmt:message key="thead.repoUrl"/>:</div>
    7.21 +        <div class="caption"><fmt:message key="repoUrl"/>:</div>
    7.22          <div>
    7.23              <c:if test="${not empty project.repoUrl}">
    7.24                  <a target="_blank" href="<c:out value="${project.repoUrl}"/>"><c:out

     8.1 --- a/src/main/webapp/WEB-INF/jsp/project-form.jsp	Sat May 30 15:26:15 2020 +0200
     8.2 +++ b/src/main/webapp/WEB-INF/jsp/project-form.jsp	Sat May 30 15:28:27 2020 +0200
     8.3 @@ -39,19 +39,19 @@
     8.4          </colgroup>
     8.5          <tbody>
     8.6          <tr>
     8.7 -            <th><fmt:message key="thead.name"/></th>
     8.8 +            <th><fmt:message key="name"/></th>
     8.9              <td><input name="name" type="text" maxlength="20" required value="<c:out value="${project.name}"/>" /></td>
    8.10          </tr>
    8.11          <tr>
    8.12 -            <th><fmt:message key="thead.description"/></th>
    8.13 +            <th><fmt:message key="description"/></th>
    8.14              <td><input type="text" name="description" maxlength="200" value="<c:out value="${project.description}"/>" /></td>
    8.15          </tr>
    8.16          <tr>
    8.17 -            <th><fmt:message key="thead.repoUrl"/></th>
    8.18 +            <th><fmt:message key="repoUrl"/></th>
    8.19              <td><input name="repoUrl" type="url" maxlength="50" value="<c:out value="${project.repoUrl}"/>" /></td>
    8.20          </tr>
    8.21          <tr>
    8.22 -            <th><fmt:message key="thead.owner"/></th>
    8.23 +            <th><fmt:message key="owner"/></th>
    8.24              <td>
    8.25                  <select name="owner">
    8.26                      <option value="-1"><fmt:message key="placeholder.null-owner"/></option>

     9.1 --- a/src/main/webapp/WEB-INF/jsp/projects.jsp	Sat May 30 15:26:15 2020 +0200
     9.2 +++ b/src/main/webapp/WEB-INF/jsp/projects.jsp	Sat May 30 15:28:27 2020 +0200
     9.3 @@ -56,11 +56,11 @@
     9.4          <thead>
     9.5          <tr>
     9.6              <th></th>
     9.7 -            <th><fmt:message key="thead.name"/></th>
     9.8 -            <th><fmt:message key="thead.repoUrl"/></th>
     9.9 -            <th><fmt:message key="thead.issues.open"/></th>
    9.10 -            <th><fmt:message key="thead.issues.active"/></th>
    9.11 -            <th><fmt:message key="thead.issues.done"/></th>
    9.12 +            <th><fmt:message key="name"/></th>
    9.13 +            <th><fmt:message key="repoUrl"/></th>
    9.14 +            <th><fmt:message key="issues.open"/></th>
    9.15 +            <th><fmt:message key="issues.active"/></th>
    9.16 +            <th><fmt:message key="issues.done"/></th>
    9.17          </tr>
    9.18          </thead>
    9.19          <tbody>

    10.1 --- a/src/main/webapp/WEB-INF/jsp/user-form.jsp	Sat May 30 15:26:15 2020 +0200
    10.2 +++ b/src/main/webapp/WEB-INF/jsp/user-form.jsp	Sat May 30 15:28:27 2020 +0200
    10.3 @@ -38,20 +38,20 @@
    10.4          </colgroup>
    10.5          <tbody>
    10.6          <tr>
    10.7 -            <th><fmt:message key="thead.username"/></th>
    10.8 +            <th><fmt:message key="username"/></th>
    10.9              <td><input name="username" type="text" maxlength="50" required value="<c:out value="${user.username}"/>"
   10.10                         <c:if test="${user.id ge 0}">readonly</c:if> /></td>
   10.11          </tr>
   10.12          <tr>
   10.13 -            <th><fmt:message key="thead.givenname"/></th>
   10.14 +            <th><fmt:message key="givenname"/></th>
   10.15              <td><input name="givenname" type="text" maxlength="50" value="<c:out value="${user.givenname}"/>" /></td>
   10.16          </tr>
   10.17          <tr>
   10.18 -            <th><fmt:message key="thead.lastname"/></th>
   10.19 +            <th><fmt:message key="lastname"/></th>
   10.20              <td><input name="lastname" type="text" maxlength="50" value="<c:out value="${user.lastname}"/>" /></td>
   10.21          </tr>
   10.22          <tr>
   10.23 -            <th><fmt:message key="thead.mail"/></th>
   10.24 +            <th><fmt:message key="mail"/></th>
   10.25              <td><input name="mail" type="email" maxlength="50" value="<c:out value="${user.mail}"/>" /></td>
   10.26          </tr>
   10.27          </tbody>

    11.1 --- a/src/main/webapp/WEB-INF/jsp/users.jsp	Sat May 30 15:26:15 2020 +0200
    11.2 +++ b/src/main/webapp/WEB-INF/jsp/users.jsp	Sat May 30 15:28:27 2020 +0200
    11.3 @@ -45,7 +45,7 @@
    11.4          <thead>
    11.5          <tr>
    11.6              <th></th>
    11.7 -            <th><fmt:message key="thead.displayname"/></th>
    11.8 +            <th><fmt:message key="displayname"/></th>
    11.9          </tr>
   11.10          </thead>
   11.11          <tbody>

    12.1 --- a/src/main/webapp/WEB-INF/jsp/version-form.jsp	Sat May 30 15:26:15 2020 +0200
    12.2 +++ b/src/main/webapp/WEB-INF/jsp/version-form.jsp	Sat May 30 15:28:27 2020 +0200
    12.3 @@ -45,7 +45,7 @@
    12.4          </colgroup>
    12.5          <tbody>
    12.6          <tr>
    12.7 -            <th><fmt:message key="thead.version.project"/></th>
    12.8 +            <th><fmt:message key="version.project"/></th>
    12.9              <td>
   12.10                  <select name="pid" required>
   12.11                      <c:forEach var="project" items="${projects}">
   12.12 @@ -57,11 +57,11 @@
   12.13              </td>
   12.14          </tr>
   12.15          <tr>
   12.16 -            <th><fmt:message key="thead.version.name"/></th>
   12.17 +            <th><fmt:message key="version.name"/></th>
   12.18              <td><input name="name" type="text" maxlength="20" required value="<c:out value="${version.name}"/>" /></td>
   12.19          </tr>
   12.20          <tr>
   12.21 -            <th><fmt:message key="thead.version.status"/></th>
   12.22 +            <th><fmt:message key="version.status"/></th>
   12.23              <td>
   12.24                  <select name="status" required>
   12.25                      <c:forEach var="elem" items="${versionStatusEnum}">
   12.26 @@ -73,7 +73,7 @@
   12.27              </td>
   12.28          </tr>
   12.29          <tr title="<fmt:message key="tooltip.ordinal" />">
   12.30 -            <th><fmt:message key="thead.version.ordinal"/></th>
   12.31 +            <th><fmt:message key="version.ordinal"/></th>
   12.32              <td>
   12.33                  <input name="ordinal" type="number" min="0" value="${version.ordinal}"/>
   12.34              </td>