Merge pull request #14755 from mrdoob/docs

mrdoob · web-flow · commit 5a415f8aa6bf · 2018-08-21T12:17:18.000-07:00
Docs: Added localisation support to manual pages.
diff --git a/docs/index.html b/docs/index.html
@@ -36,9 +36,9 @@ <h1><a href="http://threejs.org">three.js</a> / docs</h1>
 
 			// Route non-localised api links
 
-			if ( /^api/.test( hash ) && /^api\/(en|zh)\//.test( hash ) === false ) {
+			if ( /^(api|manual)/.test( hash ) && /^(api|manual)\/(en|zh)\//.test( hash ) === false ) {
 
-				window.location.hash = hash.replace( /^api/, 'api/en' );
+				window.location.hash = hash.replace( /^(api|manual)/, '$1/en' );
 
 			}
 
diff --git a/docs/list.js b/docs/list.js
@@ -3,28 +3,28 @@ var list = {
 	"Manual": {
 
 		"Getting Started": {
-			"Creating a scene": "manual/introduction/Creating-a-scene",
-			"Import via modules": "manual/introduction/Import-via-modules",
-			"Browser support": "manual/introduction/Browser-support",
-			"WebGL compatibility check": "manual/introduction/WebGL-compatibility-check",
-			"How to run things locally": "manual/introduction/How-to-run-things-locally",
-			"Drawing lines": "manual/introduction/Drawing-lines",
-			"Creating text": "manual/introduction/Creating-text",
-			"Loading 3D models": "manual/introduction/Loading-3D-models",
-			"Migration guide": "manual/introduction/Migration-guide",
-			"Code style guide": "manual/introduction/Code-style-guide",
-			"FAQ": "manual/introduction/FAQ",
-			"Useful links": "manual/introduction/Useful-links"
+			"Creating a scene": "manual/{lan}/introduction/Creating-a-scene",
+			"Import via modules": "manual/{lan}/introduction/Import-via-modules",
+			"Browser support": "manual/{lan}/introduction/Browser-support",
+			"WebGL compatibility check": "manual/{lan}/introduction/WebGL-compatibility-check",
+			"How to run things locally": "manual/{lan}/introduction/How-to-run-things-locally",
+			"Drawing lines": "manual/{lan}/introduction/Drawing-lines",
+			"Creating text": "manual/{lan}/introduction/Creating-text",
+			"Loading 3D models": "manual/{lan}/introduction/Loading-3D-models",
+			"Migration guide": "manual/{lan}/introduction/Migration-guide",
+			"Code style guide": "manual/{lan}/introduction/Code-style-guide",
+			"FAQ": "manual/{lan}/introduction/FAQ",
+			"Useful links": "manual/{lan}/introduction/Useful-links"
 		},
 
 		"Next Steps": {
-			"How to update things": "manual/introduction/How-to-update-things",
-			"Matrix transformations": "manual/introduction/Matrix-transformations",
-			"Animation system": "manual/introduction/Animation-system"
+			"How to update things": "manual/{lan}/introduction/How-to-update-things",
+			"Matrix transformations": "manual/{lan}/introduction/Matrix-transformations",
+			"Animation system": "manual/{lan}/introduction/Animation-system"
 		},
 
 		"Build Tools": {
-			"Testing with NPM": "manual/buildTools/Testing-with-NPM"
+			"Testing with NPM": "manual/{lan}/buildTools/Testing-with-NPM"
 		}
 
 	},
diff --git a/docs/manual/en/buildTools/Testing-with-NPM.html b/docs/manual/en/buildTools/Testing-with-NPM.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Animation-system.html b/docs/manual/en/introduction/Animation-system.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8" />
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Browser-support.html b/docs/manual/en/introduction/Browser-support.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
 	<meta charset="utf-8">
-	<base href="../../" />
+	<base href="../../../" />
 	<script src="list.js"></script>
 	<script src="page.js"></script>
 	<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Code-style-guide.html b/docs/manual/en/introduction/Code-style-guide.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Creating-a-scene.html b/docs/manual/en/introduction/Creating-a-scene.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Creating-text.html b/docs/manual/en/introduction/Creating-text.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Drawing-lines.html b/docs/manual/en/introduction/Drawing-lines.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/FAQ.html b/docs/manual/en/introduction/FAQ.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/How-to-run-things-locally.html b/docs/manual/en/introduction/How-to-run-things-locally.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/How-to-update-things.html b/docs/manual/en/introduction/How-to-update-things.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Import-via-modules.html b/docs/manual/en/introduction/Import-via-modules.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Loading-3D-models.html b/docs/manual/en/introduction/Loading-3D-models.html
@@ -3,7 +3,7 @@
 
 <head>
   <meta charset="utf-8">
-  <base href="../../" />
+  <base href="../../../" />
   <script src="list.js"></script>
   <script src="page.js"></script>
   <link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Matrix-transformations.html b/docs/manual/en/introduction/Matrix-transformations.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Migration-guide.html b/docs/manual/en/introduction/Migration-guide.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/Useful-links.html b/docs/manual/en/introduction/Useful-links.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />
diff --git a/docs/manual/en/introduction/WebGL-compatibility-check.html b/docs/manual/en/introduction/WebGL-compatibility-check.html
@@ -2,7 +2,7 @@
 <html lang="en">
 	<head>
 		<meta charset="utf-8">
-		<base href="../../" />
+		<base href="../../../" />
 		<script src="list.js"></script>
 		<script src="page.js"></script>
 		<link type="text/css" rel="stylesheet" href="page.css" />

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ <h1><a href="http://threejs.org">three.js</a> / docs</h1>`
`36`	`36`
`37`	`37`	`// Route non-localised api links`
`38`	`38`
`39`		`- if ( /^api/.test( hash ) && /^api\/(en\|zh)\//.test( hash ) === false ) {`
	`39`	`+ if ( /^(api\|manual)/.test( hash ) && /^(api\|manual)\/(en\|zh)\//.test( hash ) === false ) {`
`40`	`40`
`41`		`- window.location.hash = hash.replace( /^api/, 'api/en' );`
	`41`	`+ window.location.hash = hash.replace( /^(api\|manual)/, '$1/en' );`
`42`	`42`
`43`	`43`	`}`
`44`	`44`