From 15f1f2a03d87e146c5651a7daddadea93cd1d08d Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Thu, 3 Oct 2019 19:17:22 +0300
Subject: [PATCH] Revert chReverted setting language for every page during
 initialization

---
 CHANGELOG.md                                     |  1 +
 .../Page/Interfaces/PageRoutableInterface.php    |  2 +-
 system/src/Grav/Common/Page/Page.php             | 16 ++++------------
 .../Console/Cli/PageSystemValidatorCommand.php   |  6 +++---
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 94b7907d3..059170e62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 1. [](#bugfix)
     * Fixed wrong Grav param separator when using `Route` class
     * Grav 1.7: Fixed prev/next page missing pages if pagination was turned on in page header
+    * Grav 1.7: Reverted setting language for every page during initialization
     
 # v1.7.0-beta.9
 ## 09/26/2019
diff --git a/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php b/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
index c3afeab16..ab7a898fb 100644
--- a/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
+++ b/system/src/Grav/Common/Page/Interfaces/PageRoutableInterface.php
@@ -153,7 +153,7 @@ interface PageRoutableInterface
     /**
      * Returns the item in the current position.
      *
-     * @return int   the index of the current page.
+     * @return int|null The index of the current page.
      */
     public function currentPosition();
 
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 357aea1a2..67b10023f 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -128,10 +128,7 @@ class Page implements PageInterface
      */
     public function init(\SplFileInfo $file, $extension = null)
     {
-        $grav = Grav::instance();
-
-        /** @var Config $config */
-        $config = $grav['config'];
+        $config = Grav::instance()['config'];
 
         // some extension logic
         if (empty($extension)) {
@@ -141,13 +138,8 @@ class Page implements PageInterface
         }
 
         // extract page language from page extension
-        $languageCode = trim(basename($this->extension(), 'md'), '.') ?: null;
-        if (!$languageCode) {
-            /** @var Language $language */
-            $language = $grav['language'];
-            $languageCode = $language->enabled() ? $language->getDefault() : null;
-        }
-        $this->language($languageCode);
+        $language = trim(basename($this->extension(), 'md'), '.') ?: null;
+        $this->language($language);
 
         $this->hide_home_route = $config->get('system.home.hide_in_urls', false);
         $this->home_route = $this->adjustRouteCase($config->get('system.home.alias'));
@@ -2422,7 +2414,7 @@ class Page implements PageInterface
     /**
      * Returns the item in the current position.
      *
-     * @return int   the index of the current page.
+     * @return int|null   The index of the current page.
      */
     public function currentPosition()
     {
diff --git a/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php b/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
index 8e2df1809..a8845a47d 100644
--- a/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
+++ b/system/src/Grav/Console/Cli/PageSystemValidatorCommand.php
@@ -76,9 +76,9 @@ class PageSystemValidatorCommand extends ConsoleCommand
         'root' => [[]],
 
         // Translations
-        //'translatedLanguages' => [[], [false], [true]],
-        //'untranslatedLanguages' => [[], [false], [true]],
-        //'language' => [[]],
+        'translatedLanguages' => [[], [false], [true]],
+        'untranslatedLanguages' => [[], [false], [true]],
+        'language' => [[]],
 
         // Legacy
         'raw' => [[]],