EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Björn Fromme
2019-10-01 13:25:58 +02:00
parent 37cbf12545 bbb4e7c6af
commit 1be5394f8c
4 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_events/Resources/Private/Language/de.locallang.xlf
+1 -4
View File
@@ -122,7 +122,7 @@
<target>Programmidee</target>
</trans-unit>
<trans-unit id="tx_epevents.label.example_offering">
<target><![CDATA[Beispiel-<br>angebote]]></target>
<target><![CDATA[Beispiel-<br>angebot]]></target>
</trans-unit>
<trans-unit id="tx_epevents.label.back_to_programme_overview">
<target>Zurück zur Programm-Übersicht</target>
@@ -241,9 +241,6 @@
<trans-unit id="tx_epevents.label.search_invalid_query">
<target>Bitte geben Sie einen Suchbegriff mit mindestens drei Buchstaben Länge ein.</target>
</trans-unit>
<trans-unit id="tx_epevents.label.example_offering">
<target>Beispielangebot</target>
</trans-unit>
<trans-unit id="tx_epevents.label.learn_more">
<target>Mehr erfahren</target>
</trans-unit>
public/typo3conf/ext/ep_events/Resources/Private/Language/locallang.xlf
+1 -4
View File
@@ -122,7 +122,7 @@
<source>Program ideas</source>
</trans-unit>
<trans-unit id="tx_epevents.label.example_offering">
<source><![CDATA[Example<br>offers]]></source>
<source><![CDATA[Example<br>offer]]></source>
</trans-unit>
<trans-unit id="tx_epevents.label.back_to_programme_overview">
<source>Return to program overview</source>
@@ -241,9 +241,6 @@
<trans-unit id="tx_epevents.label.search_invalid_query">
<source>Please enter a search term of at least three letters.</source>
</trans-unit>
<trans-unit id="tx_epevents.label.example_offering">
<source>Example offer</source>
</trans-unit>
<trans-unit id="tx_epevents.label.learn_more">
<source>More information</source>
</trans-unit>
public/typo3conf/ext/ep_events/Resources/Private/Partials/HerounitActivity.html
+1 -1
View File
@@ -31,7 +31,7 @@
<f:if condition="{activity.keywords}">
<div class="herounit__text">
<ul>
<f:for each="{activity.keywords -> v:iterator.explode(glue: 'constant:LF')}" as="keyword">
<f:for each="{activity.keywords -> v:iterator.explode(glue: '{v:const(name: \'PHP_EOL\')}')}" as="keyword">
<li>{keyword}</li>
</f:for>
</ul>
public/typo3conf/ext/ep_products/ext_tables.sql
+1 -2
View File
@@ -1029,8 +1029,7 @@ CREATE TABLE tx_epproducts_domain_model_badge
title varchar(255) DEFAULT '' NOT NULL,
subtitle varchar(255) DEFAULT '' NOT NULL,
link int(11) unsigned NOT NULL default '0',
page int(11) unsigned DEFAULT '0',
link varchar(255) DEFAULT '' NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL,