diff --git a/classes/CsvxmlAvailableFields.php b/classes/CsvxmlAvailableFields.php index ee6196a..18eae25 100644 --- a/classes/CsvxmlAvailableFields.php +++ b/classes/CsvxmlAvailableFields.php @@ -526,6 +526,32 @@ final class CsvxmlAvailableFields { "" ), ], + $tlLoader->tl("object_addendum", "object_add", "reception_notes") => [ + "reception_notes" => new FieldEntry( + false, + [], + ['reception_notes_md', 'reception_notes_extern'], + '', # 'If reception_notes is made available for an object, reception_notes_md> and reception_notes_extern have to have values too', + $tlLoader->tl("object_addendum", "object_add", "reception_notes"), + "", + ), + "reception_notes_md" => new FieldEntry( + false, + ["y", "n"], + ['reception_notes_md', 'reception_notes_extern'], + 'Shall a given note on reception be displayed at museum-digital? If note on receptions is available for an object, note on receptions_md> and note on receptions_extern have to have values too', + $tlLoader->tl("object_addendum", "object_add", "reception_notes") . ' (visibility)', + "" + ), + "reception_notes_extern" => new FieldEntry( + false, + ["y", "n"], + ['reception_notes_md', 'reception_notes_extern'], + 'Shall later exports from museum-digital inlude note on receptions? If note on receptions is available for an object, note on receptions_md> and note on receptions_extern have to have values too', + $tlLoader->tl("object_addendum", "object_add", "reception_notes") . ' (visibility)', + "" + ), + ], $tlLoader->tl("basis", "basis", 'administration') => [ "inclusion_when" => new FieldEntry( false, diff --git a/classes/MDAllowedValueSets b/classes/MDAllowedValueSets index b0f5756..3f3be7d 160000 --- a/classes/MDAllowedValueSets +++ b/classes/MDAllowedValueSets @@ -1 +1 @@ -Subproject commit b0f5756d33e047f51d40f5c5ffa8330eabbf2418 +Subproject commit 3f3be7dae21e5d5f4167d68cfcdba1f3cd85dc81 diff --git a/classes/MDErrorReporter b/classes/MDErrorReporter index 591a7ba..80fd164 160000 --- a/classes/MDErrorReporter +++ b/classes/MDErrorReporter @@ -1 +1 @@ -Subproject commit 591a7bacc59b852868e6c3b4e4e62a6a7ac14851 +Subproject commit 80fd16443968efebd373f1b0403f75bd48168064 diff --git a/l10n/musdb b/l10n/musdb index 62a0c78..a3497f4 160000 --- a/l10n/musdb +++ b/l10n/musdb @@ -1 +1 @@ -Subproject commit 62a0c78ccffa23e60e0737b051620c6c70cacaa8 +Subproject commit a3497f4b31b6ff2cd033d4b44ff93045e6b7c52b diff --git a/public/csv.php b/public/csv.php index 367a95d..80a878c 100644 --- a/public/csv.php +++ b/public/csv.php @@ -70,11 +70,14 @@ foreach ($availableFields as $headline => $fields) { } header('Content-Type: text/csv; charset=utf-8'); -if ($selectionActive === true) +if ($selectionActive === true) { header("Content-Disposition: attachment; filename=csvxml_museum-digital_template-{$lang}_selection.csv"); -else +} +else { header("Content-Disposition: attachment; filename=csvxml_museum-digital_template-{$lang}.csv"); +} for ($i = 2; $i <= 4; $i++) { - echo mb_convert_encoding('"' . implode("\";\"", ${"line$i"}) . '"' . PHP_EOL, 'utf-16', 'utf-8'); + echo '"' . implode("\";\"", ${"line$i"}) . '"' . PHP_EOL; + # echo mb_convert_encoding('"' . implode("\";\"", ${"line$i"}) . '"' . PHP_EOL, 'utf-16', 'utf-8'); }