From dfccdd465d379248e05870dea0e722fbe8c6447a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 15 Apr 2024 11:29:47 +0200 Subject: [PATCH 1/3] Gh Page: ensure that a row always have the same amount of cells. --- screenshots/html/script.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/screenshots/html/script.js b/screenshots/html/script.js index 5e4fb18133..48ee6746e2 100644 --- a/screenshots/html/script.js +++ b/screenshots/html/script.js @@ -191,6 +191,13 @@ function createMissingImageElement() { return text; } +function createUpToDateImageElement() { + const text = document.createElement('p'); + text.className = "missing"; + text.textContent = 'Image not updated'; + return text; +} + function convertToHumanReadableDate(modifiedDayTime) { var date = new Date(modifiedDayTime * 86400000); return date.toLocaleDateString(); @@ -270,6 +277,8 @@ function addTable() { const foreignFile = englishFile.replace("en]", `${dataLanguages[languageIndex]}]`).replace("_S_", "_T_") const fullForeignFile = `${dataLanguages[languageIndex]}/${foreignFile}.png`; td.appendChild(createImageElement(fullForeignFile, modifiedDayTime)); + } else { + td.appendChild(createUpToDateImageElement()); } } tr.appendChild(td); From 52a2cc2384bc64568ff8442cf47337fd544475e6 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 15 Apr 2024 11:31:41 +0200 Subject: [PATCH 2/3] Hide the data picker form, let first check how it behaves in prod using the URL parameter only. I believe this will not work in prod since the file are copied after the data.js is generated. --- screenshots/html/script.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/screenshots/html/script.js b/screenshots/html/script.js index 48ee6746e2..d6b7690532 100644 --- a/screenshots/html/script.js +++ b/screenshots/html/script.js @@ -149,6 +149,7 @@ function addForm() { }; label2.appendChild(input2); form.appendChild(label2); + /* // Add a date picker to input the minimum date of modification const label3 = document.createElement('label'); label3.textContent = 'If modified since:'; @@ -168,6 +169,7 @@ function addForm() { addTable(); }; form.appendChild(dateInput); + */ // Add a span with id result to display the number of lines const lines = document.createElement('span'); lines.id = 'lines'; From bb8db57cc7fdfffe3c700f7ed28031bd8beebe96 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 15 Apr 2024 11:38:00 +0200 Subject: [PATCH 3/3] Use today's date for new files. --- tools/test/generateAllScreenshots.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/test/generateAllScreenshots.py b/tools/test/generateAllScreenshots.py index e92f69b0fd..0018833c1c 100755 --- a/tools/test/generateAllScreenshots.py +++ b/tools/test/generateAllScreenshots.py @@ -18,6 +18,7 @@ import os import re import sys +import time from util import compare @@ -134,6 +135,9 @@ def generateJavascriptFile(): if os.path.exists(translatedFile): # Get the last modified date of the file in seconds and round to days date = os.popen("git log -1 --format=%ct -- \"" + translatedFile + "\"").read().strip() + # if date is empty, use today's date + if date == "": + date = time.time() dateDay = int(date) // 86400 dataForFile.append(dateDay) else: