Merge pull request #929 from nextcloud/fix/translate-folder-before-sort

Fix folder translation and sorting order

lib/IMAP/FolderMapper.php

@@ -33,7 +33,7 @@ class FolderMapper {
 	 * @param Account $account
 	 * @param Horde_Imap_Client_Socket $client
 	 * @param string $pattern
-	 * @return Folder
+	 * @return Folder[]
 	 */
 	public function getFolders(Account $account, Horde_Imap_Client_Socket $client,
 		$pattern = '*') {

lib/Service/MailManager.php

@@ -85,8 +85,8 @@ class MailManager implements IMailManager {
 		$havePrefix = $this->prefixDetector->havePrefix($folders);
 		$this->folderMapper->getFoldersStatus($folders, $client);
 		$this->folderMapper->detectFolderSpecialUse($folders);
-		$this->folderMapper->sortFolders($folders);
 		$this->folderNameTranslator->translateAll($folders, $havePrefix);
+		$this->folderMapper->sortFolders($folders);
 		return $this->folderMapper->buildFolderHierarchy($folders, $havePrefix);
 	}