--- a/templates/classic/html/issue.item.html	Sun Jun 06 12:50:26 2004 +0000
+++ b/templates/classic/html/issue.item.html	Sun Jun 06 12:59:15 2004 +0000
@@ -1,16 +1,27 @@
 <!-- dollarId: issue.item,v 1.4 2001/08/03 01:19:43 richard Exp dollar-->
 <tal:block metal:use-macro="templates/page/macros/icing">
-<title metal:fill-slot="head_title"> 
-<tal:x condition="context/id"
-       replace="string:Issue ${context/id}: ${context/title}" />
-<tal:x condition="not:context/id">New Issue</tal:x>
-- <tal:x replace="config/TRACKER_NAME" />
-</title> 
-<span metal:fill-slot="body_title" tal:omit-tag="python:1">
- <tal:x tal:condition="not:context/id">New</tal:x> 
-  Issue<tal:x replace="context/id" />
-   <tal:x tal:condition="context/is_edit_ok">Editing</tal:x>
- </span>
+<title metal:fill-slot="head_title">
+<tal:block condition="context/id" i18n:translate=""
+ >Issue <span tal:replace="context/id" i18n:name="id"
+ />: <span tal:replace="context/title" i18n:name="title"
+ /> - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
+/></tal:block>
+<tal:block condition="not:context/id" i18n:translate=""
+ >New Issue - <span tal:replace="config/TRACKER_NAME" i18n:name="tracker"
+/></tal:block>
+</title>
+<tal:block metal:fill-slot="body_title">
+ <span tal:condition="python: not (context.id or context.is_edit_ok())"
+  tal:omit-tag="python:1" i18n:translate="">New Issue</span>
+ <span tal:condition="python: not context.id and context.is_edit_ok()"
+  tal:omit-tag="python:1" i18n:translate="">New Issue Editing</span>
+ <span tal:condition="python: context.id and not context.is_edit_ok()"
+  tal:omit-tag="python:1" i18n:translate="">Issue<tal:x
+  replace="context/id" i18n:name="id" /></span>
+ <span tal:condition="python: context.id and context.is_edit_ok()"
+  tal:omit-tag="python:1" i18n:translate="">Issue<tal:x
+  replace="context/id" i18n:name="id" /> Editing</span>
+</tal:block>
 
 <td class="content" metal:fill-slot="content">
 
@@ -24,23 +35,23 @@
 </tr>
 
 <tr>
- <th class="required">Priority</th>
+ <th class="required" i18n:translate="">Priority</th>
  <td tal:content="structure context/priority/menu">priority</td>
- <th>Status</th>
+ <th i18n:translate="">Status</th>
  <td tal:content="structure context/status/menu">status</td>
 </tr>
 
 <tr>
- <th>Superseder</th>
+ <th i18n:translate="">Superseder</th>
  <td>
   <span tal:replace="structure python:context.superseder.field(showid=1, size=20)" />
   <span tal:replace="structure python:db.issue.classhelp('id,title', property='superseder')" />
   <span tal:condition="context/superseder" tal:repeat="sup context/superseder">
-   <br>View: <a tal:attributes="href string:issue${sup/id}"
-                tal:content="sup/id"></a>
+   <br><span i18n:translate="">View: <a i18n:name="link" tal:content="sup/id"
+     tal:attributes="href string:issue${sup/id}"></a></span>
   </span>
  </td>
- <th>Nosy List</th>
+ <th i18n:translate="">Nosy List</th>
  <td>
   <span tal:replace="structure context/nosy/field" />
   <span tal:replace="structure
@@ -49,9 +60,9 @@
 </tr>
 
 <tr>
- <th>Assigned To</th>
+ <th i18n:translate="">Assigned To</th>
  <td tal:content="structure context/assignedto/menu">assignedto menu</td>
- <th>Topics</th>
+ <th i18n:translate="">Topics</th>
  <td>
   <span tal:replace="structure context/topic/field" />
   <span tal:replace="structure python:db.keyword.classhelp(property='topic')" />
@@ -59,7 +70,7 @@
 </tr>
 
 <tr tal:condition="context/is_edit_ok">
- <th>Change Note</th>
+ <th i18n:translate="">Change Note</th>
  <td colspan=3>
   <textarea tal:content="request/form/@note/value | default"
             name="@note" wrap="hard" rows="5" cols="80"></textarea>
@@ -67,7 +78,7 @@
 </tr>
 
 <tr tal:condition="context/is_edit_ok">
- <th>File</th>
+ <th i18n:translate="">File</th>
  <td colspan=3><input type="file" name="@file" size="40"></td>
 </tr>
 
@@ -86,13 +97,15 @@
 
 </form>
 
-<table class="form" tal:condition="not:context/id">
+<tal:block tal:condition="not:context/id" i18n:translate="">
+<table class="form">
 <tr>
  <td>Note:&nbsp;</td>
  <th class="required">highlighted</th>
  <td>&nbsp;fields are required.</td>
 </tr>
 </table>
+</tal:block>
 
 <p tal:condition="context/id" tal:content="structure string:Created on
   <b>${context/creation}</b> by <b>${context/creator}</b>, last
@@ -100,9 +113,14 @@
 </p>
 
 <table class="files" tal:condition="context/files">
- <tr><th colspan="5" class="header">Files</th></tr>
- <tr><th>File name</th><th>Uploaded</th><th>Type</th><th>Edit</th>
-    <th>Remove</th></tr>
+ <tr><th colspan="5" class="header" i18n:translate="">Files</th></tr>
+ <tr>
+  <th i18n:translate="">File name</th>
+  <th i18n:translate="">Uploaded</th>
+  <th i18n:translate="">Type</th>
+  <th i18n:translate="">Edit</th>
+  <th i18n:translate="">Remove</th>
+ </tr>
  <tr tal:repeat="file context/files">
   <td>
    <a tal:attributes="href file/download_url"
@@ -128,7 +146,7 @@
 </table>
 
 <table class="messages" tal:condition="context/messages">
- <tr><th colspan="4" class="header">Messages</th></tr>
+ <tr><th colspan="4" class="header" i18n:translate="">Messages</th></tr>
  <tal:block tal:repeat="msg context/messages/reverse">
   <tr>
    <th><a tal:attributes="href string:msg${msg/id}"