Release Prep - 3.3.7 (#1949)

* Env: final catch outputting a friendly error. xibosignage/xibo#3067 * 3.3.7 release prep (xibosignageltd/xibo-private#372): - Bump to 3.3.7 - swagger (minor fix) - default.pot (minor fix) - import latest translations
xibosignage · Jul 31, 2023 · 7fc7054 · 7fc7054
1 parent d199183
commit 7fc7054
Show file tree

Hide file tree

Showing 50 changed files with 35 additions and 34 deletions.
diff --git a/lib/Controller/Folder.php b/lib/Controller/Folder.php
@@ -442,12 +442,7 @@ public function move(Request $request, Response $response, $folderId)
         }
 
         if ($folder->parentId === $newParentFolder->getId() && $params->getCheckbox('merge') !== 1) {
-            throw new InvalidArgumentException(
-                __(
-                    'This Folder is already a sub-folder of the selected Folder,
-                     if you wish to move its content to the parent Folder, please check the merge checkbox.'
-                )
-            );
+            throw new InvalidArgumentException(__('This Folder is already a sub-folder of the selected Folder, if you wish to move its content to the parent Folder, please check the merge checkbox.'));//phpcs:ignore
         }
 
         // if we need to merge contents of the folder, dispatch an event that will move every object inside the folder

diff --git a/lib/Controller/Library.php b/lib/Controller/Library.php
@@ -1034,7 +1034,7 @@ public function delete(Request $request, Response $response, $id)
      *      name="playlistId",
      *      in="formData",
      *      description="A playlistId to add this uploaded media to",
