Fixed page collections containing dummy items for untranslated defaul…

…t language [#2985]

CHANGELOG.md

@@ -29,6 +29,7 @@
     * Fixed ordering issue with moving pages [grav-plugin-admin#2015](https://github.com/getgrav/grav-plugin-admin/issues/2015)
     * Fixed Flex Pages cache not invalidating if saving an old `Page` object [#3152](https://github.com/getgrav/grav/issues/3152)
     * Fixed multiple issues with `system.language.translations: false`
+    * Fixed page collections containing dummy items for untranslated default language [#2985](https://github.com/getgrav/grav/issues/2985)
 
 # v1.7.0-rc.20
 ## 12/15/2020

system/src/Grav/Common/Page/Collection.php

@@ -455,6 +455,48 @@ public function modular()
         return $this;
     }
 
+    /**
+     * Creates new collection with only translated pages
+     *
+     * @return Collection The collection with only published pages
+     * @internal
+     */
+    public function translated()
+    {
+        $published = [];
+
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+            if ($page !== null && $page->translated()) {
+                $published[$path] = $slug;
+            }
+        }
+        $this->items = $published;
+
+        return $this;
+    }
+
+    /**
+     * Creates new collection with only untranslated pages
+     *
+     * @return Collection The collection with only non-published pages
+     * @internal
+     */
+    public function nonTranslated()
+    {
+        $published = [];
+
+        foreach ($this->items as $path => $slug) {
+            $page = $this->pages->get($path);
+            if ($page !== null && !$page->translated()) {
+                $published[$path] = $slug;
+            }
+        }
+        $this->items = $published;
+
+        return $this;
+    }
+
     /**
      * Creates new collection with only published pages
      *

system/src/Grav/Common/Page/Page.php

@@ -53,6 +53,8 @@ class Page implements PageInterface
 
     /** @var string|null Filename. Leave as null if page is folder. */
     protected $name;
+    /** @var bool */
+    protected $initialized = false;
     /** @var string */
     protected $folder;
     /** @var string */
@@ -183,6 +185,8 @@ public function init(SplFileInfo $file, $extension = null)
     {
         $config = Grav::instance()['config'];
 
+        $this->initialized = true;
+
         // some extension logic
         if (empty($extension)) {
             $this->extension('.' . $file->getExtension());
@@ -1048,6 +1052,15 @@ public function rawMarkdown($var = null)
         return $this->raw_content;
     }
 
+    /**
+     * @return bool
+     * @internal
+     */
+    public function translated(): bool
+    {
+        return $this->initialized;
+    }
+
     /**
      * Get file object to the page.
      *
@@ -2597,6 +2610,7 @@ public function collection($params = 'content', $pagination = true)
             throw new InvalidArgumentException('Argument should be either header variable name or array of parameters');
         }
 
+        $params['filter'] = ($params['filter'] ?? []) + ['translated' => true];
         if (!$pagination) {
             $params['pagination'] = false;
         }

system/src/Grav/Common/Page/Pages.php

@@ -465,6 +465,13 @@ public function getCollection(array $params = [], array $context = [])
             }
 
             switch ($type) {
+                case 'translated':
+                    if ($filter) {
+                        $collection = $collection->translated();
+                    } else {
+                        $collection = $collection->nonTranslated();
+                    }
+                    break;
                 case 'published':
                     if ($filter) {
                         $collection = $collection->published();