sillsdev · imnasnainaec · Jul 18, 2023 · Jul 7, 2023 · Jul 10, 2023 · Jul 10, 2023
diff --git a/docs/user_guide/mkdocs.yml → docs/user_guide/config/en/mkdocs.yml b/docs/user_guide/mkdocs.yml → docs/user_guide/config/en/mkdocs.yml
@@ -1,6 +1,7 @@
 strict: true
 theme:
   name: material
+  custom_dir: "../../default/"
   palette:
     primary: blue
   icon:
@@ -15,13 +16,16 @@ theme:
     - search.share
     - search.suggest
 site_name: The Combine
+docs_dir: "../../docs/en"
+site_dir: "../../site/en"
 use_directory_urls: false
 repo_url: https://github.com/sillsdev/TheCombine
 edit_uri: edit/master/docs/user_guide/docs/
 repo_name: sillsdev/TheCombine
 copyright: © 2019-2023 SIL International
 plugins:
-  - search
+  - search:
+      lang: en
   # This plugin is used to validate URLs (including some anchors).
   # Uncomment to build the docs with this validation enabled.
   # This is commented out by default because this requires network I/O to validate URLs, so it is

diff --git a/..._guide/docs/images/announcementBanner.png → ...ide/default/images/announcementBanner.png b/..._guide/docs/images/announcementBanner.png → ...ide/default/images/announcementBanner.png
diff --git a/...e/docs/images/characterInventoryPanel.png → ...efault/images/characterInventoryPanel.png b/...e/docs/images/characterInventoryPanel.png → ...efault/images/characterInventoryPanel.png
diff --git a/...e/docs/images/characterInventoryTiles.png → ...efault/images/characterInventoryTiles.png b/...e/docs/images/characterInventoryTiles.png → ...efault/images/characterInventoryTiles.png
diff --git a/...ages/data-entry-dup-vern-select-entry.png → ...ages/data-entry-dup-vern-select-entry.png b/...ages/data-entry-dup-vern-select-entry.png → ...ages/data-entry-dup-vern-select-entry.png
diff --git a/...ages/data-entry-dup-vern-select-sense.png → ...ages/data-entry-dup-vern-select-sense.png b/...ages/data-entry-dup-vern-select-sense.png → ...ages/data-entry-dup-vern-select-sense.png
diff --git a/...guide/docs/images/data-entry-dup-vern.png → ...de/default/images/data-entry-dup-vern.png b/...guide/docs/images/data-entry-dup-vern.png → ...de/default/images/data-entry-dup-vern.png
diff --git a/docs/user_guide/docs/images/favicon.ico → docs/user_guide/default/images/favicon.ico b/docs/user_guide/docs/images/favicon.ico → docs/user_guide/default/images/favicon.ico
diff --git a/docs/user_guide/docs/images/login.png → docs/user_guide/default/images/login.png b/docs/user_guide/docs/images/login.png → docs/user_guide/default/images/login.png
diff --git a/docs/user_guide/docs/images/loginBanner.png → ...user_guide/default/images/loginBanner.png b/docs/user_guide/docs/images/loginBanner.png → ...user_guide/default/images/loginBanner.png
diff --git a/docs/user_guide/docs/images/mergeDelete.png → ...user_guide/default/images/mergeDelete.png b/docs/user_guide/docs/images/mergeDelete.png → ...user_guide/default/images/mergeDelete.png
diff --git a/docs/user_guide/docs/images/mergeDeleted.png → ...ser_guide/default/images/mergeDeleted.png b/docs/user_guide/docs/images/mergeDeleted.png → ...ser_guide/default/images/mergeDeleted.png
diff --git a/.../user_guide/docs/images/mergeEditFlag.png → ...er_guide/default/images/mergeEditFlag.png b/.../user_guide/docs/images/mergeEditFlag.png → ...er_guide/default/images/mergeEditFlag.png
diff --git a/docs/user_guide/docs/images/mergeFlag.png → docs/user_guide/default/images/mergeFlag.png b/docs/user_guide/docs/images/mergeFlag.png → docs/user_guide/default/images/mergeFlag.png
diff --git a/docs/user_guide/docs/images/mergeFlagged.png → ...ser_guide/default/images/mergeFlagged.png b/docs/user_guide/docs/images/mergeFlagged.png → ...ser_guide/default/images/mergeFlagged.png
diff --git a/docs/user_guide/docs/images/mergeMerge.png → .../user_guide/default/images/mergeMerge.png b/docs/user_guide/docs/images/mergeMerge.png → .../user_guide/default/images/mergeMerge.png
diff --git a/docs/user_guide/docs/images/mergeMove.png → docs/user_guide/default/images/mergeMove.png b/docs/user_guide/docs/images/mergeMove.png → docs/user_guide/default/images/mergeMove.png
diff --git a/...uide/docs/images/mergeSaveAndContinue.png → ...e/default/images/mergeSaveAndContinue.png b/...uide/docs/images/mergeSaveAndContinue.png → ...e/default/images/mergeSaveAndContinue.png
diff --git a/...ges/mergeSenseDefinitionsPartOfSpeech.png → ...ges/mergeSenseDefinitionsPartOfSpeech.png b/...ges/mergeSenseDefinitionsPartOfSpeech.png → ...ges/mergeSenseDefinitionsPartOfSpeech.png
diff --git a/docs/user_guide/docs/images/mergeSidebar.png → ...ser_guide/default/images/mergeSidebar.png b/docs/user_guide/docs/images/mergeSidebar.png → ...ser_guide/default/images/mergeSidebar.png
diff --git a/...er_guide/docs/images/mergeSidebarMove.png → ...guide/default/images/mergeSidebarMove.png b/...er_guide/docs/images/mergeSidebarMove.png → ...guide/default/images/mergeSidebarMove.png
diff --git a/docs/user_guide/docs/images/mergeSkip.png → docs/user_guide/default/images/mergeSkip.png b/docs/user_guide/docs/images/mergeSkip.png → docs/user_guide/default/images/mergeSkip.png
diff --git a/docs/user_guide/docs/images/mergeTwo.png → docs/user_guide/default/images/mergeTwo.png b/docs/user_guide/docs/images/mergeTwo.png → docs/user_guide/default/images/mergeTwo.png
diff --git a/...uide/docs/images/projectCreateTzotzil.png → ...e/default/images/projectCreateTzotzil.png b/...uide/docs/images/projectCreateTzotzil.png → ...e/default/images/projectCreateTzotzil.png
diff --git a/...e/docs/images/projectLanguagesTzotzil.png → ...efault/images/projectLanguagesTzotzil.png b/...e/docs/images/projectLanguagesTzotzil.png → ...efault/images/projectLanguagesTzotzil.png
diff --git a/...ser_guide/docs/images/projectSchedule.png → ..._guide/default/images/projectSchedule.png b/...ser_guide/docs/images/projectSchedule.png → ..._guide/default/images/projectSchedule.png
diff --git a/..._guide/docs/images/projectStatsButton.png → ...ide/default/images/projectStatsButton.png b/..._guide/docs/images/projectStatsButton.png → ...ide/default/images/projectStatsButton.png
diff --git a/...uide/docs/images/reviewEntriesColumns.png → ...e/default/images/reviewEntriesColumns.png b/...uide/docs/images/reviewEntriesColumns.png → ...e/default/images/reviewEntriesColumns.png
diff --git a/docs/user_guide/docs/images/userMenu.png → docs/user_guide/default/images/userMenu.png b/docs/user_guide/docs/images/userMenu.png → docs/user_guide/default/images/userMenu.png
diff --git a/.../user_guide/docs/images/userMenuAdmin.png → ...er_guide/default/images/userMenuAdmin.png b/.../user_guide/docs/images/userMenuAdmin.png → ...er_guide/default/images/userMenuAdmin.png
diff --git a/..._guide/docs/licenses/backend_licenses.txt → ...ide/default/licenses/backend_licenses.txt b/..._guide/docs/licenses/backend_licenses.txt → ...ide/default/licenses/backend_licenses.txt
diff --git a/...guide/docs/licenses/frontend_licenses.txt → ...de/default/licenses/frontend_licenses.txt b/...guide/docs/licenses/frontend_licenses.txt → ...de/default/licenses/frontend_licenses.txt
diff --git a/...r_guide/docs/static/stylesheets/extra.css → ...uide/default/static/stylesheets/extra.css b/...r_guide/docs/static/stylesheets/extra.css → ...uide/default/static/stylesheets/extra.css
diff --git a/docs/user_guide/docs/account.md → docs/user_guide/docs/en/account.md b/docs/user_guide/docs/account.md → docs/user_guide/docs/en/account.md
diff --git a/docs/user_guide/docs/admin.md → docs/user_guide/docs/en/admin.md b/docs/user_guide/docs/admin.md → docs/user_guide/docs/en/admin.md
diff --git a/docs/user_guide/docs/dataEntry.md → docs/user_guide/docs/en/dataEntry.md b/docs/user_guide/docs/dataEntry.md → docs/user_guide/docs/en/dataEntry.md
diff --git a/docs/user_guide/docs/goals.md → docs/user_guide/docs/en/goals.md b/docs/user_guide/docs/goals.md → docs/user_guide/docs/en/goals.md
diff --git a/docs/user_guide/docs/index.md → docs/user_guide/docs/en/index.md b/docs/user_guide/docs/index.md → docs/user_guide/docs/en/index.md
diff --git a/docs/user_guide/docs/project.md → docs/user_guide/docs/en/project.md b/docs/user_guide/docs/project.md → docs/user_guide/docs/en/project.md
diff --git a/nginx/templates/default_http_and_https.conf b/nginx/templates/default_http_and_https.conf
@@ -85,7 +85,7 @@ server {
 
     # User Guide static files.
     location /docs {
-        alias      /usr/share/nginx/user_guide;
+        alias      /usr/share/nginx/user_guide/en;
         index      index.html index.htm;
         expires    12h;
         add_header Cache-Control "public, no-transform";

diff --git a/nginx/templates/default_http_only.conf b/nginx/templates/default_http_only.conf
@@ -66,7 +66,7 @@ server {
 
     # User Guide static files.
     location /docs {
-        alias       /usr/share/nginx/user_guide;
+        alias       /usr/share/nginx/user_guide/en;
         index      index.html index.htm;
         expires     12h;
         add_header Cache-Control "public, no-transform";

diff --git a/package.json b/package.json
@@ -17,9 +17,9 @@
     "fmt-frontend-check": "prettier --check \"./{.github,.vscode,certmgr,deploy,docs,public,scripts,src}/**/*.{js,jsx,ts,tsx,json,md,yml,yaml}\"",
     "frontend": "npm run set-release && react-scripts start",
     "gen-backend-coverage-report": "tsc scripts/genBackendCoverageReport.ts && node scripts/genBackendCoverageReport.js",
-    "license-report-backend": " dotnet-project-licenses --include-transitive --input ./Backend/BackendFramework.csproj --output --outfile docs/user_guide/docs/licenses/backend_licenses.txt",
+    "license-report-backend": " dotnet-project-licenses --include-transitive --input ./Backend/BackendFramework.csproj --output --outfile docs/user_guide/docs/default/licenses/backend_licenses.txt",
     "license-summary-backend": "dotnet-project-licenses --include-transitive --input ./Backend/BackendFramework.csproj",
-    "license-report-frontend": " npm install && license-checker-rseidelsohn --production --excludePrivatePackages --plainVertical --out docs/user_guide/docs/licenses/frontend_licenses.txt",
+    "license-report-frontend": " npm install && license-checker-rseidelsohn --production --excludePrivatePackages --plainVertical --out docs/user_guide/docs/default/licenses/frontend_licenses.txt",
     "license-summary-frontend": "npm install && license-checker-rseidelsohn --production --excludePrivatePackages --summary",
     "lint": "           eslint --max-warnings=0 --ext js,ts,tsx,jsx src",
     "lint:fix-layout": "eslint --max-warnings=0 --ext js,ts,tsx,jsx src --fix --fix-type layout,suggestion",

diff --git a/tox.ini b/tox.ini
@@ -48,21 +48,21 @@ commands =
 [testenv:user-guide]
 deps =
     -r{toxinidir}/dev-requirements.txt
-changedir = {toxinidir}/docs/user_guide
+changedir = {toxinidir}/docs/user_guide/config/en
 commands =
     mkdocs build
 
 [testenv:user-guide-serve]
 deps =
     -r{toxinidir}/dev-requirements.txt
-changedir = {toxinidir}/docs/user_guide
+changedir = {toxinidir}/docs/user_guide/config/en
 commands =
     mkdocs serve
 
 [testenv:user-guide-github-pages]
 deps =
     -r{toxinidir}/dev-requirements.txt
-changedir = {toxinidir}/docs/user_guide
+changedir = {toxinidir}/docs/user_guide/config/en
 commands =
     # See: https://squidfunk.github.io/mkdocs-material/publishing-your-site/
     mkdocs gh-deploy --force