Merge remote-tracking branch 'origin/master'

contao-estatemanager · Apr 27, 2020 · 5bb36dd · 5bb36dd
2 parents d7f7f0f + 1a6edd0
commit 5bb36dd
Show file tree

Hide file tree

Showing 16 changed files with 350 additions and 35 deletions.
diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
@@ -130,6 +130,7 @@
     (
         'contactPerson'     => '\\ContaoEstateManager\\ExposeModuleContactPerson',
         'enquiryForm'       => '\\ContaoEstateManager\\ExposeModuleEnquiryForm',
+        'attachments'       => '\\ContaoEstateManager\\ExposeModuleAttachments',
         'share'             => '\\ContaoEstateManager\\ExposeModuleShare',
         'print'             => '\\ContaoEstateManager\\ExposeModulePrint',
         'html'              => '\\ContaoEstateManager\\ExposeModuleHtml',

diff --git a/src/Resources/contao/dca/tl_expose_module.php b/src/Resources/contao/dca/tl_expose_module.php
@@ -92,7 +92,7 @@
     // Palettes
     'palettes' => array
     (
-        '__selector__'                => array('type', 'protected', 'addHeadings'),
+        '__selector__'                => array('type', 'protected', 'addHeadings', 'attachmentType'),
         'default'                     => '{title_legend},name,headline,type',
         'title'                       => '{title_legend},name,headline,type;{settings_legend},fontSize;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',
         'address'                     => '{title_legend},name,headline,type;{settings_legend},forceFullAddress;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',
@@ -110,14 +110,16 @@
         'enquiryForm'                 => '{title_legend},name,headline,type;{settings_legend},form,hideOnReferences;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',
         'share'                       => '{title_legend},name,headline,type;{settings_legend},share;{template_legend:hide},customTpl,shareEmailTemplate;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',
         'print'                       => '{title_legend},name,headline,type;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID',
-        'html'                        => '{title_legend},name,headline,type;{settings_legend},html;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests'
+        'html'                        => '{title_legend},name,headline,type;{settings_legend},html;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests',
+        'attachments'                 => '{title_legend},name,headline,type;{settings_legend},attachmentType;{template_legend:hide},customTpl;{protected_legend:hide},protected;{expert_legend:hide},guests'
     ),
 
     // Subpalettes
     'subpalettes' => array
     (
         'protected'                   => 'groups',
         'addHeadings'                 => 'fontSize',
+        'attachmentType_documents'    => 'allowedFileExtensions,forceDownload'
     ),
 
     // Fields
@@ -485,7 +487,32 @@
             'options_callback'        => array('tl_expose_module', 'getRealEstateTemplates'),
             'eval'                    => array('tl_class'=>'w50'),
             'sql'                     => "varchar(64) NOT NULL default ''"
-        )
+        ),
+        'attachmentType' => array
+        (
+            'label'                   => &$GLOBALS['TL_LANG']['tl_expose_module']['attachmentType'],
+            'exclude'                 => true,
+            'inputType'               => 'select',
+            'options'                 => array('documents', 'links'),
+            'eval'                    => array('tl_class'=>'w50', 'mandatory'=>true, 'includeBlankOption'=>true, 'submitOnChange'=>true),
+            'sql'                     => "varchar(64) NOT NULL default ''"
+        ),
+        'allowedFileExtensions' => array
+        (
+            'label'                   => &$GLOBALS['TL_LANG']['tl_expose_module']['allowedFileExtensions'],
+            'exclude'                 => true,
+            'inputType'               => 'text',
+            'eval'                    => array('tl_class'=>'w50'),
+            'sql'                     => "varchar(255) NOT NULL default 'pdf'"
+        ),
+        'forceDownload' => array
+        (
+            'label'                   => &$GLOBALS['TL_LANG']['tl_expose_module']['forceDownload'],
+            'exclude'                 => true,
+            'inputType'               => 'checkbox',
+            'eval'                    => array('tl_class'=>'w50 m12'),
+            'sql'                     => "char(1) NOT NULL default ''"
+        ),
     )
 );
 

diff --git a/src/Resources/contao/languages/de/modules.xlf b/src/Resources/contao/languages/de/modules.xlf
@@ -243,6 +243,14 @@
         <source>Enables the output of a form produced by the form generator.</source>
         <target>Ermöglicht die Ausgabe eines vom Formulargenerator erzeugten Formulars.</target>
       </trans-unit>
+      <trans-unit id="FMD.attachments.0">
+        <source>Attachments</source>
+        <target>Anhänge</target>
+      </trans-unit>
+      <trans-unit id="FMD.attachments.1">
+        <source>Outputs attachments of the real estate.</source>
+        <target>Liefert die Anhänge einer Immobilie aus.</target>
+      </trans-unit>
 
       <trans-unit id="FMD.titleImageSRC.0">
         <source>Cover picture</source>
