From a00e1b52cd1207ae9db2d93fb7f7d85dbd7f1934 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Thu, 4 Mar 2010 17:04:01 +0100
Subject: [PATCH] =?utf8?q?Angebotssuche:=20Einige=20Strings=20waren=20noch?=
 =?utf8?q?=20nciht=20von=20Auftrag->Angebot=20=C3=BCbersetzt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fix für Bug 1294
---
 bin/mozilla/oe.pl                        | 7 +++++--
 doc/changelog                            | 2 +-
 locale/de/login                          | 1 +
 locale/de/oe                             | 1 +
 locale/de/todo                           | 1 +
 templates/webpages/oe/search_de.html     | 9 +++++----
 templates/webpages/oe/search_master.html | 9 +++++----
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/bin/mozilla/oe.pl b/bin/mozilla/oe.pl
index cdc8ac246..1532bf798 100644
--- a/bin/mozilla/oe.pl
+++ b/bin/mozilla/oe.pl
@@ -685,7 +685,10 @@ sub search {
 
   $form->header();
 
-  print $form->parse_html_template('oe/search', { %myconfig });
+  print $form->parse_html_template('oe/search', {
+    %myconfig,
+    is_order => $form->{type} =~ /_order/,
+  });
 
   $main::lxdebug->leave_sub();
 }
@@ -786,7 +789,7 @@ sub orders {
   my %column_defs = (
     'ids'                     => { 'text' => '', },
     'transdate'               => { 'text' => $locale->text('Date'), },
-    'reqdate'                 => { 'text' => $locale->text('Required by'), },
+    'reqdate'                 => { 'text' => $form->{type} =~ /_order/ ? $locale->text('Required by') : $locale->text('Valid until') },
     'id'                      => { 'text' => $locale->text('ID'), },
     'ordnumber'               => { 'text' => $locale->text('Order'), },
     'quonumber'               => { 'text' => $form->{type} eq "request_quotation" ? $locale->text('RFQ') : $locale->text('Quotation'), },
diff --git a/doc/changelog b/doc/changelog
index 6c7298195..2a84350a2 100644
--- a/doc/changelog
+++ b/doc/changelog
@@ -167,7 +167,7 @@
   1051 1055 1057 1058 1072 1073 1077 1079 1081 1082 1095 1098 1100 1101 1108
   1110 1118 1125 1127 1130 1133 1135 1136 1138 1144 1146 1147 1150 1151 1155
   1164 1173 1177 1186 1188 1190 1191 1195 1197 1198 1199 1200 1201 1209 1213
-  1243 1248 1250 1262 1286 1287 1289
+  1243 1248 1250 1262 1286 1287 1289 1294
 
 
 2009-06-02 - Version 2.6.0
diff --git a/locale/de/login b/locale/de/login
index ab13646c5..801703d89 100644
--- a/locale/de/login
+++ b/locale/de/login
@@ -338,6 +338,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
+  'Valid until'                 => 'gültig bis',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Lieferant',
diff --git a/locale/de/oe b/locale/de/oe
index 8e37a069a..e7d53573a 100644
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -311,6 +311,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
+  'Valid until'                 => 'gültig bis',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Lieferant',
diff --git a/locale/de/todo b/locale/de/todo
index 5a1ce5ad5..d23059827 100644
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -334,6 +334,7 @@ $self->{texts} = {
   'USt-IdNr.'                   => 'USt-IdNr.',
   'Unit'                        => 'Einheit',
   'Unknown dependency \'%s\'.'  => 'Unbekannte Abh&auml;ngigkeit \'%s\'.',
+  'Valid until'                 => 'gültig bis',
   'Value'                       => 'Wert',
   'Variable'                    => 'Variable',
   'Vendor'                      => 'Lieferant',
diff --git a/templates/webpages/oe/search_de.html b/templates/webpages/oe/search_de.html
index 0ebe9e01c..20b38eb2d 100644
--- a/templates/webpages/oe/search_de.html
+++ b/templates/webpages/oe/search_de.html
@@ -1,4 +1,5 @@
 [%- USE HTML %]
+[%- USE T8 %]
 [%- SET vclabel = vc == 'customer' ? 'Kunde' : 'Lieferant' %]
 [%- SET vcnumberlabel = vc == 'customer' ? 'Kundennummer' : 'Lieferantennummer' %]
 <body>
@@ -100,9 +101,9 @@
      </td>
     </tr>
     <tr>
-     <th align="right">Auftragsdatum Von</th>
+     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom" id="trigger3" value="?">
      </td>
      <th align="right">bis</th>
@@ -112,7 +113,7 @@
      </td>
     </tr>
     <tr>
-     <th align="right">Lieferdatum Von</th>
+     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
       <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdatefrom id="trigger5" value=?>
@@ -166,7 +167,7 @@
         </td>
         <td>
          <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_reqdate">Lieferdatum</label>
+         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
         </td>
        </tr>
        <tr>
diff --git a/templates/webpages/oe/search_master.html b/templates/webpages/oe/search_master.html
index cc0a2cbf3..a21ddcb3a 100644
--- a/templates/webpages/oe/search_master.html
+++ b/templates/webpages/oe/search_master.html
@@ -1,4 +1,5 @@
 [%- USE HTML %]
+[%- USE T8 %]
 [%- SET vclabel = vc == 'customer' ? '<translate>Customer</translate>' : '<translate>Vendor</translate>' %]
 [%- SET vcnumberlabel = vc == 'customer' ? '<translate>Customer Number</translate>' : '<translate>Vendor Number</translate>' %]
 <body>
@@ -100,9 +101,9 @@
      </td>
     </tr>
     <tr>
-     <th align="right"><translate>Order Date</translate> <translate>From</translate></th>
+     <th align="right">[% IF is_order %][% 'Order Date' | $T8 %][% ELSE %][% 'Quotation Date' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
-      <input name="transdatefrom" id="transdatefrom" size="11" title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
+      <input name="transdatefrom" id="transdatefrom" size="11" title="[% dateformat | html %]" onBlur="check_right_date_format(this)">
       <input type="button" name="transdatefrom" id="trigger3" value="?">
      </td>
      <th align="right"><translate>Bis</translate></th>
@@ -112,7 +113,7 @@
      </td>
     </tr>
     <tr>
-     <th align="right"><translate>Delivery Date</translate> <translate>From</translate></th>
+     <th align="right">[% IF is_order %][% 'Delivery Date' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %] [% 'From' | $T8 %]</th>
      <td>
       <input name=reqdatefrom id=reqdatefrom size=11 title="[% HTML.escape(dateformat) %]" onBlur="check_right_date_format(this)">
       <input type=button name=reqdatefrom id="trigger5" value=?>
@@ -166,7 +167,7 @@
         </td>
         <td>
          <input name="l_reqdate" id="l_reqdate" class="checkbox" type="checkbox" value="Y" checked>
-         <label for="l_reqdate"><translate>Required by</translate></label>
+         <label for="l_reqdate">[% IF is_order %][% 'Required by' | $T8 %][% ELSE %][% 'Valid until' | $T8 %][% END %]</label>
         </td>
        </tr>
        <tr>
-- 
2.20.1