Skip to content

Commit

Permalink
more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@steveseguin
steveseguin committed Dec 22, 2024
1 parent 5e37f65 commit 578793f
Show file tree
Hide file tree
Showing 2 changed files with 98 additions and 21 deletions.
14 changes: 11 additions & 3 deletions translations/test.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,15 @@
"placeholders": {
"optional": "optional"
},
"miscellaneous": {
"test": "test"
}
"miscellaneous": {
"test": "est-tay",
"winner-selected": "inner-way elected-say",
"winners-selected": "inners-way elected-say",
"entry-in-the-draw!": " entry-ay in-ay e-thay aw-dray!",
"entries-in-the-draw!": " entries-ay in-ay e-thay aw-dray!",
"no-entries-remain": "o-nay entries-ay emain-ray",
"entry-remain": " entry-ay emain-ray",
"entries-remain": " entries-ay emain-ray",
"no-entries-in-draw-yet": "o-nay entries-ay et-yay in-ay e-thay aw-dray!"
}
}
105 changes: 87 additions & 18 deletions waitlist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@
::-webkit-scrollbar-thumb:hover {
background: rgba(255, 255, 255, 0.4);
}

#waitlist:empty{
display:none;
}
</style>
</head>
<body class="electronDraggable scrolllll" id="output">
Expand Down Expand Up @@ -354,6 +358,71 @@
getById("output").style.opacity = urlParams.get("opacity") || 0.3
}



var translation = {};

var miscTranslations = {
"winner-selected": "Winner selected",
"winners-selected": "Winners selected",
"entry-in-the-draw!": " entry in the draw!",
"entries-in-the-draw!": " entries in the draw!",
"no-entries-remain": "No entries remain",
"entry-remain": " entry remain",
"entries-remain": " entries remain",
"no-entries-in-draw-yet": "No entries yet in the draw!"
};


async function fetchWithTimeout(URL, timeout = 8000) {
// ref: https://dmitripavlutin.com/timeout-fetch-request/
try {
const controller = new AbortController();
const timeout_id = setTimeout(() => controller.abort(), timeout);
const response = await fetch(URL, { ...{ timeout: timeout }, signal: controller.signal });
clearTimeout(timeout_id);
return response;
} catch (e) {
return await fetch(URL);
}
}
async function changeLg(lang) {
console.log("changeLg: " + lang);
if (!lang) {
translate = false;
return;
}
return await fetchWithTimeout("./translations/" + lang + ".json", 2000)
.then(async function (response) {
try {
if (response.status !== 200) {
return;
}
await response
.json()
.then(function (data) {
if (data.miscellaneous) {
Object.keys(data.miscellaneous).forEach(key => {
miscTranslations[key] = data.miscellaneous[key];
});
}
data.miscellaneous = miscTranslations;
translation = data;
console.log(miscTranslations);
})
.catch(function (e) {
});
} catch (e) {
}
})
.catch(function (err) {
});
}

if (urlParams.has("language") || urlParams.has("lang") || urlParams.has("ln")) {
changeLg(urlParams.has("language") || urlParams.has("lang") || urlParams.has("ln"));
}

var conCon = 1;
var socketserver = false;
var serverURL = "wss://io.socialstream.ninja/extension";
Expand Down Expand Up @@ -599,22 +668,22 @@

if (data.winlist.length>1){
createConfetti(confettiFall);
document.getElementById("waitlisttitle").innerHTML = "Winners selected";
document.getElementById("waitlisttitle").innerHTML = miscTranslations["winners-selected"];
} else {
createConfetti(confettiFall);
document.getElementById("waitlisttitle").innerHTML = "Winner selected";
document.getElementById("waitlisttitle").innerHTML = miscTranslations["winner-selected"]
}

