diff --git a/config/settings.yml b/config/settings.yml index 69e757c72..2438ac8f2 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -279,8 +279,8 @@ user-defaults: max-favourites: 0 max-favourite-terms: 2 theme: Default - date-time-format: "%d %b %y %R" - date-format: "%d %b %Y" + date-time-format: "%d.%m.%Y %R" + date-format: "%d.%m.%y" time-format: "%R" download-files: false warning-days: 1209600 diff --git a/src/Utils/Print/RenewQualification.hs b/src/Utils/Print/RenewQualification.hs index b1a371e9e..556d52fdc 100644 --- a/src/Utils/Print/RenewQualification.hs +++ b/src/Utils/Print/RenewQualification.hs @@ -126,7 +126,6 @@ instance MDLetter LetterRenewQualification where [ toMeta "practical" True ] <> [ toMeta "lang" lang - , toMeta "shwow-lang" $ tshow lang , toMeta "login" lmsIdent , toMeta "pin" lmsPin , toMeta "examinee" qualHolderDN diff --git a/templates/letter/din5008with_pin_new.latex b/templates/letter/din5008with_pin_new.latex index 6848adae8..0d30e452c 100644 --- a/templates/letter/din5008with_pin_new.latex +++ b/templates/letter/din5008with_pin_new.latex @@ -44,12 +44,11 @@ $endif$ \usepackage{iftex} -%\usepackage[ngerman]{babel} $if(lang)$ \ifLuaTeX -\usepackage[bidi=basic]{babel} +\usepackage[bidi=basic,english,ngerman]{babel} \else -\usepackage[bidi=default]{babel} +\usepackage[bidi=default,english,ngerman]{babel} \fi \babelprovide[main,import]{$babel-lang$} $for(babel-otherlangs)$ diff --git a/templates/letter/fraport_renewal_new.md b/templates/letter/fraport_renewal_new.md index 6c852f946..92adcf007 100644 --- a/templates/letter/fraport_renewal_new.md +++ b/templates/letter/fraport_renewal_new.md @@ -60,14 +60,14 @@ $if(is-de)$ $if(reminder)$ dies ist die **letzte Erinnerung**: -$endif$ -um +$endif$ +um $if(supervisor)$ - die $qformal$ von \textbf{$examinee$} + die $qformal$ von **{$examinee$}** $else$ Ihre $qformal$ $endif$ -zu erhalten, benötigen wir bis zum **$date$** den Nachweis, +zu verlängern, benötigen wir bis zum **$date$** den Nachweis, dass die $if(practical)$ theoretische und praktische @@ -84,7 +84,8 @@ $if(supervisor)$ Ausschließlich Sie sind berechtigt, die Benutzerdaten an den Schulungsteilnehmer auszuhändigen. $endif$ -Für die Absolvierung der Schulungsmaßnahme werden 1--2 Stunden benötigt. Der Abschluss der Schulung wird automatisch an das System der Fahrerausbildung übermittelt. +Für die Absolvierung der Schulungsmaßnahme werden 1--2 Stunden benötigt. +Der Abschluss der Schulung wird automatisch an das System der Fahrerausbildung übermittelt. $if(practical)$ Nach erfolgreichem Abschluss der Online-Schulung @@ -110,61 +111,45 @@ $else$ $if(reminder)$ - this is a last **reminder**: as of $date$, + this is a last **reminder**: +$endif$ +in order to maintain $if(supervisor)$ - $examinee$ has + the $qformal$ of **$examinee$**, $else$ - you have + your $qformal$, $endif$ - not yet completed the below detailed e‑learning. - The qualification will expire automatically, - if the e‑learning is not concluded in time! -$else$ +we require by **$date$**, that the +$if(practical)$ + theorectical and paractical +$endif$ +airport-specific recurrent training at Fraport AG, +according to European Union Regulation No. 139/2014, +has been completed. + +The e-learning can be accessed with this link: +[$url-text$]($url$) + +The required username and password for this Fraport e-learning are provided below. +Note that sharing of this personal login data with third parties is prohibited. $if(supervisor)$ - the $qformal$ of $examinee$ -$else$ - your $qformal$ -$endif$ - is about to expire soon. -$endif$ -The validity will be extended -$if(validduration)$ - by $validduration$ months -$endif$ -by successfully participating in -an e‑learning. -$if(supervisor)$ - Supervisors are kindly requested to forward the login data - below confidentially to the examinee. -$else$ - Please use the login data from the protected area below. -$endif$ -Reserve 2.5h for the entire e-learning, including the exam. - -Examinee - - : $examinee$ - -Expiry - - : $expiry$ - -E-learning website - - : [$url-text$]($url$) - - -If the $qformal$ expires before completing this e-learning, -$if(supervisor)$ - the examinee has to participate in a basic training course again to regain - to regain the $qformal$. -$else$ - you have to participate in a basic training course again to regain - your $qformal$. +Only you are authorized to hand over the personal login data to the training participant. $endif$ +The completion of the e-learning will require abut 1--2 hours. +Results will be automatically transmitted to Fraport Driver Training. + +$if(practical)$ + After successful completion of the online training, + $if(supervisor)$ + $examinee$ must be scheduled by your company + $else$ + your company must schedule you + $endif$ + for the practical part of the training. + The 3--4 hour practical refresher includes radio exercises and + an examination-style test drive within the runway system. +$endif$ -Please contact the Fraport driving school team, if you need any assistance. -(Kontaktieren Sie uns bitte, wenn Sie zukünftige Briefe in deutscher Sprache bevorzugen.) $endif$