8000 Merge branch '7.0' into 7.1 · symfony/symfony@46b9158 · GitHub
[go: up one dir, main page]

Skip to content

Commit 46b9158

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: adapt GHA config for the Bitnami Docker image for Kafka [Security] reviewed Greek translation of key 20 [Security] Fix Croatian translation
2 parents 751913c + be9a410 commit 46b9158

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/workflows/integration-tests.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,12 @@ jobs:
105105
ports:
106106
- 9092:9092
107107
env:
108-
KAFKA_AUTO_CREATE_TOPICS_ENABLE: false
109-
KAFKA_CREATE_TOPICS: 'test-topic:1:1:compact'
110-
KAFKA_ADVERTISED_HOST_NAME: 127.0.0.1
111-
KAFKA_ZOOKEEPER_CONNECT: 'zookeeper:2181'
112-
KAFKA_ADVERTISED_PORT: 9092
108+
KAFKA_CFG_AUTO_CREATE_TOPICS_ENABLE: false
109+
ALLOW_PLAINTEXT_LISTENER: 'yes'
110+
KAFKA_CFG_ADVERTISED_LISTENERS: 'PLAINTEXT://127.0.0.1:9092'
111+
KAFKA_CFG_LISTENERS: 'PLAINTEXT://:9092'
112+
KAFKA_CFG_ZOOKEEPER_CONNECT: 'zookeeper:2181'
113+
options: --name=kafka
113114
frankenphp:
114115
image: dunglas/frankenphp:1.1.0
115116
ports:
@@ -127,6 +128,10 @@ jobs:
127128
with:
128129
fetch-depth: 0
129130

131+
- name: Init Kafka topics
132+
run: |
133+
docker exec kafka /opt/bitnami/kafka/bin/kafka-topics.sh --create --topic test-topic --bootstrap-server kafka:9092
134+
130135
- name: Install system dependencies
131136
run: |
132137
echo "::group::apt-get update"

src/Symfony/Component/Security/Core/Resources/translations/security.el.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</trans-unit>
7777
<trans-unit id="20">
7878
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79-
<target state="needs-review-translation">Πολλές αποτυχημένες προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %minutes% λεπτά.</target>
79+
<target>Πολλές αποτυχημένες προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %minutes% λεπτά.</target>
8080
</trans-unit>
8181
</body>
8282
</file>

src/Symfony/Component/Security/Core/Resources/translations/security.hr.xlf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</trans-unit>
7777
<trans-unit id="20">
7878
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79-
<target state="needs-review-translation">Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minutu.|Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minuta.</target>
79+
<target>Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minutu.|Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minute.|Previše neuspjelih pokušaja prijave, pokušajte ponovo za %minutes% minuta.</target>
8080
</trans-unit>
8181
</body>
8282
</file>

0 commit comments

Comments
 (0)
0