@@ -307,8 +315,8 @@
       </trans-unit>
 
       <trans-unit id="FMD.objektbeschreibung.0">
-        <source>Property description</source>
-        <target>Immobilienbeschreibung</target>
+        <source>Description</source>
+        <target>Beschreibung</target>
       </trans-unit>
       <trans-unit id="FMD.ausstattBeschr.0">
         <source>Furnishings</source>
@@ -327,8 +335,8 @@
         <target>Kurzbeschreibung</target>
       </trans-unit>
       <trans-unit id="FMD.objektText.0">
-        <source>Property text</source>
-        <target>Immobilientext</target>
+        <source>Text</source>
+        <target>Text</target>
       </trans-unit>
 
       <trans-unit id="FMD.kontaktname.0">

diff --git a/src/Resources/contao/languages/de/tl_expose_module.xlf b/src/Resources/contao/languages/de/tl_expose_module.xlf
@@ -156,8 +156,8 @@
         <target>Verwenden des im Anbieter hinterlegten Weiterleitungsmodus. Bei verwenden dieser Funktion, werden die Telefonnummer (Zentrale) sowie die E-Mail (Zentrale) ggf. überschrieben.</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.galleryModules.0">
-        <source>Gallery Modules</source>
-        <target>Galerie-Module</target>
+        <source>Gallery Categories</source>
+        <target>Galerie-Kategorien</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.galleryModules.1">
         <source>Select and sort the images that should be output by this module.</source>
@@ -196,20 +196,20 @@
         <target>Hier können Sie die Gesamtzahl der Elemente begrenzen. Geben Sie 0 ein, um alle anzuzeigen.</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.detailBlocks.0">
-        <source>Detail blocks</source>
-        <target>Detail-Blöcke</target>
+        <source>Detail Categories</source>
+        <target>Detail-Kategorien</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.detailBlocks.1">
         <source>Define the order and output of the details. Keep in mind that the sequence of the individual fields can be defined using the object types.</source>
         <target>Definieren Sie die Reihenfolge und Ausgabe der Details. Beachten Sie, dass die Reihenfolge der einzelnen Felder über die Objekttypen definiert werden können.</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.summariseDetailBlocks.0">
-        <source>Summarize detail blocks</source>
-        <target>Detail-Blöcke zusammenfassen</target>
+        <source>Summarize detail categories</source>
+        <target>Detail-Kategorien zusammenfassen</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.summariseDetailBlocks.1">
-        <source>Instead of individual blocks, the details are summarized in a list.</source>
-        <target>Statt einzelne Blöcke werden die Details in einer Liste zusammengefasst ausgegeben.</target>
+        <source>Instead of individual categories, the details are summarized in a list.</source>
+        <target>Statt einzelner Kategorien werden die Details in einer Liste zusammengefasst ausgegeben.</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.includeAddress.0">
         <source>Add real estate address</source>
@@ -288,8 +288,8 @@
         <target>Wählen Sie die welche Teilen-Optionen zur Verfügung stehen.</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.shareEmailTemplate.0">
-        <source>'Send via e-mail' template</source>
-        <target>Via E-Mail versenden'-Template</target>
+        <source>Send via e-mail template</source>
+        <target>Via E-Mail versenden Template</target>
       </trans-unit>
       <trans-unit id="tl_expose_module.html.0">
         <source>HTML code</source>
@@ -355,6 +355,30 @@
         <source>Open the full size image in a lightbox or open it in a new browser window.</source>
         <target>Großansicht des Bildes in einer Lightbox bzw. den Link in einem neuem Browserfenster öffnen.</target>
       </trans-unit>
+      <trans-unit id="tl_expose_module.attachmentType.0">
+        <source>Attachment type</source>
+        <target>Anhang-Typ</target>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.attachmentType.1">
+        <source>Please select an attachment type.</source>
+        <target>Bitte wähle den Typen des Anhangs</target>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.allowedFileExtensions.0">
+        <source>Allowed file extensions</source>
+        <target>Erlaubte Dateiendungen</target>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.allowedFileExtensions.1">
+        <source>Please provide a comma-separated list of file extensions which should not be output. (e.g pdf,doc)</source>
+        <target>Bitte geben Sie eine durch Komma getrennte Liste von Dateierweiterungen an, die nicht ausgegeben werden sollen (z.B. pdf,doc).</target>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.forceDownload.0">
+        <source>Force download</source>
+        <target>Download erzwingen</target>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.forceDownload.1">
+        <source>Forces the download of the file</source>
+        <target>Erzwingt den Download und öffnet einen Download-Dialog.</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/Resources/contao/languages/de/tl_filter_item.xlf b/src/Resources/contao/languages/de/tl_filter_item.xlf
@@ -143,7 +143,7 @@
         <target>Ungenaue Suche erlauben</target>
       </trans-unit>
       <trans-unit id="tl_filter_item.impreciseMode.1">
-        <source>Eine ungenaue Suche erlauben.</source>
+        <source>Allow an inaccurate search.</source>
         <target>Eine ungenaue Suche erlauben.</target>
       </trans-unit>
       <trans-unit id="tl_filter_item.mergeOptions.0">

diff --git a/src/Resources/contao/languages/de/tl_module.xlf b/src/Resources/contao/languages/de/tl_module.xlf
@@ -21,6 +21,10 @@
         <source>Real estate Item Extensions</source>
         <target>Immobilien Erweiterung</target>
       </trans-unit>
+      <trans-unit id="tl_module.provider_legend">
+        <source>Provider</source>
+        <target>Anbieter</target>
+      </trans-unit>
       <trans-unit id="tl_module.sorting_legend">
         <source>Sorting</source>
         <target>Sortierung</target>
@@ -49,6 +53,22 @@
         <source>Please choose the sort order.</source>
         <target>Bitte wählen Sie die Sortierreihenfolge aus.</target>
       </trans-unit>
+      <trans-unit id="tl_module.filterByProvider.0">
+        <source>Filter by provider</source>
+        <target>Nach Anbieter filtern</target>
+      </trans-unit>
+      <trans-unit id="tl_module.filterByProvider.1">
+        <source>Filter records by a specific provider.</source>
+        <target>Datensätze anhand eines spezifischen Anbieters filtern</target>
+      </trans-unit>
+      <trans-unit id="tl_module.provider.0">
+        <source>Provider</source>
+        <target>Anbieter</target>
+      </trans-unit>
+      <trans-unit id="tl_module.provider.1">
+        <source>Records will be filtered by the selected provider.</source>
+        <target>Datensätze werden anhand eines ausgewählten Anbieters gefiltert</target>
+      </trans-unit>
       <trans-unit id="tl_module.addSorting.0">
         <source>Add sorting</source>
         <target>Sortierung hinzufügen</target>

diff --git a/src/Resources/contao/languages/de/tl_page.xlf b/src/Resources/contao/languages/de/tl_page.xlf
@@ -7,7 +7,7 @@
       </trans-unit>
       <trans-unit id="tl_page.location.1">
         <source>Here you can assign a location to the page which later can be accessed via modules or insert-tags.</source>
-        <target>Hier können Sie der Seite einen Standort zuweisen, auf den später über Module oder Insert-Tags zugegriffen werden kann.</target>
+        <target>Hier können Sie der Seite einen Standort zuweisen, auf den später über Module oder Insert-Tags zugegriffen werden kann</target>
       </trans-unit>
       <trans-unit id="tl_page.setMarketingType.0">
         <source>Specify marketing type</source>

diff --git a/src/Resources/contao/languages/de/tl_real_estate_type.xlf b/src/Resources/contao/languages/de/tl_real_estate_type.xlf
@@ -190,12 +190,12 @@
         <target>Bitte geben Sie die Sortieroptionen an.</target>
       </trans-unit>
       <trans-unit id="tl_real_estate_type.mainDetails.0">
-        <source>Primary fields</source>
-        <target>Primäre Felder</target>
+        <source>Primary details</source>
+        <target>Primäre Details</target>
       </trans-unit>
       <trans-unit id="tl_real_estate_type.mainDetails.1">
-        <source>Please enter the primary fields.</source>
-        <target>Bitte geben Sie die primären Felder an.</target>
+        <source>Please enter the primary details.</source>
+        <target>Bitte geben Sie die primären Details an.</target>
       </trans-unit>
       <trans-unit id="tl_real_estate_type.mainAttributes.0">
         <source>Primary attributes</source>

diff --git a/src/Resources/contao/languages/de/tl_real_estate_value.xlf b/src/Resources/contao/languages/de/tl_real_estate_value.xlf
@@ -389,7 +389,7 @@
       </trans-unit>
       <trans-unit id="tl_real_estate_value.bueroTyp_loft_atelier">
         <source>Loft / Atelier (office)</source>
-        <target>Lost / Atiler (Büro)</target>
+        <target>Loft / Atelier (Büro)</target>
       </trans-unit>
       <trans-unit id="tl_real_estate_value.bueroTyp_praxis">
         <source>Facility (office)</source>

