diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/baking-mishaps-our-troubleshooting-tips.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/baking-mishaps-our-troubleshooting-tips.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/baking-mishaps-our-troubleshooting-tips.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/baking-mishaps-our-troubleshooting-tips.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/dairy-free-delicious-milk-chocolate.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/dairy-free-delicious-milk-chocolate.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/dairy-free-delicious-milk-chocolate.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/dairy-free-delicious-milk-chocolate.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/give-it-a-go-and-grow-your-own-herbs.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/give-it-a-go-and-grow-your-own-herbs.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/give-it-a-go-and-grow-your-own-herbs.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/give-it-a-go-and-grow-your-own-herbs.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/give-your-oatmeal-the-ultimate-makeover.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/give-your-oatmeal-the-ultimate-makeover.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/give-your-oatmeal-the-ultimate-makeover.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/give-your-oatmeal-the-ultimate-makeover.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/lets-hear-it-for-carrots.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/lets-hear-it-for-carrots.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/lets-hear-it-for-carrots.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/lets-hear-it-for-carrots.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/skip-the-spirits-with-delicious-mocktails.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/skip-the-spirits-with-delicious-mocktails.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/skip-the-spirits-with-delicious-mocktails.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/skip-the-spirits-with-delicious-mocktails.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/the-real-deal-for-supermarket-savvy-shopping.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/the-real-deal-for-supermarket-savvy-shopping.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/the-real-deal-for-supermarket-savvy-shopping.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/the-real-deal-for-supermarket-savvy-shopping.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/the-umami-guide-to-our-favourite-mushrooms.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/the-umami-guide-to-our-favourite-mushrooms.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/article_body/the-umami-guide-to-our-favourite-mushrooms.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/article_body/the-umami-guide-to-our-favourite-mushrooms.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/articles.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/articles.csv similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/articles.csv rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/articles.csv diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/pages.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/pages.csv similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/pages.csv rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/pages.csv diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/chili-sauce-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/chili-sauce-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/chili-sauce-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/chili-sauce-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/crema-catalana-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/crema-catalana-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/crema-catalana-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/crema-catalana-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/mediterranean-quiche-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/mediterranean-quiche-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/mediterranean-quiche-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/mediterranean-quiche-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/pizza-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/pizza-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/pizza-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/pizza-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/thai-green-curry-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/thai-green-curry-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/thai-green-curry-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/thai-green-curry-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/vegan-chocolate-nut-brownies.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/vegan-chocolate-nut-brownies.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/vegan-chocolate-nut-brownies.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/vegan-chocolate-nut-brownies.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/veggie-pasta-bake-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/veggie-pasta-bake-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/veggie-pasta-bake-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/veggie-pasta-bake-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/victoria-sponge-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/victoria-sponge-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/victoria-sponge-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/victoria-sponge-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/watercress-soup-umami.html b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/watercress-soup-umami.html similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipe_instructions/watercress-soup-umami.html rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipe_instructions/watercress-soup-umami.html diff --git a/core/profiles/demo_umami/modules/demo_umami_content/default_content/recipes.csv b/core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipes.csv similarity index 100% rename from core/profiles/demo_umami/modules/demo_umami_content/default_content/recipes.csv rename to core/profiles/demo_umami/modules/demo_umami_content/default_content/languages/en/recipes.csv diff --git a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php index 01e998e9b3..5456dd1a32 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php +++ b/core/profiles/demo_umami/modules/demo_umami_content/src/InstallHelper.php @@ -124,7 +124,7 @@ protected function importEditors() { protected function importArticles() { $module_path = $this->moduleHandler->getModule('demo_umami_content') ->getPath(); - if (($handle = fopen($module_path . '/default_content/articles.csv', "r")) !== FALSE) { + if (($handle = fopen($module_path . '/default_content/languages/en/articles.csv', "r")) !== FALSE) { $uuids = []; $header = fgetcsv($handle); while (($data = fgetcsv($handle)) !== FALSE) { @@ -138,7 +138,7 @@ protected function importArticles() { // Fields mapping starts. // Set Body Field. if (!empty($data['body'])) { - $body_path = $module_path . '/default_content/article_body/' . $data['body']; + $body_path = $module_path . '/default_content/languages/en/article_body/' . $data['body']; $body = file_get_contents($body_path); if ($body !== FALSE) { $values['body'] = [['value' => $body, 'format' => 'basic_html']]; @@ -188,7 +188,7 @@ protected function importArticles() { protected function importRecipes() { $module_path = $this->moduleHandler->getModule('demo_umami_content')->getPath(); - if (($handle = fopen($module_path . '/default_content/recipes.csv', "r")) !== FALSE) { + if (($handle = fopen($module_path . '/default_content/languages/en/recipes.csv', "r")) !== FALSE) { $header = fgetcsv($handle); $uuids = []; while (($data = fgetcsv($handle)) !== FALSE) { @@ -253,7 +253,7 @@ protected function importRecipes() { } // Set field_recipe_instruction Field. if (!empty($data['recipe_instruction'])) { - $recipe_instruction_path = $module_path . '/default_content/recipe_instructions/' . $data['recipe_instruction']; + $recipe_instruction_path = $module_path . '/default_content/languages/en/recipe_instructions/' . $data['recipe_instruction']; $recipe_instructions = file_get_contents($recipe_instruction_path); if ($recipe_instructions !== FALSE) { $values['field_recipe_instruction'] = [['value' => $recipe_instructions, 'format' => 'basic_html']]; @@ -284,7 +284,7 @@ protected function importRecipes() { * @return $this */ protected function importPages() { - if (($handle = fopen($this->moduleHandler->getModule('demo_umami_content')->getPath() . '/default_content/pages.csv', "r")) !== FALSE) { + if (($handle = fopen($this->moduleHandler->getModule('demo_umami_content')->getPath() . '/default_content/languages/en/pages.csv', "r")) !== FALSE) { $headers = fgetcsv($handle); $uuids = []; while (($data = fgetcsv($handle)) !== FALSE) { diff --git a/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php b/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php index 677a2dfa4c..f3c7d53f0e 100644 --- a/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php +++ b/core/profiles/demo_umami/modules/demo_umami_content/tests/src/Functional/DefaultContentFilesAccessTest.php @@ -21,9 +21,9 @@ public function testAccessDeniedToFiles() { $files_to_test = [ 'images/heritage-carrots.jpg', - 'recipe_instructions/mediterranean-quiche-umami.html', - 'article_body/lets-hear-it-for-carrots.html', - 'articles.csv', + 'languages/en/recipe_instructions/mediterranean-quiche-umami.html', + 'languages/en/article_body/lets-hear-it-for-carrots.html', + 'languages/en/articles.csv', ]; foreach ($files_to_test as $file) { // Hard code the path since the demo_umami profile is not installed.