Merge remote-tracking branch 'origin/master'

pull/5126/head
Angel Fernando Quiroz Campos 1 year ago
commit 989b97b10a
  1. 3
      src/CoreBundle/Command/UpdateVueTranslations.php
  2. 4
      src/CoreBundle/Controller/CourseController.php

@ -77,7 +77,8 @@ class UpdateVueTranslations extends Command
$newLanguage[$variable] = $this->replaceMarkers($translated);
}
$newLanguage = array_filter($newLanguage);
$newLanguageToString = json_encode($newLanguage, JSON_PRETTY_PRINT);
$newLanguageToString = json_encode($newLanguage, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
$newLanguageToString = str_replace('</br>', '<br>', $newLanguageToString);
$fileToSave = $vueLocalePath.$iso.'.json';
file_put_contents($fileToSave, $newLanguageToString);
$output->writeln("json file generated for iso $iso: $fileToSave");

@ -241,13 +241,13 @@ class CourseController extends ToolBaseController
#[Route('/{cid}/tool/{toolName}', name: 'chamilo_core_course_redirect_tool')]
public function redirectTool(
Request $request,
string $toolTitle,
string $toolName,
CToolRepository $repo,
ToolChain $toolChain
): RedirectResponse {
/** @var CTool|null $tool */
$tool = $repo->findOneBy([
'title' => $toolTitle,
'title' => $toolName,
]);
if (null === $tool) {

Loading…
Cancel
Save