From ff110591a1fee6c8d459d102576e68d34a132bb8 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 21 Jun 2016 12:56:51 +0200
Subject: [PATCH] Improved usability of multilingual pages/articles

---
 com.woltlab.wcf/templates/article.tpl         |  2 +-
 com.woltlab.wcf/templates/cms.tpl             | 25 +++++++++++++++++++
 com.woltlab.wcf/templates/pageHeaderUser.tpl  | 17 ++++++++++---
 .../files/js/WoltLab/WCF/Language/Chooser.js  |  1 +
 .../lib/page/AbstractArticlePage.class.php    |  8 +++++-
 .../install/files/lib/page/CmsPage.class.php  |  9 ++++++-
 6 files changed, 55 insertions(+), 7 deletions(-)

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index ba470e4779..b7629cdfca 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -37,7 +37,7 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
-						{if $article->isMultilingual}
+						{if $article->isMultilingual && $__wcf->user->userID}
 							<li class="dropdown">
 								<a class="dropdownToggle boxFlag box24 button">
 									<span><img src="{$articleContent->getLanguage()->getIconPath()}" alt="" class="iconFlag"></span>
diff --git a/com.woltlab.wcf/templates/cms.tpl b/com.woltlab.wcf/templates/cms.tpl
index 7c803e0160..2681ff76d5 100644
--- a/com.woltlab.wcf/templates/cms.tpl
+++ b/com.woltlab.wcf/templates/cms.tpl
@@ -13,6 +13,31 @@
 	{/if}
 {/capture}
 
+{capture assign='contentHeaderNavigation'}
+	{if $page->isMultilingual && $__wcf->user->userID}
+		<li class="dropdown">
+			<a class="dropdownToggle boxFlag box24 button">
+				<span><img src="{$activePageLanguage->getIconPath()}" alt="" class="iconFlag"></span>
+				<span>{$activePageLanguage->languageName}</span>
+			</a>
+			<ul class="dropdownMenu">
+				{foreach from=$page->getPageLanguages() item='pageLanguage'}
+					{if $pageLanguage->getLanguage()}
+						<li class="boxFlag">
+							<a class="box24" href="{$pageLanguage->getLink()}">
+								<span><img src="{$pageLanguage->getLanguage()->getIconPath()}" alt="" class="iconFlag"></span>
+								<span>{$pageLanguage->getLanguage()->languageName}</span>
+							</a>
+						</li>
+					{/if}
+				{/foreach}
+			</ul>
+		</li>
+	{/if}
+	
+	{if $__wcf->getSession()->getPermission('admin.content.cms.canManagePage')}<li><a href="{link controller='PageEdit' id=$page->pageID isACP=true}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.page.edit{/lang}</span></a></li>{/if}
+{/capture}
+
 {include file='header'}
 
 {if $content[content]}
diff --git a/com.woltlab.wcf/templates/pageHeaderUser.tpl b/com.woltlab.wcf/templates/pageHeaderUser.tpl
index 611f94473a..94f280dcbc 100644
--- a/com.woltlab.wcf/templates/pageHeaderUser.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderUser.tpl
@@ -106,15 +106,24 @@
 								{implode from=$__wcf->getLanguage()->getLanguages() item=__language}
 									'{@$__language->languageID}': {
 										iconPath: '{@$__language->getIconPath()|encodeJS}',
-										languageName: '{@$__language|encodeJS}'
+										languageName: '{@$__language|encodeJS}',
+										languageCode: '{@$__language->languageCode|encodeJS}'
 									}
 								{/implode}
 							};
