Merge pull request #1872 from Catrobat/release/v3.12.2

Release v3.12.2 into master
Catrobat · Jul 29, 2021 · ed57214 · ed57214
2 parents b85263e + 491558d
commit ed57214
Show file tree

Hide file tree

Showing 25 changed files with 22,080 additions and 4,175 deletions.
diff --git a/.env b/.env
@@ -14,7 +14,7 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
 # Define the App Environment
-APP_VERSION='3.12.1'
+APP_VERSION='3.12.2'
 APP_ENV=dev
 APP_DEBUG=0
 APP_NAME="PocketCode Share"

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,7 +14,7 @@ module.exports = function (grunt) {
   // enable plugins
   grunt.loadNpmTasks('grunt-contrib-copy')
   grunt.loadNpmTasks('grunt-contrib-concat')
-  grunt.loadNpmTasks('grunt-contrib-uglify-es')
+  grunt.loadNpmTasks('grunt-contrib-uglify')
   grunt.loadNpmTasks('grunt-contrib-sass')
   grunt.loadNpmTasks('grunt-contrib-watch')
   grunt.loadNpmTasks('grunt-purgecss');

diff --git a/composer.lock b/composer.lock
diff --git a/config/packages/sonata_admin.yaml b/config/packages/sonata_admin.yaml
@@ -164,6 +164,8 @@ sonata_admin:
                 items:
                     - catrowebadmin.block.statistics.programs
                     - catrowebadmin.block.statistics.clicks
+                    - catrowebadmin.block.statistics.project_machine_translation
+                    - catrowebadmin.block.statistics.comment_machine_translation
 
     security:
 

diff --git a/config/services.yaml b/config/services.yaml
@@ -908,3 +908,23 @@ services:
     class: App\Translation\MachineTranslationListener
     tags:
       - { name: kernel.event_listener, event: kernel.terminate, method: onTerminateEvent }
+
+  catrowebadmin.block.statistics.project_machine_translation:
+    class: App\Admin\Translation\ProjectMachineTranslationAdmin
+    tags:
+      - { name: sonata.admin, manager_type: orm, label: "Project Machine Translation" }
+    arguments:
+      - ~
+      - App\Entity\Translation\ProjectMachineTranslation
+      - App\Admin\Translation\Controller\ProjectMachineTranslationAdminController
+    public: true
+
+  catrowebadmin.block.statistics.comment_machine_translation:
+    class: App\Admin\Translation\CommentMachineTranslationAdmin
+    tags:
+      - { name: sonata.admin, manager_type: orm, label: "Comment Machine Translation" }
+    arguments:
+      - ~
+      - App\Entity\Translation\CommentMachineTranslation
+      - \App\Admin\Translation\Controller\CommentMachineTranslationAdminController
+    public: true