Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/westphal 4.0.10 release prep #2476

Merged
merged 3 commits into from
Apr 8, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Helper/Environment.php
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
*/
class Environment
{
public static $WEBSITE_VERSION_NAME = '4.0.9';
public static $WEBSITE_VERSION_NAME = '4.0.10';
public static $XMDS_VERSION = '7';
public static $XLF_VERSION = 4;
public static $VERSION_REQUIRED = '8.1.0';
6 changes: 4 additions & 2 deletions lib/Middleware/Actions.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/*
* Copyright (C) 2023 Xibo Signage Ltd
* Copyright (C) 2024 Xibo Signage Ltd
*
* Xibo - Digital Signage - https://xibosignage.com
*
@@ -90,7 +90,9 @@ public function process(Request $request, RequestHandler $handler): Response
if ($user->userTypeId == 1 && file_exists(PROJECT_ROOT . '/web/install/index.php')) {
$container->get('logger')->notice('Install.php exists and shouldn\'t');

$notifications[] = $factory->create(__('There is a problem with this installation. "install.php" should be deleted.'));
$notifications[] = $factory->create(
__('There is a problem with this installation, the web/install folder should be deleted.')
);
$extraNotifications++;

// Test for web in the URL.
Binary file modified locale/af.mo
Binary file not shown.
Binary file modified locale/ar.mo
Binary file not shown.
Binary file modified locale/bg.mo
Binary file not shown.
Binary file modified locale/ca.mo
Binary file not shown.
Binary file modified locale/cs.mo
Binary file not shown.
Binary file modified locale/da.mo
Binary file not shown.
Binary file modified locale/de.mo
Binary file not shown.
85 changes: 41 additions & 44 deletions locale/default.pot
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-03-08 09:24+0000\n"
"POT-Creation-Date: 2024-04-05 13:49+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"
@@ -11454,7 +11454,7 @@ msgstr ""

#: cache/9f/9f9a142004ca4a1c914a4395fe586017.php:125
#: cache/a4/a4b5f52b1992bb349e8a30b19ff24645.php:80
#: lib/Controller/Playlist.php:1702 lib/Controller/Library.php:2114
#: lib/Controller/Playlist.php:1703 lib/Controller/Library.php:2114
#: lib/Controller/Layout.php:1656
msgid "Design"
msgstr ""
@@ -12461,7 +12461,7 @@ msgid "Report an application fault"
msgstr ""

#: cache/04/0499f0242d314e52ef2aed46b4a0b1e9.php:113
#: lib/Middleware/Actions.php:102
#: lib/Middleware/Actions.php:104
msgid ""
"CMS configuration warning, it is very unlikely that /web/ should be in the "
"URL. This usually means that the DocumentRoot of the web server is wrong and "
@@ -17918,7 +17918,7 @@ msgstr ""

#: cache/71/71725d40a3089432630feea639ab8751.php:112
#: cache/71/71725d40a3089432630feea639ab8751.php:116
#: lib/Controller/Sessions.php:114
#: lib/Controller/Sessions.php:119
msgid "Logout"
msgstr ""

@@ -18167,8 +18167,8 @@ msgstr ""

#: cache/2c/2c268905994cc74a86fb2ebd71265416.php:137
msgid ""
"Assign all Media items based on their Library duration, and make it sticky "
"so that changes in the library are not pulled into Layouts."
"Assign all Media items to Playlists based on their Library duration, and "
"make it sticky so that changes in the library are not pulled into Layouts."
msgstr ""

#: cache/2c/2c268905994cc74a86fb2ebd71265416.php:147
@@ -20809,7 +20809,7 @@ msgstr ""
#: lib/Controller/Widget.php:988 lib/Controller/Widget.php:1077
#: lib/Controller/Widget.php:1444 lib/Controller/Widget.php:1553
#: lib/Controller/Widget.php:1635 lib/Controller/Playlist.php:1311
#: lib/Controller/Playlist.php:1475 lib/Controller/Layout.php:740
#: lib/Controller/Playlist.php:1476 lib/Controller/Layout.php:740
#: lib/Controller/Layout.php:843 lib/Controller/Region.php:229
#: lib/Controller/Region.php:376 lib/Controller/Region.php:462
#: lib/Controller/Region.php:527 lib/Controller/Region.php:748
@@ -21488,7 +21488,7 @@ msgstr ""
msgid "Please provide an assetId"
msgstr ""

#: lib/Controller/Fault.php:109 lib/Entity/Layout.php:1936
#: lib/Controller/Fault.php:109 lib/Entity/Layout.php:1910
msgid "Can't create ZIP. Error Code: "
msgstr ""

@@ -21623,42 +21623,42 @@ msgstr ""
msgid "Please provide Media to Assign"
msgstr ""

#: lib/Controller/Playlist.php:1335
#: lib/Controller/Playlist.php:1336
msgid "You do not have permissions to use this media"
msgstr ""

#: lib/Controller/Playlist.php:1340
#: lib/Controller/Playlist.php:1341
#, php-format
msgid "You cannot assign file type %s to a playlist"
msgstr ""

#: lib/Controller/Playlist.php:1400
#: lib/Controller/Playlist.php:1401
msgid "Media Assigned"
msgstr ""

#: lib/Controller/Playlist.php:1485
#: lib/Controller/Playlist.php:1486
msgid "Cannot Save empty region playlist. Please add widgets"
msgstr ""

#: lib/Controller/Playlist.php:1504
#: lib/Controller/Playlist.php:1505
msgid "Order Changed"
msgstr ""

#: lib/Controller/Playlist.php:1642 lib/Controller/Playlist.php:1719
#: lib/Controller/Playlist.php:1643 lib/Controller/Playlist.php:1720
msgid "Specified Playlist item is not in use."
msgstr ""

#: lib/Controller/Playlist.php:1712 lib/Controller/Library.php:2124
#: lib/Controller/Playlist.php:1713 lib/Controller/Library.php:2124
#: lib/Controller/Layout.php:1702
msgid "Preview Layout"
msgstr ""

#: lib/Controller/Playlist.php:1787
#: lib/Controller/Playlist.php:1788
#, php-format
msgid "For Playlist %s Enable Stats Collection is set to %s"
msgstr ""

#: lib/Controller/Playlist.php:1920
#: lib/Controller/Playlist.php:1921
#, php-format
msgid "Playlist %s moved to Folder %s"
msgstr ""
@@ -22001,7 +22001,7 @@ msgid ""
"This function is available only to User who originally locked this Layout."
msgstr ""

#: lib/Controller/Layout.php:3111 lib/Entity/Layout.php:2275
#: lib/Controller/Layout.php:3111 lib/Entity/Layout.php:2249
msgid "Empty Region"
msgstr ""

@@ -22587,7 +22587,7 @@ msgstr ""
msgid "File available only for SSSP displays"
msgstr ""

#: lib/Controller/Sessions.php:183
#: lib/Controller/Sessions.php:177
msgid "User Logged Out."
msgstr ""

@@ -22745,9 +22745,10 @@ msgstr ""
msgid "Layout ID %d is locked by another User! Lock expires on: %s"
msgstr ""

#: lib/Middleware/Actions.php:93
#: lib/Middleware/Actions.php:94
msgid ""
"There is a problem with this installation. \"install.php\" should be deleted."
"There is a problem with this installation, the web/install folder should be "
"deleted."
msgstr ""

#: lib/Middleware/SAMLAuthentication.php:102
@@ -23190,40 +23191,36 @@ msgid ""
"edge. Please check the allowed Resize Limit in Administration -> Settings"
msgstr ""

#: lib/Entity/Layout.php:1837
msgid "Missing one or more required elements"
msgstr ""

#: lib/Entity/Layout.php:1853
#: lib/Entity/Layout.php:1827
#, php-format
msgid "%s is pending conversion"
msgstr ""

#: lib/Entity/Layout.php:1858
#: lib/Entity/Layout.php:1832
#, php-format
msgid ""
"%s is too large. Please ensure that none of the images in your layout are "
"larger than your Resize Limit on their longest edge."
msgstr ""

#: lib/Entity/Layout.php:1870
#: lib/Entity/Layout.php:1844
msgid "Misconfigured Playlist"
msgstr ""

#: lib/Entity/Layout.php:2264
#: lib/Entity/Layout.php:2238
#, php-format
msgid "There is an error with this Layout: %s"
msgstr ""

#: lib/Entity/Layout.php:2343 lib/Entity/Layout.php:2472
#: lib/Entity/Layout.php:2317 lib/Entity/Layout.php:2446
msgid "Not a Draft"
msgstr ""

#: lib/Entity/Layout.php:2558
#: lib/Entity/Layout.php:2532
msgid "Draft Layouts must have a parent"
msgstr ""

#: lib/Entity/Layout.php:2693 lib/Listener/WidgetListener.php:199
#: lib/Entity/Layout.php:2667 lib/Listener/WidgetListener.php:199
msgid "Cannot add the same SubPlaylist twice."
msgstr ""

@@ -25116,33 +25113,33 @@ msgstr ""
msgid "There was a problem processing your request, please try again"
msgstr ""

#: lib/Connector/AlphaVantageConnector.php:120
#: lib/Connector/AlphaVantageConnector.php:123
msgid "Unable to contact the AlphaVantage API"
msgstr ""

#: lib/Connector/AlphaVantageConnector.php:234
msgid "Missing Items for Stocks Module"
#: lib/Connector/AlphaVantageConnector.php:238
msgid "Add some stock symbols"
msgstr ""

#: lib/Connector/AlphaVantageConnector.php:282
#: lib/Connector/AlphaVantageConnector.php:286
msgid "Invalid symbol "
msgstr ""

#: lib/Connector/AlphaVantageConnector.php:319
#: lib/Connector/AlphaVantageConnector.php:323
msgid "Stocks data invalid"
msgstr ""

#: lib/Connector/AlphaVantageConnector.php:395
#: lib/Connector/AlphaVantageConnector.php:399
msgid ""
"Missing Items for Currencies Module. Please provide items in order to "
"proceed."
msgstr ""

#: lib/Connector/AlphaVantageConnector.php:537
#: lib/Connector/AlphaVantageConnector.php:544
#: lib/Connector/AlphaVantageConnector.php:549
#: lib/Connector/AlphaVantageConnector.php:614
#: lib/Connector/AlphaVantageConnector.php:619
#: lib/Connector/AlphaVantageConnector.php:541
#: lib/Connector/AlphaVantageConnector.php:548
#: lib/Connector/AlphaVantageConnector.php:553
#: lib/Connector/AlphaVantageConnector.php:618
#: lib/Connector/AlphaVantageConnector.php:623
msgid "Currency data invalid"
msgstr ""

@@ -25473,7 +25470,7 @@ msgid ""
"please consult your administrator"
msgstr ""

#: lib/Storage/PdoStorageService.php:412
#: lib/Storage/PdoStorageService.php:417
#, php-format
msgid "Failed to write to database after %d retries. Please try again later."
msgstr ""
Binary file modified locale/el.mo
Binary file not shown.
Binary file modified locale/en_GB.mo
Binary file not shown.
Binary file modified locale/es.mo
Binary file not shown.
Binary file modified locale/et.mo
Binary file not shown.
Binary file modified locale/eu.mo
Binary file not shown.
Binary file modified locale/fa.mo
Binary file not shown.
Binary file modified locale/fi.mo
Binary file not shown.
Binary file modified locale/fr.mo
Binary file not shown.
Binary file modified locale/fr_CA.mo
Binary file not shown.
Binary file modified locale/he.mo
Binary file not shown.
Binary file modified locale/hi.mo
Binary file not shown.
Binary file modified locale/hr.mo
Binary file not shown.
Binary file modified locale/hu.mo
Binary file not shown.
Binary file modified locale/id.mo
Binary file not shown.
Binary file modified locale/it.mo
Binary file not shown.
Binary file modified locale/ja.mo
Binary file not shown.
Binary file modified locale/ko.mo
Binary file not shown.
Binary file modified locale/ku.mo
Binary file not shown.
Binary file modified locale/lb.mo
Binary file not shown.
Binary file modified locale/lo.mo
Binary file not shown.
Binary file modified locale/lt.mo
Binary file not shown.
Binary file modified locale/nb.mo
Binary file not shown.
Binary file modified locale/nl.mo
Binary file not shown.
Binary file modified locale/nl_NL.mo
Binary file not shown.
Binary file modified locale/pl.mo
Binary file not shown.
Binary file modified locale/pt.mo
Binary file not shown.
Binary file modified locale/pt_BR.mo
Binary file not shown.
Binary file modified locale/ro.mo
Binary file not shown.
Binary file modified locale/ru.mo
Binary file not shown.
Binary file modified locale/sk.mo
Binary file not shown.
Binary file modified locale/sl.mo
Binary file not shown.
Binary file modified locale/[email protected]
Binary file not shown.
Binary file modified locale/sv.mo
Binary file not shown.
Binary file modified locale/th.mo
Binary file not shown.
Binary file modified locale/tr.mo
Binary file not shown.
Binary file modified locale/vi.mo
Binary file not shown.
Binary file modified locale/zh_CN.mo
Binary file not shown.
Binary file modified locale/zh_TW.mo
Binary file not shown.