From 4ba684940ad9133802448f8facb1760c6a95fce2 Mon Sep 17 00:00:00 2001
From: Roger Rehnelt <noreply@maennchen1.de>
Date: Sat, 26 Sep 2026 13:07:40 +0200
Subject: Oberflächentexte übersetzbar gemacht, Tippfehler und englische
 Begriffe korrigiert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 views/mailtemplates/html/kundenmail.phtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'views/mailtemplates/html')

diff --git a/views/mailtemplates/html/kundenmail.phtml b/views/mailtemplates/html/kundenmail.phtml
index f4e1eff..c6d152b 100644
--- a/views/mailtemplates/html/kundenmail.phtml
+++ b/views/mailtemplates/html/kundenmail.phtml
@@ -28,8 +28,8 @@
 <p><?php echo $this->view['basket']['checkout']['comment'] ?></p>
 <?php } ?>
 
-<p><?php echo __('Wir bedanken uns fuer Ihre Bestellung.', 'wpsg'); ?></p>
-<p><?php echo __('Bitte beachten Sie, dass es sich bei dieser E-Mail um eine Bestellbestaetigung und keine bindende Auftragsbestaetigung handelt. Preisirrtuemer sind leider nicht vollstaendig auszuschliessen.', 'wpsg'); ?></p>
+<p><?php echo __('Wir bedanken uns für Ihre Bestellung.', 'wpsg'); ?></p>
+<p><?php echo __('Bitte beachten Sie, dass es sich bei dieser E-Mail um eine Bestellbestätigung und keine bindende Auftragsbestätigung handelt. Preisirrtümer sind leider nicht vollständig auszuschließen.', 'wpsg'); ?></p>
 <p><?php echo wpsg_translate(__('Es gelten unsere <a href="#1#">Allgemeinen Geschaeftsbedingungen</a> (<a href="#1#">AGB</a>).', 'wpsg'), $this->getURL(wpsg_ShopController::URL_AGB)); ?></p>  
   
 <?php $this->CallMods('kundenmail_afteragb', array(&$this->view['basket']['checkout']['o_id'])); ?>
-- 
cgit v1.2.3


From e4909c250ad2d67c30621827cf9f3f14216e4b24 Mon Sep 17 00:00:00 2001
From: Roger Rehnelt <noreply@maennchen1.de>
Date: Sat, 26 Sep 2026 13:07:40 +0200
Subject: Formatierung: Dezimalkomma, Geburtsdatum, Leerzeichen und
 Doppelpunkte, Pflichtstern

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 views/mailtemplates/html/customer.phtml            |  2 +-
 .../mod_ordervars/checkout_inner_prebutton.phtml   |  3 +-
 views/mods/mod_productvariants/admin_edit.phtml    |  4 +-
 views/mods/mod_rechnungen/accounting_pdf.phtml     |  2 +-
 views/mods/mod_rechnungen/invoice_pdf.phtml        |  2 +-
 views/mods/mod_request/requestpage.phtml           | 51 ++++++++--------------
 .../checkout_inner_prebutton.phtml                 |  2 +-
 views/order/view_customerdata.phtml                |  2 +-
 8 files changed, 25 insertions(+), 43 deletions(-)

(limited to 'views/mailtemplates/html')

diff --git a/views/mailtemplates/html/customer.phtml b/views/mailtemplates/html/customer.phtml
index b811ae4..68dba26 100644
--- a/views/mailtemplates/html/customer.phtml
+++ b/views/mailtemplates/html/customer.phtml
@@ -93,7 +93,7 @@
 	</tr>
 	<tr>
 		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col0"><?php echo __('Straße', 'wpsg'); ?>:</td>
