fix localization

Author: ContentsViewer

Frontend/note-viewer.php

@@ -156,9 +156,11 @@
 $vars['addEditLink'] = $noteExists;
 $vars['openNewTabEditLink'] = $enableRemoteEdit;
 
-if($noteExists){
-    $vars['htmlLang'] = $vars['layerName'];
-}
+$vars['htmlLang'] = $vars['layerName'];
+
+// if($noteExists){
+//     $vars['htmlLang'] = $vars['layerName'];
+// }
 
 // ビルド時間計測 終了
 $stopwatch->Stop();

Frontend/preview.php

@@ -29,6 +29,11 @@
 $context = new OutlineText\Context();
 $context->pathMacros = ContentsDatabaseManager::CreatePathMacros($vars['contentPath']);
 
+$vars['layerName'] = ContentsDatabaseManager::GetRelatedLayerName($vars['contentPath']);
+if($vars['layerName'] === false){
+    $vars['layerName'] = DEFAULT_LAYER_NAME;
+}
+
 OutlineText\Parser::Init();
 
 ?>

Frontend/related-viewer.php

@@ -30,6 +30,10 @@
 $vars['rootContentPath'] = ContentsDatabaseManager::GetRelatedRootFile($vars['contentPath']);
 $vars['rootDirectory'] = substr(GetTopDirectory($vars['rootContentPath']), 1);
 
+// layerの再設定
+$out = UpdateLayerNameAndResetLocalization($vars['contentPath'], $vars['layerName'], $vars['language']);
+$vars['layerName'] = $out['layerName'];
+$vars['language'] = $out['language'];
 
 $parent = $currentContent->Parent();
 
@@ -160,6 +164,8 @@
 $vars['canonialUrl'] = (empty($_SERVER["HTTPS"]) ? "http://" : "https://") . 
     $_SERVER["HTTP_HOST"] . CreateContentHREF($vars['contentPath']) . '?related';
 
+$vars['htmlLang'] = $vars['layerName'];
+
 // ビルド時間計測 終了
 $stopwatch->Stop();
 $vars['pageBuildReport']['times']['build']['ms'] = $stopwatch->Elapsed() * 1000;

Frontend/tag-viewer.php

@@ -36,7 +36,11 @@
 }
 
 ContentsDatabaseManager::LoadRelatedMetadata($vars['rootContentPath']);
-setcookie('layer', $vars['layerName'], time()+(60*60*24*30*6), '/'); // 有効時間 6カ月
+
+// layerの再設定
+$out = UpdateLayerNameAndResetLocalization($vars['rootContentPath'], $vars['layerName'], $vars['language']);
+$vars['layerName'] = $out['layerName'];
+$vars['language'] = $out['language'];
 
 $tag2path = array_key_exists('tag2path', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['tag2path'] : [];
 $path2tag = array_key_exists('path2tag', ContentsDatabase::$metadata) ? ContentsDatabase::$metadata['path2tag'] : [];

index.php

@@ -208,10 +208,6 @@
 
 // contentPathの取得
 $vars['contentPath'] = '.' . URI2Path($vars['subURI']);
-$vars['layerName'] = ContentsDatabaseManager::GetRelatedLayerName($vars['contentPath']);
-if($vars['layerName'] === false){
-    $vars['layerName'] = DEFAULT_LAYER_NAME;
-}
 
 // コマンドの確認
 if (isset($_GET['cmd'])) {