Localization of contract duration. Partially addresses #59

opendatacz · Sep 8, 2014 · 5aa2e20 · 5aa2e20
1 parent 3fcf7e2
commit 5aa2e20
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/src/main/resources/cz/opendata/tenderstats/i18n/supplier.properties b/src/main/resources/cz/opendata/tenderstats/i18n/supplier.properties
@@ -33,7 +33,9 @@ createtender.doc.specs=Technical specs and brochures
 createtender.doc.tender=Full tender/offer
 createtender.help=On this screen, you can prepare a tender for the specified call for tenders. The tender will not be submitted yet, you can change or submit it later. You can upload documents and add attachments from your account.
 createtender.pricingtiming=Pricing and timing
+createtender.select=select
 createtender.startend=Estimated start - end date
+createtender.startend.help=Duration of the contract's execution
 createtender.submit.desc=Click to save the tender to the list of prepared tenders. The tender will be visible only to you but not to the public and buyer.
 createtender.title=Create new tender for
 edittender.help=Here you can edit the information about your tender.

diff --git a/src/main/resources/cz/opendata/tenderstats/i18n/supplier_cs.properties b/src/main/resources/cz/opendata/tenderstats/i18n/supplier_cs.properties
@@ -33,7 +33,9 @@ createtender.doc.specs=Technická specifikace
 createtender.doc.tender=Úplná nabídka
 createtender.help=Zde můžete připravit nabídku pro konkrétní výzvu. Nabídka zatím nebude odeslána, můžete ji později podat nebo změnit. K nabídce můžete přidat dokumenty ze svého disku a vybrat přílohy z těch, které jste nahráli na svůj profil.
 createtender.pricingtiming=Ceny a termíny
+createtender.select=vyberte
 createtender.startend=Odhadované datum zahájení - konce
+createtender.startend.help=Trvání realizace zakázky
 createtender.submit.desc=Kliknutím uložte nabídku na seznam připravovaných nabídek. Nabídka bude viditelná pouze pro vás, nikoli pro zadavatele nebo veřejnost.
 createtender.title=Vytvořit novou nabídku pro
 edittender.help=Zde můžete upravovat informace o své nabídce.

diff --git a/src/main/webapp/buyer-copy-event.jsp b/src/main/webapp/buyer-copy-event.jsp
@@ -16,7 +16,7 @@
                 <%@include file="WEB-INF/jspf/menu-buyer.jspf" %>
                 <div class="span8">
                     <div class="alert hide" id="userHelper">
-                        <button class="close" onclick="userHelper('off')" title="Disable guide" >×</button>
+                      <button class="close" onclick="userHelper('off')" title="<fmt:message key="disableguide"     bundle="${cons}" />" >×</button>
                         <fmt:message key="copyevent.help" />
                     </div>
 

diff --git a/src/main/webapp/buyer-submitted-tenders.jsp b/src/main/webapp/buyer-submitted-tenders.jsp
@@ -16,7 +16,7 @@
                 <%@include file="WEB-INF/jspf/menu-buyer.jspf" %>
                 <div class="span8">
                     <div class="alert hide" id="userHelper">
-                        <button class="close" onclick="userHelper('off')" title="Disable guide" >×</button>
+                      <button class="close" onclick="userHelper('off')" title="<fmt:message key="disableguide"     bundle="${cons}" />" >×</button>
                         <fmt:message key="submittedtenders.help" />
                     </div>
 

diff --git a/src/main/webapp/supplier-create-tender.jsp b/src/main/webapp/supplier-create-tender.jsp
@@ -18,15 +18,14 @@
                 <div class="span10">
 
                     <div class="alert hide" id="userHelper">
-                        <button class="close" onclick="userHelper('off')" title="Disable guide" >×</button>
+                      <button class="close" onclick="userHelper('off')" title="<fmt:message key="disableguide" bundle="${cons}" />" >×</button>
                         <fmt:message key="createtender.help" />
                     </div>
 
                     <h3><fmt:message key="createtender.title" /> '<span style="display:inline;" id="contractTitle"></span>'</h3>
 
                     <hr>
 
-                    <!-- <form action="PCFilingApp" method="post" class="form-horizontal" id="contractForm" enctype="multipart/form-data"> -->
                     <form action="PCFilingApp" method="post" enctype="multipart/form-data" class="form-horizontal" id="contractForm">
                         <input name="action" type="hidden" value="addPrivateTender">
                         <input name="forward" type="hidden" value="supplier-prepared.jsp">
@@ -42,10 +41,12 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="control-group">
+                        <div class="control-group required">
                             <h4><fmt:message key="createtender.pricingtiming" /></h4>
 
-                            <label class="control-label" for="inputPrice"><fmt:message key="offeredprice" bundle="${cons}" /> <font color="red">*</font></label>
+                            <label class="control-label" for="inputPrice">
+                              <fmt:message key="offeredprice" bundle="${cons}" />
+                            </label>
                             <div class="controls">              
                                 <input type="number" step="0.01" name="price" id="inputPrice">
                                 <select name="currency">
@@ -56,8 +57,10 @@
                             </div>            
                         </div>
 
-                        <div class="control-group">
-                            <label title="Contract duration" class="control-label" for="inputStartDate"><fmt:message key="createtender.startend" /> <font color="red">*</font></label>
+                        <div class="control-group required">
+                          <label title="<fmt:message key="createtender.startend.help" />" class="control-label" for="inputStartDate">
+                            <fmt:message key="createtender.startend" />
+                          </label>
                             <div class="controls">
                                 <input required name="startDate" type="text" id="inputStartDate"> - <input required id="inputEndDate" name="endDate" type="text">
                             </div>
@@ -88,7 +91,7 @@
                             <label class="control-label" for="inputFileCerts"><fmt:message key="createtender.attachments.certificates" /></label>
                             <div class="controls">                                              
                                 <select id="inputFileCerts" name="inputFileCerts">
-                                    <option value="">---select---</option>
+                                  <option value="">---<fmt:message key="createtender.select" />---</option>
                                 </select>                
                             </div>
                         </div>
@@ -97,7 +100,7 @@
                             <label class="control-label" for="inputFileProfile"><fmt:message key="createtender.attachments.profile" /></label>
                             <div class="controls">                                              
                                 <select id="inputFileProfile" name="inputFileProfile">
-                                    <option value="">---select---</option>
+                                  <option value="">---<fmt:message key="createtender.select" />---</option>
                                 </select>                
                             </div>
                         </div>
@@ -106,7 +109,7 @@
                             <label class="control-label" for="inputFinStatements"><fmt:message key="createtender.attachments.financial" /></label>
                             <div class="controls">                                              
                                 <select id="inputFinStatements" name="inputFileFinStatements">
-                                    <option value="">---select---</option>
+                                  <option value="">---<fmt:message key="createtender.select" />---</option>
                                 </select>                
                             </div>
                         </div>