composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 15:22:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/uninstallation

Browse Source
This commit is contained in:
Molkobain
2026-04-30 10:38:05 +02:00
parent cd9a755162 8de5c2525b
commit bfcff9b9c8
200 changed files with 7877 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sources/Application/Helper/CKEditorHelper.php
View File

@@ -6,15 +6,14 @@ use Combodo\iTop\Application\TwigBase\Twig\TwigHelper;
use Combodo\iTop\Application\WebPage\WebPage;
use Combodo\iTop\Renderer\BlockRenderer;
use Combodo\iTop\Renderer\RenderingOutput;
use DBSearch;
use Dict;
use DOMSanitizer;
use Exception;
use ExceptionLog;
use UserRights;
use MetaModel;
use DBSearch;
use UserRights;
use utils;
use appUserPreferences;
/**
* Class CKEditorHelper
@@ -47,7 +46,6 @@ class CKEditorHelper
// configuration
$aConfiguration = [
'language' => $sLanguage,
'maximize' => [],
'detectChanges' => [
'initialValue' => $sInitialValue,
],
@@ -262,11 +260,11 @@ HTML;
// add corresponding ckeditor language file
// P1 language + country
// P2 language
$sLanguageFileRelPath = 'node_modules/ckeditor5-itop-build/build/translations/'.$sLanguage.'-'.$sCountry.'.js';
$sLanguageFileRelPath = 'node_modules/ckeditor5-itop-build/build/translations/'.$sLanguage.'-'.$sCountry.'.umd.js';
if (file_exists(APPROOT.$sLanguageFileRelPath)) {
$aJSRelPaths[] = $sLanguageFileRelPath;
} else {
$sLanguageFileRelPath = 'node_modules/ckeditor5-itop-build/build/translations/'.$sLanguage.'.js';
$sLanguageFileRelPath = 'node_modules/ckeditor5-itop-build/build/translations/'.$sLanguage.'.umd.js';
if (file_exists(APPROOT.$sLanguageFileRelPath)) {
$aJSRelPaths[] = $sLanguageFileRelPath;
}