diff --git a/src/Resources/contao/languages/en/modules.xlf b/src/Resources/contao/languages/en/modules.xlf
@@ -184,6 +184,12 @@
       <trans-unit id="FMD.enquiryForm.1">
         <source>Enables the output of a form produced by the form generator.</source>
       </trans-unit>
+      <trans-unit id="FMD.attachments.0">
+        <source>Attachments</source>
+      </trans-unit>
+      <trans-unit id="FMD.attachments.1">
+        <source>Outputs attachments of the real estate.</source>
+      </trans-unit>
 
       <trans-unit id="FMD.titleImageSRC.0">
         <source>Cover picture</source>
@@ -233,7 +239,7 @@
       </trans-unit>
 
       <trans-unit id="FMD.objektbeschreibung.0">
-        <source>Property description</source>
+        <source>Description</source>
       </trans-unit>
       <trans-unit id="FMD.ausstattBeschr.0">
         <source>Furnishings</source>
@@ -248,7 +254,7 @@
         <source>Short description</source>
       </trans-unit>
       <trans-unit id="FMD.objektText.0">
-        <source>Property text</source>
+        <source>Text</source>
       </trans-unit>
 
       <trans-unit id="FMD.kontaktname.0">

diff --git a/src/Resources/contao/languages/en/tl_expose_module.xlf b/src/Resources/contao/languages/en/tl_expose_module.xlf
@@ -119,7 +119,7 @@
         <source>Use the forwarding mode stored in the provider. If you use this function, the telephone number (Headquarters) and e-mail (Headquarters) are overwritten if necessary.</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.galleryModules.0">
-        <source>Gallery Modules</source>
+        <source>Gallery Categories</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.galleryModules.1">
         <source>Select and sort the images that should be output by this module.</source>
@@ -149,16 +149,16 @@
         <source>Here you can limit the number of items. Set to 0 to show all.</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.detailBlocks.0">
-        <source>Detail blocks</source>
+        <source>Detail Categories</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.detailBlocks.1">
         <source>Define the order and output of the details. Keep in mind that the sequence of the individual fields can be defined using the object types.</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.summariseDetailBlocks.0">
-        <source>Summarize detail blocks</source>
+        <source>Summarize detail categories</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.summariseDetailBlocks.1">
-        <source>Instead of individual blocks, the details are summarized in a list.</source>
+        <source>Instead of individual categories, the details are summarized in a list.</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.includeAddress.0">
         <source>Add real estate address</source>
@@ -218,7 +218,7 @@
         <source>Select which share-options should be available.</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.shareEmailTemplate.0">
-        <source>'Send via e-mail' template</source>
+        <source>Send via e-mail template</source>
       </trans-unit>
       <trans-unit id="tl_expose_module.html.0">
         <source>HTML code</source>
@@ -268,6 +268,24 @@
       <trans-unit id="tl_expose_module.fullsize.1">
         <source>Open the full size image in a lightbox or open it in a new browser window.</source>
       </trans-unit>
+      <trans-unit id="tl_expose_module.attachmentType.0">
+        <source>Attachment type</source>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.attachmentType.1">
+        <source>Please select an attachment type.</source>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.allowedFileExtensions.0">
+        <source>Allowed file extensions</source>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.allowedFileExtensions.1">
+        <source>Please provide a comma-separated list of file extensions which should not be output. (e.g pdf,doc)</source>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.forceDownload.0">
+        <source>Force download</source>
+      </trans-unit>
+      <trans-unit id="tl_expose_module.forceDownload.1">
+        <source>Forces the download of the file</source>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/src/Resources/contao/languages/en/tl_real_estate_type.xlf b/src/Resources/contao/languages/en/tl_real_estate_type.xlf
@@ -144,10 +144,10 @@
         <source>Please enter the sorting options.</source>
       </trans-unit>
       <trans-unit id="tl_real_estate_type.mainDetails.0">
-        <source>Primary fields</source>
+        <source>Primary details</source>
       </trans-unit>
       <trans-unit id="tl_real_estate_type.mainDetails.1">
-        <source>Please enter the primary fields.</source>
+        <source>Please enter the primary details.</source>
       </trans-unit>
       <trans-unit id="tl_real_estate_type.mainAttributes.0">
         <source>Primary attributes</source>

diff --git a/src/Resources/contao/languages/es/tl_real_estate_value.xlf b/src/Resources/contao/languages/es/tl_real_estate_value.xlf
@@ -48,7 +48,7 @@
       </trans-unit>
       <trans-unit id="tl_real_estate_value.nutzungsart_gewerbe">
         <source>Business</source>
-        <target>Commercial</target>
+        <target>Comercio</target>
       </trans-unit>
       <trans-unit id="tl_real_estate_value.nutzungsart_anlage">
         <source>Investment</source>