Merge 3.x into master

sonata-project · Aug 9, 2021 · b82f62f · b82f62f
2 parents 885c498 + 60234df
commit b82f62f
Show file tree

Hide file tree

Showing 14 changed files with 476 additions and 461 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -11,13 +11,13 @@ charset = utf-8
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.{yaml,yml,twig,php}]
+[*.{xml,yaml,yml,twig,php}]
 indent_size = 4
 
 [.yamllint]
 indent_size = 4
 
-[*.{js,json,scss,css}]
+[*.{xliff,js,json,scss,css}]
 indent_size = 2
 
 [composer.json]

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -72,5 +72,8 @@ jobs:
             - name: Install required dependencies
               run: sudo apt-get update && sudo apt-get install libxml2-utils
 
-            - name: Lint files
+            - name: Lint xml files
               run: make lint-xml
+
+            - name: Lint xliff files
+              run: make lint-xliff
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ all:
 	@echo "Please choose a task."
 .PHONY: all
 
-lint: lint-composer lint-yaml lint-xml lint-php
+lint: lint-composer lint-yaml lint-xml lint-xliff lint-php
 .PHONY: lint
 
 lint-composer:
@@ -19,7 +19,7 @@ lint-yaml:
 .PHONY: lint-yaml
 
 lint-xml:
-	find . \( -name '*.xml' -or -name '*.xliff' \) \
+	find . -name '*.xml' \
 		-not -path './vendor/*' \
 		-not -path './src/Resources/public/vendor/*' \
 		| while read xmlFile; \
@@ -30,6 +30,18 @@ lint-xml:
 
 .PHONY: lint-xml
 
+lint-xliff:
+	find . -name '*.xliff' \
+		-not -path './vendor/*' \
+		-not -path './src/Resources/public/vendor/*' \
+		| while read xmlFile; \
+	do \
+		XMLLINT_INDENT='  ' xmllint --encode UTF-8 --format "$$xmlFile"|diff - "$$xmlFile"; \
+		if [ $$? -ne 0 ] ;then exit 1; fi; \
+	done
+
+.PHONY: lint-xliff
+
 lint-php:
 	php-cs-fixer fix --ansi --verbose --diff --dry-run
 .PHONY: lint-php

