From c797aaa0305532b62bd053f8365b4f012744a3f3 Mon Sep 17 00:00:00 2001
From: alpcentaur <luca@cannabinieri.de>
Date: Sat, 13 Aug 2022 10:19:36 +0000
Subject: [PATCH] Texte in html durch yaml Variablen substituiert

---
 .locale.yaml.swp | Bin 0 -> 1024 bytes
 form.php         |  46 +++++++++++++++++++++++-----------------------
 index.php        |   4 ++--
 locale.yaml      |   4 ++--
 4 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 .locale.yaml.swp

diff --git a/.locale.yaml.swp b/.locale.yaml.swp
new file mode 100644
index 0000000000000000000000000000000000000000..3e34a64d491c3505b670f3bd56dd5d6862baf3b4
GIT binary patch
literal 1024
zcmYc?$V<%2S1{4DU_b%(JPZsKrAeiEC8a3h*f_+h%gIkp%t_U&Ow7%}X3VJAXb6mk
L0Bu7c6y10L{eKQ1

literal 0
HcmV?d00001

diff --git a/form.php b/form.php
index c1589d8..4b7b5eb 100644
--- a/form.php
+++ b/form.php
@@ -91,35 +91,35 @@
 				<section id="bank-noneu">
 					<div class="is-row">
 						<div class="is-col">
-							<input type="input" size="32" name="non_sepa_owner" placeholder="<?=_("Kontoinhabende Person")?>" />
+							<input type="input" size="32" name="non_sepa_owner" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_1'][$loc])?>" />
 						</div>
 						<div class="is-col">
-							<input type="input" size="32" id="n_bic" name="n_bic" placeholder="<?=_("BIC/SWIFT*")?>" />
+							<input type="input" size="32" id="n_bic" name="n_bic" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_2'][$loc])?>" />
 						</div>
 					</div>
 
 					<div class="is-row">
 						<div class="is-col">
-							<input type="input" size="32" id="n_iban" name="n_iban" placeholder="<?=_("Kontonummer*")?>" />
+							<input type="input" size="32" id="n_iban" name="n_iban" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_3'][$loc])?>" />
 						</div>
 						<div class="is-col">
-							<input type="input" size="32" id="n_routing" name="n_routing" placeholder="<?=_("Routing Number")?>" />
+							<input type="input" size="32" id="n_routing" name="n_routing" placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_4'][$loc])?>" />
 						</div>
 					</div>
-					<input class="EU nonEU" type="input" size="32" id="n_bank" name="n_bankname" placeholder="<?="Name der Bank*"?>" />
+					<input class="EU nonEU" type="input" size="32" id="n_bank" name="n_bankname" placeholder="<?=$localeYaml['form_1_noSEPA_placeholder_5'][$loc]?>" />
 
 					<textarea  class="nonEU" name="n_bankaddress" id="n_bankaddress" style="resize:both;" cols="32" rows="4" 
-						placeholder="<?=_("Adresse der Bank (Stra&szlig;e und Hausnummer, Postleitzahl, Ort, Land)")?>"></textarea>
+						placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_6'][$loc])?>"></textarea>
 					<br>
 					<textarea name="n_address" lang="de" class="nonEU" id="n_address" style="resize:both;" cols="32" rows="4" 
-						placeholder="<?=_("Deine Anschrift (Stra&szlig;e und Hausnummer, Postleitzahl, Ort, Land)*")?>"></textarea>
+						placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_7'][$loc])?>"></textarea>
 					<br>
 
 
 
 					<textarea  id="n_comments" name="n_comments"
 							style="resize:both;" cols="32" rows="4" 
-							placeholder="<?=_("Weitere Anmerkungen, z.B. intermediäre Bank, Grund für abweichende kontoinhabende Person")?>"></textarea>
+							placeholder="<?=_($localeYaml['form_1_noSEPA_placeholder_8'][$loc])?>"></textarea>
 
 				</section>
 
@@ -129,10 +129,10 @@
 	</fieldset>
 
 
-	<fieldset id="fieldset2"> <legend><?=_("2. Erfasse deine Ausgaben")?></legend>
+	<fieldset id="fieldset2"> <legend><?=_($localeYaml['form_2_header'][$loc])?></legend>
 		<div class="is-row">
 			<div class="is-col">
-				<?=_("Währung:")?>
+				<?=_($localeYaml['form_2_currency'][$loc])?>
 			</div>
 			<div class="is-col">
 				<select onchange="renumberTableRows()" name='currency' id="currency"  >
@@ -149,13 +149,13 @@
 		<table id="tabtab" class="is-responsive is-bordered is-striped">
 			<thead>
 				<tr>
-					<th><?=_("Pos.")?></th>
-					<th><?=_("Datum")?></th>
-					<th><?=_("Beschreibung")?></th>
-					<th><?=_("Betrag")?></th>
-					<th><?=_("Währung")?></th>
-					<th><?=_("Belege")?></th>
-					<th><?=_("L&ouml;schen")?></th>
+					<th><?=_($localeYaml['form_2_table_1'][$loc])?></th>
+					<th><?=_($localeYaml['form_2_table_2'][$loc])?></th>
+					<th><?=_($localeYaml['form_2_table_3'][$loc])?></th>
+					<th><?=_($localeYaml['form_2_table_4'][$loc])?></th>
+					<th><?=_($localeYaml['form_2_table_5'][$loc])?></th>
+					<th><?=_($localeYaml['form_2_table_6'][$loc])?></th>
+					<th><?=_($localeYaml['form_2_table_7'][$loc])?></th>
 				</tr>
 			</thead>
 			<tbody id="tabbody">
@@ -163,15 +163,15 @@
 		</table>
 		<div class="is-col">
 			<button id="add_issue" type="button" onclick="addRow();" 
-			class="button is-green"><?=_("Ausgabe hinzuf&uuml;gen")?></button>
+			class="button is-green"><?=_($localeYaml['form_2_button'][$loc])?></button>
 		</div>
 
 	</fieldset>
 	<br>
-	<fieldset> <legend><?=_("3. Vorschuss und Sonstiges")?></legend>
+	<fieldset> <legend><?=_($localeYaml['form_3_header'][$loc])?></legend>
 		<div class="is-row">
 			<div class="is-col valign="center"">
-					<?=_("Ich habe bereits einen Vorschuss in folgender H&ouml;he erhalten:")?>
+					<?=_($localeYaml['form_3_subtext_1'][$loc])?>
 			</div>
 			<div class="is-col">
 				<input input name="advance" id="advance" type="text" placeholder="0,00 EUR"/>
@@ -180,7 +180,7 @@
 
 		<div class="is-row">
 			<div class="is-col valign="center"">
-				<?=_("Hiermit bestätige ich die Vollständig- und Richtigkeit meiner Angaben:")?>*
+				<?=_($localeYaml['form_3_subtext_2'][$loc])?>*
 			</div>
 			<div class="is-col">
 				<input id="agree" type="checkbox" />
@@ -190,12 +190,12 @@
 		<div class="is-row">
 			<div class="is-col">
 				<button type="button" onclick="downloadDocument(false);"
-				class="button is-orange"><?=_("Antrag herunterladen und später einreichen")?></button>
+				class="button is-orange"><?=_($localeYaml['form_3_button_1'][$loc])?></button>
 			</div>
 
 			<div class="is-col">
 				<button type="button" onclick="downloadDocument(true);"
-				class="button is-green"><?=_("Antrag elektronisch direkt an WMDE schicken")?></button>
+				class="button is-green"><?=_($localeYaml['form_3_button_2'][$loc])?></button>
 			</div>
 	
 		</div>
diff --git a/index.php b/index.php
index 5739bd5..4d6e36c 100644
--- a/index.php
+++ b/index.php
@@ -91,8 +91,8 @@
 
 				</div>
 			</div>
-       Impressum: <a href="https://www.wikimedia.de/impressum/">https://www.wikimedia.de/impressum</a><br>
-       Datenschutz: <a href="https://www.wikimedia.de/datenschutz/">https://www.wikimedia.de/datenschutz</a>
+        <?php echo _($localeYaml['impressum'][$loc])?>: <a href="https://www.wikimedia.de/impressum/">https://www.wikimedia.de/impressum</a><br>
+        <?php echo _($localeYaml['privacy'][$loc])?>: <a href="https://www.wikimedia.de/datenschutz/">https://www.wikimedia.de/datenschutz</a>
 		</div>
 	</div>    
 
diff --git a/locale.yaml b/locale.yaml
index fc5c5fc..f2e654a 100644
--- a/locale.yaml
+++ b/locale.yaml
@@ -145,10 +145,10 @@ form_3_subtext_2:
   de-DE:  'Hiermit bestätige ich die Vollständig- und Richtigkeit meiner Angaben:'
   en-US:  world
 form_3_button_1:
-  de-DE:  Antrag elektronisch direkt an WMDE schicken
+  de-DE:  Antrag herunterladen und später einreichen
   en-US:  world
 form_3_button_2:
-  de-DE:  Antrag herunterladen und später einreichen
+  de-DE:  Antrag elektronisch direkt an WMDE schicken
   en-US:  world
 impressum:
   de-DE:  Impressum