-							
+								
 							var callback = function(listItem) {
-								var location = window.location.toString().replace(/#.*/, '').replace(/(\?|&)l=[0-9]+/g, '');
-								var delimiter = (location.indexOf('?') == -1) ? '?' : '&';
+								var location;
+								var languageCode = elData(listItem, 'language-code');
+								var link = elBySel('link[hreflang="' + languageCode + '"]');
+								if (link !== null) {
+									location = link.href;
+								}
+								else {
+									location = window.location.toString().replace(/#.*/, '').replace(/(\?|&)l=[0-9]+/g, '');
+								}
 								
+								var delimiter = (location.indexOf('?') == -1) ? '?' : '&';
 								window.location = location + delimiter + 'l=' + elData(listItem, 'language-id') + window.location.hash;
 							};
 							
diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Language/Chooser.js b/wcfsetup/install/files/js/WoltLab/WCF/Language/Chooser.js
index 89b58422a5..5f6198ba83 100644
--- a/wcfsetup/install/files/js/WoltLab/WCF/Language/Chooser.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Language/Chooser.js
@@ -117,6 +117,7 @@ define(['Dictionary', 'Language', 'Dom/Traverse', 'Dom/Util', 'ObjectMap', 'Ui/S
 					listItem.className = 'boxFlag';
 					listItem.addEventListener(WCF_CLICK_EVENT, callbackClick);
 					elData(listItem, 'language-id', availableLanguageId);
+					if (language.languageCode !== undefined) elData(listItem, 'language-code', language.languageCode);
 					dropdownMenu.appendChild(listItem);
 					
 					a = elCreate('a');
diff --git a/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php b/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
index 4f40f476ac..b7a62d2ddf 100644
--- a/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/AbstractArticlePage.class.php
@@ -1,10 +1,11 @@
 <?php
 namespace wcf\page;
 use wcf\data\article\AccessibleArticleList;
-use wcf\data\article\CategoryArticleList;
+use wcf\data\article\category\ArticleCategory;
 use wcf\data\article\content\ViewableArticleContent;
 use wcf\data\article\ArticleEditor;
 use wcf\data\article\ViewableArticle;
+use wcf\data\tag\Tag;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\PermissionDeniedException;
@@ -77,6 +78,11 @@ abstract class AbstractArticlePage extends AbstractPage {
 		}
 		$this->article = ViewableArticle::getArticle($this->articleContent->articleID);
 		$this->category = $this->article->getCategory();
+		
+		// update interface language
+		if (!WCF::getUser()->userID && $this->article->isMultilingual && $this->articleContent->languageID != WCF::getLanguage()->languageID) {
+			WCF::setLanguage($this->articleContent->languageID);
+		}
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/page/CmsPage.class.php b/wcfsetup/install/files/lib/page/CmsPage.class.php
index b13f00c0f1..bde08f27cd 100644
--- a/wcfsetup/install/files/lib/page/CmsPage.class.php
+++ b/wcfsetup/install/files/lib/page/CmsPage.class.php
@@ -2,6 +2,7 @@
 namespace wcf\page;
 use wcf\data\page\Page;
 use wcf\system\exception\IllegalLinkException;
+use wcf\system\language\LanguageFactory;
 use wcf\system\request\LinkHandler;
 use wcf\system\request\RequestHandler;
 use wcf\system\WCF;
@@ -68,6 +69,11 @@ class CmsPage extends AbstractPage {
 		}
 		
 		$this->canonicalURL = LinkHandler::getInstance()->getCmsLink($this->pageID, $this->languageID);
+		
+		// update interface language
+		if (!WCF::getUser()->userID && $this->page->isMultilingual && $this->languageID != WCF::getLanguage()->languageID) {
+			WCF::setLanguage($this->languageID);
+		}
 	}
 	
 	/**
@@ -81,7 +87,8 @@ class CmsPage extends AbstractPage {
 			'content' => $this->content,
 			'contentLanguageID' => $this->languageID,
 			'page' => $this->page,
-			'pageID' => $this->pageID
+			'pageID' => $this->pageID,
+			'activePageLanguage' => ($this->languageID ? LanguageFactory::getInstance()->getLanguage($this->languageID) : null)
 		]);
 	}
 }
-- 
2.20.1