-		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(($this->view['basket']['checkout']['nr']))); ?></td>
+		<td style="padding:2px; line-height:100%; vertical-align:middle;" class="col1"><?php echo wpsg_hspc($this->view['basket']['checkout']['strasse'].rtrim(' '.($this->view['basket']['checkout']['nr']??''))); ?></td>
 	</tr>
 	<?php if (trim($this->view['basket']['checkout']['ustidnr']) != "") { ?>
 	<tr>
diff --git a/views/mods/mod_ordervars/checkout_inner_prebutton.phtml b/views/mods/mod_ordervars/checkout_inner_prebutton.phtml
index cbcc59e..99b6c08 100644
--- a/views/mods/mod_ordervars/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_ordervars/checkout_inner_prebutton.phtml
@@ -21,8 +21,7 @@
 				</label>
 				<?php } else { ?>	
 				<label class="wpshopgermany_checkout" for="wpsg_mod_ordervars_<?php echo $ov['id']; ?>">
-					<?php echo $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])); ?>
-					<?php if ($ov['pflicht'] == '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					<?php echo $this->callMod('wpsg_mod_ordervars', 'getNameById', array($ov['id'])); ?><?php if ($ov['pflicht'] == '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label> 
 				<div class="wpsg_mod_ordervars_field">
 					<?php if ($ov['typ'] == '1') { // Auswahlfeld ?>		
diff --git a/views/mods/mod_productvariants/admin_edit.phtml b/views/mods/mod_productvariants/admin_edit.phtml
index d85d397..c68ad4f 100644
--- a/views/mods/mod_productvariants/admin_edit.phtml
+++ b/views/mods/mod_productvariants/admin_edit.phtml
@@ -179,10 +179,10 @@
         		<?php } ?>
 
 				<?php if ($this->hasMod('wpsg_mod_weight')) { ?>
-    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_weight_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['weight']); ?></span></td>
+    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_weight_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc(wpsg_ff($vari['weight'])); ?></span></td>
         		<?php } ?>
 				<?php if ($this->hasMod('wpsg_mod_fuellmenge')) { ?>
-    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_fmenge_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc($vari['fmenge']); ?></span></td>
+    			<td class="col_stock"><span class="wpsg_editable" id="productvariation_fmenge_<?php echo $vari['id']; ?>"><?php echo wpsg_hspc(wpsg_ff($vari['fmenge'])); ?></span></td>
         		<?php } ?>
 
     			<?php } ?>
diff --git a/views/mods/mod_rechnungen/accounting_pdf.phtml b/views/mods/mod_rechnungen/accounting_pdf.phtml
index fd4c273..640613f 100644
--- a/views/mods/mod_rechnungen/accounting_pdf.phtml
+++ b/views/mods/mod_rechnungen/accounting_pdf.phtml
@@ -897,7 +897,7 @@
 				}
 				
 				$bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id));
-				$strBVars .= "\r\n".$bvars_name.": ".$bvars_value;
+				$strBVars .= "\r\n".$bvars_name.((substr($bvars_name, -1) === '?')?' ':': ').$bvars_value;
 				
 			}
 		
diff --git a/views/mods/mod_rechnungen/invoice_pdf.phtml b/views/mods/mod_rechnungen/invoice_pdf.phtml
index c5d649c..75a547a 100644
--- a/views/mods/mod_rechnungen/invoice_pdf.phtml
+++ b/views/mods/mod_rechnungen/invoice_pdf.phtml
@@ -922,7 +922,7 @@
 				}
 				
 				$bvars_name = $this->callMod('wpsg_mod_ordervars', 'getNameById', array($bvars_id));
-				$strBVars .= "\r\n".$bvars_name.": ".$bvars_value;
+				$strBVars .= "\r\n".$bvars_name.((substr($bvars_name, -1) === '?')?' ':': ').$bvars_value;
 				
 			}
 		
diff --git a/views/mods/mod_request/requestpage.phtml b/views/mods/mod_request/requestpage.phtml
index fa24449..bc6cd8d 100644
--- a/views/mods/mod_request/requestpage.phtml
+++ b/views/mods/mod_request/requestpage.phtml
@@ -187,8 +187,7 @@
 					<tr class="wpsg_row_product_pv">
 						<td class="wpsg_cell_label">
 							<label class="wpsg_checkout" for="wpsg_request_pv_<?php echo $pv['id']; ?>_<?php echo $request_product['product_index']; ?>">
-								<?php echo wpsg_hspc($pv['name']); ?>
-								<?php if (wpsg_isSizedInt($pv['pflicht'])) { ?><span class="wpsg_required">*</span><?php } ?>:
+								<?php echo wpsg_hspc($pv['name']); ?><?php if (wpsg_isSizedInt($pv['pflicht'])) { ?> <span class="wpsg_required">*</span><?php } ?>:
 							</label>
 						</td>
 						<td class="wpsg_cell_value" colspan="<?php echo (2 + $this->view['addColspan']); ?>">
@@ -280,15 +279,13 @@
 			<h2><?php echo __('Kontaktdaten', 'wpsg'); ?></h2>
 		 	
 			<div class="wpsg_checkoutblock" id="wpsg_firma">