winnerSelected = true;
if ("drawPoolSize" in data){
let entries = parseInt(data.drawPoolSize) || 0;

if (!entries){
document.getElementById("waitlistsupertitle").innerHTML = "No entries remain";
document.getElementById("waitlistsupertitle").innerHTML = miscTranslations["no-entries-remain"];
} else if (entries==1){
document.getElementById("waitlistsupertitle").innerHTML = entries + " entry remain";
document.getElementById("waitlistsupertitle").innerHTML = entries + miscTranslations["entry-remain"];
} else {
document.getElementById("waitlistsupertitle").innerHTML = entries + " entries remain";
document.getElementById("waitlistsupertitle").innerHTML = entries + miscTranslations["entries-remain"];
}
}

Expand All @@ -626,11 +695,11 @@
document.getElementById("waitlistsupertitle").innerHTML = "";
let entries = parseInt(data.drawPoolSize) || 0;
if (!entries){
document.getElementById("waitlist").innerHTML = "No entries yet in the draw!";
document.getElementById("waitlist").innerHTML = miscTranslations["no-entries-in-draw-yet"];
} else if (entries==1){
document.getElementById("waitlist").innerHTML = entries + " entry in the draw!";
document.getElementById("waitlist").innerHTML = entries + miscTranslations["entry-in-the-draw!"];
} else {
document.getElementById("waitlist").innerHTML = entries + " entries in the draw!";
document.getElementById("waitlist").innerHTML = entries + miscTranslations["entries-in-the-draw!"];
}
}
}
Expand All @@ -642,21 +711,21 @@
let entries = parseInt(data.drawPoolSize) || 0;
document.getElementById("waitlistsupertitle").innerHTML = "";
if (!entries){
document.getElementById("waitlist").innerHTML = "No entries yet in the draw!";
document.getElementById("waitlist").innerHTML = miscTranslations["no-entries-in-draw-yet"];
} else if (entries==1){
document.getElementById("waitlist").innerHTML = entries + " entry in the draw!";
document.getElementById("waitlist").innerHTML = entries + miscTranslations["entry-in-the-draw!"];
} else {
document.getElementById("waitlist").innerHTML = entries + " entries in the draw!";
document.getElementById("waitlist").innerHTML = entries + miscTranslations["entries-in-the-draw!"];
}
} else {
let entries = parseInt(data.drawPoolSize) || 0;

if (!entries){
document.getElementById("waitlistsupertitle").innerHTML = "No entries remain";
document.getElementById("waitlistsupertitle").innerHTML = miscTranslations["no-entries-remain"];
} else if (entries==1){
document.getElementById("waitlistsupertitle").innerHTML = entries + " entry remain";
document.getElementById("waitlistsupertitle").innerHTML = entries + miscTranslations["entry-remain"];
} else {
document.getElementById("waitlistsupertitle").innerHTML = entries + " entries remain";
document.getElementById("waitlistsupertitle").innerHTML = entries + miscTranslations["entries-remain"];
}
}

Expand Down Expand Up @@ -725,18 +794,18 @@
if (drawmode && winnerStatus && data.waitlistmessage){
if (winnerStatus>1){
createConfetti(confettiFall);
document.getElementById("waitlisttitle").innerHTML = "Winners selected";
document.getElementById("waitlisttitle").innerHTML = miscTranslations["winners-selected"];
} else {
createConfetti(confettiFall);
document.getElementById("waitlisttitle").innerHTML = "Winner selected";
document.getElementById("waitlisttitle").innerHTML = miscTranslations["winner-selected"];
}

} else if (drawmode){
document.getElementById("waitlistsupertitle").innerHTML = "";
if (entries==1){
document.getElementById("waitlist").innerHTML = entries + " entry in the draw!";
document.getElementById("waitlist").innerHTML = entries + miscTranslations["entry-in-the-draw!"];
} else {
document.getElementById("waitlist").innerHTML = entries + " entries in the draw!";
document.getElementById("waitlist").innerHTML = entries + miscTranslations["entries-in-the-draw!"];
}

} else if (winnerStatus && data.waitlistmessage){
Expand Down

0 comments on commit 578793f

Please sign in to comment.