diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml index 47d1c8b260..510c2d4e39 100644 --- a/config/packages/translation.yaml +++ b/config/packages/translation.yaml @@ -2,7 +2,7 @@ framework: default_locale: '%locale%' translator: paths: - - '%kernel.project_dir%/translations' + - '%kernel.project_dir%/var/translations' - '%kernel.project_dir%/src/CoreBundle/Resources/translations' fallbacks: - '%locale%' diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml index bd85f11726..f565f954f8 100644 --- a/config/packages/twig.yaml +++ b/config/packages/twig.yaml @@ -1,6 +1,6 @@ twig: debug: '%kernel.debug%' - paths: ['%kernel.project_dir%/templates', '%kernel.project_dir%/public/main/template/', '%kernel.project_dir%/public/plugin/'] + paths: ['%kernel.project_dir%/var/templates', '%kernel.project_dir%/public/main/template/', '%kernel.project_dir%/public/plugin/'] form_themes: - 'bootstrap_4_layout.html.twig' - '@SonataFormatter/Form/formatter.html.twig' diff --git a/public/main/install/index.php b/public/main/install/index.php index 8d9bf395d5..9ea30a4f6a 100644 --- a/public/main/install/index.php +++ b/public/main/install/index.php @@ -76,7 +76,7 @@ if (!array_key_exists($installationLanguage, get_language_folder_list())) { // Set translation $translator = new Translator($installationLanguage); $translator->addLoader('po', new PoFileLoader()); -$translator->addResource('po', "../../../translations/installation.$installationLanguage.po", $installationLanguage); +$translator->addResource('po', "../../../var/translations/installation.$installationLanguage.po", $installationLanguage); Container::$translator = $translator; // The function api_get_setting() might be called within the installation scripts. diff --git a/templates/themes/default/ChamiloThemeBundle/Layout/layout_one_col.html.twig.dist b/templates/themes/default/ChamiloThemeBundle/Layout/layout_one_col.html.twig.dist deleted file mode 100644 index 0fa17b2085..0000000000 --- a/templates/themes/default/ChamiloThemeBundle/Layout/layout_one_col.html.twig.dist +++ /dev/null @@ -1,9 +0,0 @@ -{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %} - -{# Edit the default chamilo template #} - -{% block page_content %} - {{ parent() }} -{% endblock %} - - diff --git a/templates/themes/default/ChamiloThemeBundle/Layout/layout_two_col.html.twig.dist b/templates/themes/default/ChamiloThemeBundle/Layout/layout_two_col.html.twig.dist deleted file mode 100644 index f9d3c9b18b..0000000000 --- a/templates/themes/default/ChamiloThemeBundle/Layout/layout_two_col.html.twig.dist +++ /dev/null @@ -1,7 +0,0 @@ -{% extends '@ChamiloTheme/Layout/base-layout.html.twig' %} - -{# Edit the default chamilo template #} - -{% block page_content %} - {{ parent() }} -{% endblock %} diff --git a/templates/themes/default/FOSUserBundle/Security/login.html.twig b/templates/themes/default/FOSUserBundle/Security/login.html.twig deleted file mode 100644 index 1fb362f928..0000000000 --- a/templates/themes/default/FOSUserBundle/Security/login.html.twig +++ /dev/null @@ -1,69 +0,0 @@ -{% extends "@ChamiloUser/layout.html.twig" %} - -{% block fos_user_content %} - {% block sonata_user_login %} - {% block sonata_user_login_error %} - {% if error %} -