-     *      type="int",
+     *      type="integer",
      *      required=false
      *   ),
      *  @SWG\Parameter(

diff --git a/lib/Helper/Environment.php b/lib/Helper/Environment.php
@@ -30,7 +30,7 @@
  */
 class Environment
 {
-    public static $WEBSITE_VERSION_NAME = '3.3.6';
+    public static $WEBSITE_VERSION_NAME = '3.3.7';
     public static $XMDS_VERSION = '6';
     public static $XLF_VERSION = 3;
     public static $VERSION_REQUIRED = '7.2.9';

diff --git a/lib/Middleware/Handlers.php b/lib/Middleware/Handlers.php
@@ -1,8 +1,8 @@
 <?php
-/**
- * Copyright (C) 2020 Xibo Signage Ltd
+/*
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -195,8 +195,13 @@ public static function webErrorHandler($container)
                         $template = 'error';
                     }
 
-                    return $twig->render($response, $template . '.twig', array_merge($viewParams, $exceptionData))
-                        ->withStatus($statusCode);
+                    try {
+                        return $twig->render($response, $template . '.twig', array_merge($viewParams, $exceptionData))
+                            ->withStatus($statusCode);
+                    } catch (\Exception $exception) {
+                        $response->getBody()->write('Fatal error');
+                        return $response->withStatus(500);
+                    }
                 }
             }
         };

diff --git a/locale/af.mo b/locale/af.mo
diff --git a/locale/ar.mo b/locale/ar.mo
diff --git a/locale/bg.mo b/locale/bg.mo
diff --git a/locale/ca.mo b/locale/ca.mo
diff --git a/locale/cs.mo b/locale/cs.mo
diff --git a/locale/da.mo b/locale/da.mo
diff --git a/locale/de.mo b/locale/de.mo
diff --git a/locale/default.pot b/locale/default.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-06 11:51+0100\n"
+"POT-Creation-Date: 2023-07-31 17:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -15299,7 +15299,7 @@ msgid "Cannot modify root folder."
 msgstr ""
 
 #: cache/e1/e12568f445a23579c43fcfebd85ce8eee11d450b2050aad01f770f474b1d3218.php:430
-#: lib/Controller/Folder.php:329
+#: lib/Controller/Folder.php:338
 msgid "Cannot remove Folder with content"
 msgstr ""
 
@@ -18714,7 +18714,7 @@ msgstr ""
 #: lib/Controller/DisplayGroup.php:706 lib/Controller/DisplayGroup.php:2531
 #: lib/Controller/DataSet.php:622 lib/Controller/Notification.php:575
 #: lib/Controller/Campaign.php:605 lib/Controller/Campaign.php:1337
-#: lib/Controller/Module.php:735 lib/Controller/Folder.php:204
+#: lib/Controller/Module.php:735 lib/Controller/Folder.php:213
 #: lib/Controller/Playlist.php:707 lib/Controller/DataSetColumn.php:386
 #: lib/Controller/Tag.php:356 lib/Controller/Layout.php:549
 #: lib/Controller/Help.php:191 lib/Controller/DisplayProfile.php:303
@@ -18731,7 +18731,7 @@ msgstr ""
 #: lib/Controller/DataSet.php:917 lib/Controller/ScheduleReport.php:429
 #: lib/Controller/Notification.php:705 lib/Controller/Campaign.php:912
 #: lib/Controller/MenuBoard.php:465 lib/Controller/Module.php:379
-#: lib/Controller/Module.php:848 lib/Controller/Folder.php:272
+#: lib/Controller/Module.php:848 lib/Controller/Folder.php:281
 #: lib/Controller/Playlist.php:892 lib/Controller/Transition.php:159
 #: lib/Controller/Library.php:1353 lib/Controller/DataSetColumn.php:594
 #: lib/Controller/Tag.php:506 lib/Controller/Connector.php:201
@@ -18753,7 +18753,7 @@ msgstr ""
 #: lib/Controller/DataSet.php:1008 lib/Controller/ScheduleReport.php:467
 #: lib/Controller/Notification.php:764 lib/Controller/Campaign.php:991
 #: lib/Controller/SavedReport.php:290 lib/Controller/MenuBoard.php:542
-#: lib/Controller/Module.php:983 lib/Controller/Folder.php:334
+#: lib/Controller/Module.php:983 lib/Controller/Folder.php:343
 #: lib/Controller/Playlist.php:973 lib/Controller/Library.php:961
 #: lib/Controller/DataSetColumn.php:684 lib/Controller/Tag.php:632
 #: lib/Controller/Layout.php:967 lib/Controller/MenuBoardCategory.php:498
@@ -19436,41 +19436,40 @@ msgstr ""
 msgid "Switched to Normal Mode"
 msgstr ""
 
-#: lib/Controller/Folder.php:101
+#: lib/Controller/Folder.php:102
 msgid "Right click a Folder for further Options"
 msgstr ""
 
-#: lib/Controller/Folder.php:136
+#: lib/Controller/Folder.php:145
 msgid "Private Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:259
+#: lib/Controller/Folder.php:268
 msgid "Cannot edit root Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:318
+#: lib/Controller/Folder.php:327
 msgid "Cannot remove root Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:329
+#: lib/Controller/Folder.php:338
 msgid "Reassign objects from this Folder before deleting."
 msgstr ""
 
-#: lib/Controller/Folder.php:422
+#: lib/Controller/Folder.php:434
 msgid "Please select different folder, cannot move Folder to the same Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:428
+#: lib/Controller/Folder.php:440
 msgid ""
 "Please select different folder, cannot move Folder inside of one of its sub-"
 "folders"
 msgstr ""
 
-#: lib/Controller/Folder.php:435
+#: lib/Controller/Folder.php:445
 msgid ""
-"This Folder is already a sub-folder of the selected Folder,\n"
-"                     if you wish to move its content to the parent Folder, "
-"please check the merge checkbox."
+"This Folder is already a sub-folder of the selected Folder, if you wish to "
+"move its content to the parent Folder, please check the merge checkbox."
 msgstr ""
 
 #: lib/Controller/DataSetData.php:156
@@ -21125,15 +21124,15 @@ msgstr ""
 msgid "Library Quota must be a positive number."
 msgstr ""
 
-#: lib/Entity/User.php:1083
+#: lib/Entity/User.php:1086
 msgid "Provided Object not under permission management"
 msgstr ""
 
-#: lib/Entity/User.php:1340
+#: lib/Entity/User.php:1343
 msgid "You have exceeded your library quota"
 msgstr ""
 
-#: lib/Entity/User.php:1358
+#: lib/Entity/User.php:1361
 msgid "Your password does not meet the required complexity"
 msgstr ""
 
@@ -22197,7 +22196,9 @@ msgid "View Folder Tree on Grids and Forms"
 msgstr ""
 
 #: lib/Factory/UserGroupFactory.php:790
-msgid "Create new Folders"
+msgid ""
+"Allow users to create Sub-Folders under Folders they have access to. (Except "
+"the Root Folder)"
 msgstr ""
 
 #: lib/Factory/UserGroupFactory.php:795

diff --git a/locale/el.mo b/locale/el.mo
diff --git a/locale/en_GB.mo b/locale/en_GB.mo
diff --git a/locale/es.mo b/locale/es.mo
diff --git a/locale/et.mo b/locale/et.mo
diff --git a/locale/eu.mo b/locale/eu.mo
diff --git a/locale/fa.mo b/locale/fa.mo
diff --git a/locale/fi.mo b/locale/fi.mo
diff --git a/locale/fr.mo b/locale/fr.mo
diff --git a/locale/he.mo b/locale/he.mo
diff --git a/locale/hi.mo b/locale/hi.mo
diff --git a/locale/hr.mo b/locale/hr.mo
diff --git a/locale/hu.mo b/locale/hu.mo
diff --git a/locale/id.mo b/locale/id.mo
diff --git a/locale/it.mo b/locale/it.mo
diff --git a/locale/ja.mo b/locale/ja.mo
diff --git a/locale/ko.mo b/locale/ko.mo
diff --git a/locale/ku.mo b/locale/ku.mo
diff --git a/locale/lb.mo b/locale/lb.mo
diff --git a/locale/lo.mo b/locale/lo.mo
diff --git a/locale/lt.mo b/locale/lt.mo
diff --git a/locale/nb.mo b/locale/nb.mo
diff --git a/locale/nl.mo b/locale/nl.mo
diff --git a/locale/nl_NL.mo b/locale/nl_NL.mo
diff --git a/locale/pl.mo b/locale/pl.mo
diff --git a/locale/pt.mo b/locale/pt.mo
diff --git a/locale/pt_BR.mo b/locale/pt_BR.mo
diff --git a/locale/ro.mo b/locale/ro.mo
diff --git a/locale/ru.mo b/locale/ru.mo
diff --git a/locale/sk.mo b/locale/sk.mo
diff --git a/locale/sl.mo b/locale/sl.mo
diff --git a/locale/[email protected] b/locale/[email protected]
diff --git a/locale/sv.mo b/locale/sv.mo
diff --git a/locale/th.mo b/locale/th.mo
diff --git a/locale/tr.mo b/locale/tr.mo
diff --git a/locale/vi.mo b/locale/vi.mo
diff --git a/locale/zh_CN.mo b/locale/zh_CN.mo
diff --git a/locale/zh_TW.mo b/locale/zh_TW.mo
diff --git a/web/swagger.json b/web/swagger.json
@@ -5319,7 +5319,7 @@
                         "in": "formData",
                         "description": "A playlistId to add this uploaded media to",
                         "required": false,
-                        "type": "int"
+                        "type": "integer"
                     },
                     {
                         "name": "widgetFromDt",