Correct title generation for index files in entity root

Previously would output the language code as the title 'En'. This double checks whether the file is at the root of the entity and if so, it'll use the entity name.

code/models/DocumentationFolder.php

@@ -14,10 +14,7 @@ class DocumentationFolder extends DocumentationPage {
 	 * @return string
 	 */
 	public function getTitle() {
-		$path = explode(DIRECTORY_SEPARATOR, trim($this->getPath(), DIRECTORY_SEPARATOR));
+		return $this->getTitleFromFolder();
-		$folderName = array_pop($path);
-
-		return DocumentationHelper::clean_page_name($folderName);
 	}
 
 }

code/models/DocumentationPage.php

@@ -103,18 +103,30 @@ class DocumentationPage extends ViewableData {
 		$page = DocumentationHelper::clean_page_name($this->filename);
 
 		if($page == "Index") {
-			// look at the folder name
+			return $this->getTitleFromFolder();
-			$parts = explode("/", $this->getPath());
-			array_pop($parts); // name
-
-			$page = DocumentationHelper::clean_page_name(
-				array_pop($parts)
-			);
 		}
 
 		return $page;
 	}
 
+	public function getTitleFromFolder() {
+		$folder = $this->getPath();
+		$entity = $this->getEntity()->getPath();
+
+		$folder = str_replace('index.md', '', $folder);
+		
+		// if it's the root of the entity then we want to use the entity name
+		// otherwise we'll get 'En' for the entity folder
+		if($folder == $entity) {
+			return $this->getEntity()->getTitle();
+		} else {
+			$path = explode(DIRECTORY_SEPARATOR, trim($folder, DIRECTORY_SEPARATOR));
+			$folderName = array_pop($path);
+		}
+
+		return DocumentationHelper::clean_page_name($folderName);
+	}
+	
 	/**
 	 * @return string
 	 */