diff --git a/src/Resources/translations/SonataTimelineBundle.bg.xliff b/src/Resources/translations/SonataTimelineBundle.bg.xliff
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>actions.sonata.admin.create</source>
-                <target>%subject% създаде %target%</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>actions.sonata.admin.update</source>
-                <target>%subject% редактира %target%</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>actions.sonata.admin.delete</source>
-                <target>%subject% изтри %target%</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>actions.icon.sonata.admin.create</source>
-                <target>fa fa-plus-circle bg-green</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>actions.icon.sonata.admin.update</source>
-                <target>fa fa-save bg-blue</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>actions.icon.sonata.admin.delete</source>
-                <target>fa fa-minus-circle bg-red</target>
-            </trans-unit>
-        </body>
-    </file>
+  <file source-language="en" datatype="plaintext" original="file.ext">
+    <body>
+      <trans-unit id="1">
+        <source>actions.sonata.admin.create</source>
+        <target>%subject% създаде %target%</target>
+      </trans-unit>
+      <trans-unit id="2">
+        <source>actions.sonata.admin.update</source>
+        <target>%subject% редактира %target%</target>
+      </trans-unit>
+      <trans-unit id="3">
+        <source>actions.sonata.admin.delete</source>
+        <target>%subject% изтри %target%</target>
+      </trans-unit>
+      <trans-unit id="4">
+        <source>actions.icon.sonata.admin.create</source>
+        <target>fa fa-plus-circle bg-green</target>
+      </trans-unit>
+      <trans-unit id="5">
+        <source>actions.icon.sonata.admin.update</source>
+        <target>fa fa-save bg-blue</target>
+      </trans-unit>
+      <trans-unit id="6">
+        <source>actions.icon.sonata.admin.delete</source>
+        <target>fa fa-minus-circle bg-red</target>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
diff --git a/src/Resources/translations/SonataTimelineBundle.cs.xliff b/src/Resources/translations/SonataTimelineBundle.cs.xliff
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="en" target-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>actions.sonata.admin.create</source>
-                <target>%subject% vytvořil %target%</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>actions.sonata.admin.update</source>
-                <target>%subject% upravil %target%</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>actions.sonata.admin.delete</source>
-                <target>%subject% vymazal %target%</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>actions.icon.sonata.admin.create</source>
-                <target>fa fa-plus-circle bg-green</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>actions.icon.sonata.admin.update</source>
-                <target>fa fa-save bg-blue</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>actions.icon.sonata.admin.delete</source>
-                <target>fa fa-minus-circle bg-red</target>
-            </trans-unit>
-        </body>
-    </file>
+  <file source-language="en" datatype="plaintext" original="file.ext">
+    <body>
+      <trans-unit id="1">
+        <source>actions.sonata.admin.create</source>
+        <target>%subject% vytvořil %target%</target>
+      </trans-unit>
+      <trans-unit id="2">
+        <source>actions.sonata.admin.update</source>
+        <target>%subject% upravil %target%</target>
+      </trans-unit>
+      <trans-unit id="3">
+        <source>actions.sonata.admin.delete</source>
+        <target>%subject% vymazal %target%</target>
+      </trans-unit>
+      <trans-unit id="4">
+        <source>actions.icon.sonata.admin.create</source>
+        <target>fa fa-plus-circle bg-green</target>
+      </trans-unit>
+      <trans-unit id="5">
+        <source>actions.icon.sonata.admin.update</source>
+        <target>fa fa-save bg-blue</target>
+      </trans-unit>
+      <trans-unit id="6">
+        <source>actions.icon.sonata.admin.delete</source>
+        <target>fa fa-minus-circle bg-red</target>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>
diff --git a/src/Resources/translations/SonataTimelineBundle.de.xliff b/src/Resources/translations/SonataTimelineBundle.de.xliff
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
-    <file source-language="de" target-language="de" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="1">
-                <source>actions.sonata.admin.create</source>
-                <target>%subject% hat %target% erstellt</target>
-            </trans-unit>
-            <trans-unit id="2">
-                <source>actions.sonata.admin.update</source>
-                <target>%subject% hat %target% aktualisiert</target>
-            </trans-unit>
-            <trans-unit id="3">
-                <source>actions.sonata.admin.delete</source>
-                <target>%subject% hat %target% gelöscht</target>
-            </trans-unit>
-            <trans-unit id="4">
-                <source>actions.icon.sonata.admin.create</source>
-                <target>fa fa-plus-circle bg-green</target>
-            </trans-unit>
-            <trans-unit id="5">
-                <source>actions.icon.sonata.admin.update</source>
-                <target>fa fa-save bg-blue</target>
-            </trans-unit>
-            <trans-unit id="6">
-                <source>actions.icon.sonata.admin.delete</source>
-                <target>fa fa-minus-circle bg-red</target>
-            </trans-unit>
-            <trans-unit id="7">
-                <source>no_action</source>
-                <target>Noch keine Aktion.</target>
-            </trans-unit>
-            <trans-unit id="8">
-                <source>element_deleted</source>
-                <target>Element wurde gelöscht</target>
-            </trans-unit>
-            <trans-unit id="9">
-                <source>element_reference_deleted</source>
-                <target>Referenz '%reference%' wurde gelöscht</target>
-            </trans-unit>
-            <trans-unit id="10">
-                <source>form.label_title</source>
-                <target>Titel</target>
-            </trans-unit>
-            <trans-unit id="11">
-                <source>form.label_max_per_page</source>
-                <target>Einträge pro Seite</target>
-            </trans-unit>
-            <trans-unit id="form.label_translation_domain">
-                <source>form.label_translation_domain</source>
-                <target>Übersetzungsdatei</target>
-            </trans-unit>
-            <trans-unit id="form.label_icon">
-                <source>form.label_icon</source>
-                <target>Icon</target>
-            </trans-unit>
-            <trans-unit id="form.label_class">
-                <source>form.label_class</source>
-                <target>CSS Klasse</target>
-            </trans-unit>
-        </body>
-    </file>
+  <file source-language="en" target-language="de" datatype="plaintext" original="file.ext">
+    <body>
+      <trans-unit id="1">
+        <source>actions.sonata.admin.create</source>
+        <target>%subject% hat %target% erstellt</target>
+      </trans-unit>
+      <trans-unit id="2">
+        <source>actions.sonata.admin.update</source>
+        <target>%subject% hat %target% aktualisiert</target>
+      </trans-unit>
+      <trans-unit id="3">
+        <source>actions.sonata.admin.delete</source>
+        <target>%subject% hat %target% gelöscht</target>
+      </trans-unit>
+      <trans-unit id="4">
+        <source>actions.icon.sonata.admin.create</source>
+        <target>fa fa-plus-circle bg-green</target>
+      </trans-unit>
+      <trans-unit id="5">
+        <source>actions.icon.sonata.admin.update</source>
+        <target>fa fa-save bg-blue</target>
+      </trans-unit>
+      <trans-unit id="6">
+        <source>actions.icon.sonata.admin.delete</source>
+        <target>fa fa-minus-circle bg-red</target>
+      </trans-unit>
+      <trans-unit id="7">
+        <source>no_action</source>
+        <target>Noch keine Aktion.</target>
+      </trans-unit>
+      <trans-unit id="8">
+        <source>element_deleted</source>
+        <target>Element wurde gelöscht</target>
+      </trans-unit>
+      <trans-unit id="9">
+        <source>element_reference_deleted</source>
+        <target>Referenz '%reference%' wurde gelöscht</target>
+      </trans-unit>
+      <trans-unit id="10">
+        <source>form.label_title</source>
+        <target>Titel</target>
+      </trans-unit>
+      <trans-unit id="11">
+        <source>form.label_max_per_page</source>
+        <target>Einträge pro Seite</target>
+      </trans-unit>
+      <trans-unit id="form.label_translation_domain">
+        <source>form.label_translation_domain</source>
+        <target>Übersetzungsdatei</target>
+      </trans-unit>
+      <trans-unit id="form.label_icon">
+        <source>form.label_icon</source>
+        <target>Icon</target>
+      </trans-unit>
+      <trans-unit id="form.label_class">
+        <source>form.label_class</source>
+        <target>CSS Klasse</target>
+      </trans-unit>
+    </body>
+  </file>
 </xliff>