From aebef7a60d7f434f41d126378c2c179996a46d20 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 8 Mar 2024 10:00:31 +0100 Subject: [PATCH] Use full path, to be compatible both on localhost and on GitHub page. --- screenshots/html/data.js | 1 - screenshots/html/script.js | 23 ++++++++++++++++------- tools/test/generateAllScreenshots.py | 2 -- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/screenshots/html/data.js b/screenshots/html/data.js index 8d0ac4b94f..0eebccf159 100644 --- a/screenshots/html/data.js +++ b/screenshots/html/data.js @@ -1,7 +1,6 @@ // Generated file, do not edit export const screenshots = [ ["en","de",], -["./tests/uitests/src/test/snapshots/images","./screenshots/de",], ["ui_S_t[f.preferences.impl.about_AboutView_null_AboutView-Day-0_1_null_0,NEXUS_5,1.0,en]",1,], ["ui_S_t[f.login.impl.accountprovider_AccountProviderView_null_AccountProviderView-Day-0_1_null_0,NEXUS_5,1.0,en]",0,], ["ui_S_t[f.login.impl.accountprovider_AccountProviderView_null_AccountProviderView-Day-0_1_null_1,NEXUS_5,1.0,en]",0,], diff --git a/screenshots/html/script.js b/screenshots/html/script.js index 63656dfcb9..951ea260ba 100644 --- a/screenshots/html/script.js +++ b/screenshots/html/script.js @@ -15,8 +15,18 @@ */ import { screenshots } from './data.js'; +// Get the base url of the current page +const baseUrl = window.location.href.split('/').slice(0, -1).join('/'); +// On localhost, get the English screenshots from the location `../tests/uitests/src/test/snapshots/images` +const isLocalHost = window.location.hostname === "localhost" +let englishBasePath +if (isLocalHost) { + englishBasePath = `../tests/uitests/src/test/snapshots/images` +} else { + englishBasePath = `en` +} + const dataLanguages = screenshots[0]; -const dataPaths = screenshots[1]; // Read default visible languages from the fragment const fragment = new URLSearchParams(window.location.hash.substring(1)); @@ -121,10 +131,9 @@ function addTable() { languagesHeaderRow.appendChild(th); } const numVisibleLanguages = languagesHeaderRow.childElementCount - // Second item contains the paths // Next items are the data var currentHeaderValue = ""; - for (let screenshotIndex = 2; screenshotIndex < screenshots.length; screenshotIndex++) { + for (let screenshotIndex = 1; screenshotIndex < screenshots.length; screenshotIndex++) { let englishFile = screenshots[screenshotIndex][0]; const tr = document.createElement('tr'); let hasTranslatedFiles = false; @@ -134,10 +143,10 @@ function addTable() { } const td = document.createElement('td'); if (languageIndex == 0) { - const fullFile = `${dataPaths[0]}/${englishFile}.png`; + const fullFile = `${englishBasePath}/${englishFile}.png`; const img = document.createElement('img'); img.className = "screenshot"; - img.src = `../${fullFile}`; + img.src = `${baseUrl}/${fullFile}`; img.title = fullFile; img.alt = "Missing image"; img.width = imageWidth; @@ -153,10 +162,10 @@ function addTable() { hasTranslatedFiles = true; // Foreign file is the same as the english file, replacing the language const foreignFile = englishFile.replace("en]", `${dataLanguages[languageIndex]}]`).replace("_S_", "_T_") - const fullForeignFile = `${dataPaths[languageIndex]}/${foreignFile}.png`; + const fullForeignFile = `${dataLanguages[languageIndex]}/${foreignFile}.png`; const img = document.createElement('img'); img.className = "screenshot"; - img.src = `../${fullForeignFile}`; + img.src = `${baseUrl}/${fullForeignFile}`; img.title = fullForeignFile; img.alt = "Missing image"; img.width = imageWidth; diff --git a/tools/test/generateAllScreenshots.py b/tools/test/generateAllScreenshots.py index ae2f65c38c..d3b3f730fe 100755 --- a/tools/test/generateAllScreenshots.py +++ b/tools/test/generateAllScreenshots.py @@ -106,8 +106,6 @@ def generateJavascriptFile(): languages = detectRecordedLanguages() # First item is the list of languages, adding "en" at the beginning data = [["en"] + languages] - # Second item is the path of the containing file - data.append(["./tests/uitests/src/test/snapshots/images"] + ["./screenshots/" + l for l in languages]) files = sorted( os.listdir("tests/uitests/src/test/snapshots/images/"), key=lambda file: file[file.find("_", 6):],