-				<label for="wpsg_firma" class="wpsg_checkout"><?php echo __("Firma", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['firma'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="wpsg_firma" class="wpsg_checkout"><?php echo __("Firma", "wpsg"); ?><?php if ($this->view['pflicht']['firma'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['firma'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("firma", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_firma" name="wpsg[request][customer][firma]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['firma'])); ?>" />
 			</div>
 		
 			<div class="wpsg_checkoutblock" id="wpsg_anrede">
-				<label for="wpsg_title"><?php echo __('Anrede', 'wpsg'); ?>
-				<?php if ($this->view['pflicht']['anrede'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:</label>
+				<label for="wpsg_title" class="wpsg_checkout"><?php echo __('Anrede', 'wpsg'); ?><?php if ($this->view['pflicht']['anrede'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:</label>
 				<select class="<?php echo (($this->view['pflicht']['anrede'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("title", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_title" name="wpsg[request][customer][title]">
 					<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
 					<?php $i=0; foreach (explode("|", $this->view['pflicht']['anrede_auswahl']) as $t) { ?>
@@ -298,52 +295,45 @@
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_vorname">
-				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['vname'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="vname" class="wpsg_checkout"><?php echo __("Vorname", "wpsg"); ?><?php if ($this->view['pflicht']['vname'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['vname'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("vname", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="vname" name="wpsg[request][customer][vname]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['vname'])); ?>" />		
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_name">
-				<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="name" class="wpsg_checkout"><?php echo __("Name", "wpsg"); ?><?php if ($this->view['pflicht']['name'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="name" name="wpsg[request][customer][name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['name'])); ?>" />
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_email">
-				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail Adresse", "wpsg"); ?><?php if ($this->view['pflicht']['email'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="email" name="wpsg[request][customer][email]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['email'])); ?>" />
 			</div>
 			
 			<?php if (wpsg_isSizedInt($this->view['pflicht']['emailconfirm'])) { ?>
 			<div class="wpsg_checkoutblock" id="wpsg_email2">
-				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail (Wiederholung)", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['email'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="email" class="wpsg_checkout"><?php echo __("E-Mail (Wiederholung)", "wpsg"); ?><?php if ($this->view['pflicht']['email'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['email'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("email", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="email2" name="wpsg[request][customer][email2]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['email2'])); ?>" />
 			</div>
 			<?php } ?>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_geburtsdatum">
-				<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?>
-				<?php if ($this->view['pflicht']['geb'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="geb" class="wpsg_checkout"><?php echo __('Geburtsdatum (Format: TT.MM.JJJJ)',"wpsg"); ?><?php if ($this->view['pflicht']['geb'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['geb'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("geb", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="geb" name="wpsg[request][customer][geb]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['geb'])); ?>" />
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_fax">
-				<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['fax'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="fax" class="wpsg_checkout"><?php echo __("Fax.", "wpsg"); ?><?php if ($this->view['pflicht']['fax'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['fax'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("fax", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="fax" name="wpsg[request][customer][fax]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['fax'])); ?>" />
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_telefon">
-				<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['tel'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="tel" class="wpsg_checkout"><?php echo __("Tel.", "wpsg"); ?><?php if ($this->view['pflicht']['tel'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['tel'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("tel", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="tel" name="wpsg[request][customer][tel]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['tel'])); ?>" />
 			</div>
@@ -354,12 +344,10 @@
 
 					<div class="wpsg_checkoutblock" id="wpsg_streetnr">
 
-						<label for="strasse" class="street wpsg_checkout"><?php echo __("Straße", "wpsg"); ?>
-							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:				
+						<label for="strasse" class="street wpsg_checkout"><?php echo __("Straße", "wpsg"); ?><?php if ($this->view['pflicht']['strasse'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:				
 							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />
 						</label>
-						<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr', 'wpsg'); ?>
-							<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+						<label for="nr" class="nr wpsg_checkout"><?php echo __('Nr', 'wpsg'); ?><?php if ($this->view['pflicht']['strasse'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 							<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("nr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="nr" name="wpsg[request][customer][nr]" value="<?php echo htmlspecialchars(wpsg_getStr($this->view['requestlist']['customer']['nr'])); ?>" />
 						</label>
 						
@@ -367,8 +355,7 @@
 					
 				<?php } else { ?>
 				
-					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['strasse'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					<label for="strasse" class="wpsg_checkout"><?php echo __("Straße Nr.", "wpsg"); ?><?php if ($this->view['pflicht']['strasse'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 					</label>
 					<input class="<?php echo (($this->view['pflicht']['strasse'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("strasse", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="strasse" name="wpsg[request][customer][strasse]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['strasse'])); ?>" />		
 				
@@ -377,22 +364,19 @@
 			</div>
 		
 			<div class="wpsg_checkoutblock" id="wpsg_postleitzahl">
-				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['plz'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="plz" class="wpsg_checkout"><?php echo __("Postleitzahl", "wpsg"); ?><?php if ($this->view['pflicht']['plz'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['plz'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("plz", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="plz" name="wpsg[request][customer][plz]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['plz'])); ?>" />
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_ort">
-				<label for="ort" class="wpsg_checkout"><?php echo __("Ort", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['ort'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="ort" class="wpsg_checkout"><?php echo __("Ort", "wpsg"); ?><?php if ($this->view['pflicht']['ort'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['ort'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ort", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="ort" name="wpsg[request][customer][ort]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['ort'])); ?>" />
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_land">
-				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['land'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="wpsg_land" class="wpsg_checkout"><?php echo __("Land", "wpsg"); ?><?php if ($this->view['pflicht']['land'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<select name="wpsg[request][customer][land]" class="<?php echo (($this->view['pflicht']['land'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("land", (array)$this->view['error']))?'wpsg_error':''); ?>" id="wpsg_land">
 					<option value="-1"><?php echo __('Bitte auswählen', 'wpsg'); ?></option>
@@ -403,8 +387,7 @@
 			</div>
 			
 			<div class="wpsg_checkoutblock" id="wpsg_ustidnr">
-				<label for="wpsg_ustidnr" class="wpshopgermany_checkout"><?php echo __("UStIdNr.", "wpsg"); ?>
-				<?php if ($this->view['pflicht']['ustidnr'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+				<label for="wpsg_ustidnr" class="wpsg_checkout"><?php echo __("UStIdNr.", "wpsg"); ?><?php if ($this->view['pflicht']['ustidnr'] != '1') { ?> <span class="wpsg_required">*</span><?php } ?>:
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['ustidnr'] != '1')?'validate[required]':''); ?> wpsg_checkout <?php echo ((in_array("ustidnr", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="wpsg_ustidnr" name="wpsg[request][customer][ustidnr]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['requestlist']['customer']['ustidnr'])); ?>" />
 			</div>
diff --git a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
index 8f8a829..1e7563c 100644
--- a/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
+++ b/views/mods/mod_shippingadress/checkout_inner_prebutton.phtml
@@ -52,7 +52,7 @@
 			<?php if ($this->view['pflicht']['name'] != '2') { ?>
 			<div class="wpsg_checkoutblock">
 				<label for="shipping_name" class="wpsg_checkout"><?php echo __("Name:", "wpsg"); ?>
-					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>:
+					<?php if ($this->view['pflicht']['name'] != '1') { ?><span class="wpsg_required">*</span><?php } ?>
 				</label>
 				<input class="<?php echo (($this->view['pflicht']['name'] != '1')?'validate[required_shipping]':''); ?> wpsg_checkout <?php echo ((in_array("shipping_name", (array)$this->view['error']))?'wpsg_error':''); ?>" type="text" id="shipping_name" name="wpsg[checkout][shipping_name]" value="<?php echo wpsg_hspc(wpsg_getStr($this->view['basket']['checkout']['shipping_name'])); ?>" />
 			</div>
diff --git a/views/order/view_customerdata.phtml b/views/order/view_customerdata.phtml
index 974b508..2a101f4 100644
--- a/views/order/view_customerdata.phtml
+++ b/views/order/view_customerdata.phtml
@@ -37,7 +37,7 @@
                 <?php } ?>
                 <br />
                 <?php if ($this->view['pflicht']['geb'] != '2') { ?>
- 					<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), $this->view['data']['geb']); ?>
+ 					<?php echo wpsg_drawForm_Input('dialog_geb', __('Geburtsdatum', 'wpsg'), wpsg_fromDate($this->view['data']['geb'])); ?>
                 <?php } ?>
                 <br />
                 <?php if ($this->view['pflicht']['tel'] != '2') { ?>
-- 
cgit v1.2.3