Andromeda/jank-client-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more translation progress

Browse source 
I'm done for the night, I need sleep lol
This commit is contained in:
MathMan05 2024-10-31 23:54:17 -05:00
parent a0d870c1b3
commit 4e7d181a14
4 changed files with 118 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/webpage/i18n.ts
View file

@ -38,6 +38,7 @@ class I18n{
for(const thing of path){ for(const thing of path){
if(typeof jsont !== "string" ){ if(typeof jsont !== "string" ){
jsont=jsont[thing]; jsont=jsont[thing];
}else{ }else{
jsont=json; jsont=json;
break; break;

10
src/webpage/invite.ts
View file

@ -1,3 +1,4 @@
import { I18n } from "./i18n.js";
import{ getBulkUsers, Specialuser, getapiurls }from"./login.js"; import{ getBulkUsers, Specialuser, getapiurls }from"./login.js";
(async ()=>{ (async ()=>{
@ -38,10 +39,9 @@ import{ getBulkUsers, Specialuser, getapiurls }from"./login.js";
}else{ }else{
urls = joinable[0].serverurls; urls = joinable[0].serverurls;
} }
await I18n.done;
if(!joinable.length){ if(!joinable.length){
document.getElementById("AcceptInvite")!.textContent = document.getElementById("AcceptInvite")!.textContent = I18n.getTranslation("noAccount");
"Create an account to accept the invite";
} }
const code = window.location.pathname.split("/")[2]; const code = window.location.pathname.split("/")[2];
@ -57,7 +57,7 @@ document.getElementById("AcceptInvite")!.textContent =
document.getElementById("invitename")!.textContent = guildjson.name; document.getElementById("invitename")!.textContent = guildjson.name;
document.getElementById( document.getElementById(
"invitedescription" "invitedescription"
)!.textContent = `${json.inviter.username} invited you to join ${guildjson.name}`; )!.textContent = I18n.getTranslation("invite.longInvitedBy",json.inviter.username,guildjson.name)
if(guildjson.icon){ if(guildjson.icon){
const img = document.createElement("img"); const img = document.createElement("img");
img.src = `${urls!.cdn}/icons/${guildjson.id}/${guildjson.icon}.png`; img.src = `${urls!.cdn}/icons/${guildjson.id}/${guildjson.icon}.png`;
@ -120,7 +120,7 @@ document.getElementById("inviteimg")!.append(div);
const td = document.createElement("div"); const td = document.createElement("div");
td.classList.add("switchtable"); td.classList.add("switchtable");
td.textContent = "Login or create an account ⇌"; td.textContent = I18n.getTranslation("invite.loginOrCreateAccount");
td.addEventListener("click", ()=>{ td.addEventListener("click", ()=>{
const l = new URLSearchParams("?"); const l = new URLSearchParams("?");
l.set("goback", window.location.href); l.set("goback", window.location.href);

139
src/webpage/localuser.ts
View file

@ -284,10 +284,7 @@ class Localuser{
else this.errorBackoff++; else this.errorBackoff++;
this.connectionSucceed = 0; this.connectionSucceed = 0;
(document.getElementById("load-desc") as HTMLElement).innerHTML = (document.getElementById("load-desc") as HTMLElement).innerHTML = I18n.getTranslation("errorReconnect",Math.round(0.2 + this.errorBackoff * 2.8)+"")
"Unable to connect to the Spacebar server, retrying in <b>" +
Math.round(0.2 + this.errorBackoff * 2.8) +
"</b> seconds...";
switch( switch(
this.errorBackoff //try to recover from bad domain this.errorBackoff //try to recover from bad domain
){ ){
@ -331,8 +328,7 @@ class Localuser{
} }
setTimeout(()=>{ setTimeout(()=>{
if(this.swapped)return; if(this.swapped)return;
(document.getElementById("load-desc") as HTMLElement).textContent = (document.getElementById("load-desc") as HTMLElement).textContent =I18n.getTranslation("retrying");
"Retrying...";
this.initwebsocket().then(()=>{ this.initwebsocket().then(()=>{
this.loaduser(); this.loaduser();
this.init(); this.init();
@ -343,10 +339,8 @@ class Localuser{
}); });
}, 200 + this.errorBackoff * 2800); }, 200 + this.errorBackoff * 2800);
}else }else
(document.getElementById("load-desc") as HTMLElement).textContent = (document.getElementById("load-desc") as HTMLElement).textContent = I18n.getTranslation("unableToConnect")
"Unable to connect to the Spacebar server. Please try logging out and back in.";
}); });
await promise; await promise;
} }
async handleEvent(temp: wsjson){ async handleEvent(temp: wsjson){
@ -650,10 +644,10 @@ class Localuser{
category.classList.add("memberList"); category.classList.add("memberList");
let title=document.createElement("h3"); let title=document.createElement("h3");
if(role==="offline"){ if(role==="offline"){
title.textContent="Offline"; title.textContent=I18n.getTranslation("user.offline");
category.classList.add("offline"); category.classList.add("offline");
}else if(role==="online"){ }else if(role==="online"){
title.textContent="Online"; title.textContent=I18n.getTranslation("user.online");
}else{ }else{
title.textContent=role.name; title.textContent=role.name;
} }
@ -734,12 +728,9 @@ class Localuser{
} }
} }
loaduser(): void{ loaduser(): void{
(document.getElementById("username") as HTMLSpanElement).textContent = (document.getElementById("username") as HTMLSpanElement).textContent = this.user.username;
this.user.username; (document.getElementById("userpfp") as HTMLImageElement).src = this.user.getpfpsrc();
(document.getElementById("userpfp") as HTMLImageElement).src = (document.getElementById("status") as HTMLSpanElement).textContent = this.status;
this.user.getpfpsrc();
(document.getElementById("status") as HTMLSpanElement).textContent =
this.status;
} }
isAdmin(): boolean{ isAdmin(): boolean{
if(this.lookingguild){ if(this.lookingguild){
@ -854,12 +845,12 @@ class Localuser{
"tabs", "tabs",
[ [
[ [
"Join using invite", I18n.getTranslation("invite.joinUsing"),
[ [
"vdiv", "vdiv",
[ [
"textbox", "textbox",
"Invite Link/Code", I18n.getTranslation("invite.inviteLinkCode"),
"", "",
function(this: HTMLInputElement){ function(this: HTMLInputElement){
inviteurl = this.value; inviteurl = this.value;
@ -869,7 +860,7 @@ class Localuser{
[ [
"button", "button",
"", "",
"Submit", I18n.getTranslation("submit"),
(_: any)=>{ (_: any)=>{
let parsed = ""; let parsed = "";
if(inviteurl.includes("/")){ if(inviteurl.includes("/")){
@ -893,13 +884,13 @@ class Localuser{
], ],
], ],
[ [
"Create Guild", I18n.getTranslation("guild.create"),
[ [
"vdiv", "vdiv",
["title", "Create a guild"], ["title", I18n.getTranslation("guild.create")],
[ [
"fileupload", "fileupload",
"Icon: ", I18n.getTranslation("guild.icon:"),
function(event: Event){ function(event: Event){
const target = event.target as HTMLInputElement; const target = event.target as HTMLInputElement;
if(!target.files)return; if(!target.files)return;
@ -912,7 +903,7 @@ class Localuser{
], ],
[ [
"textbox", "textbox",
"Name:", I18n.getTranslation("guild.name:"),
"", "",
function(this: HTMLInputElement, event: Event){ function(this: HTMLInputElement, event: Event){
const target = event.target as HTMLInputElement; const target = event.target as HTMLInputElement;
@ -922,7 +913,7 @@ class Localuser{
[ [
"button", "button",
"", "",
"Submit", I18n.getTranslation("submit"),
()=>{ ()=>{
this.makeGuild(fields).then(_=>{ this.makeGuild(fields).then(_=>{
if(_.message){ if(_.message){
@ -951,7 +942,7 @@ class Localuser{
async guildDiscovery(){ async guildDiscovery(){
const content = document.createElement("div"); const content = document.createElement("div");
content.classList.add("flexttb","guildy"); content.classList.add("flexttb","guildy");
content.textContent = "Loading..."; content.textContent = I18n.getTranslation("guild.loadingDiscovery");
const full = new Dialog(["html", content]); const full = new Dialog(["html", content]);
full.show(); full.show();
@ -962,7 +953,7 @@ class Localuser{
content.innerHTML = ""; content.innerHTML = "";
const title = document.createElement("h2"); const title = document.createElement("h2");
title.textContent = "Guild discovery (" + json.total + " entries)"; title.textContent = I18n.getTranslation("guild.disoveryTitle");
content.appendChild(title); content.appendChild(title);
const guilds = document.createElement("div"); const guilds = document.createElement("div");
@ -976,13 +967,7 @@ class Localuser{
const banner = document.createElement("img"); const banner = document.createElement("img");
banner.classList.add("banner"); banner.classList.add("banner");
banner.crossOrigin = "anonymous"; banner.crossOrigin = "anonymous";
banner.src = banner.src =this.info.cdn +"/icons/" +guild.id +"/" +guild.banner +".png?size=256";
this.info.cdn +
"/icons/" +
guild.id +
"/" +
guild.banner +
".png?size=256";
banner.alt = ""; banner.alt = "";
content.appendChild(banner); content.appendChild(banner);
} }
@ -1092,9 +1077,9 @@ class Localuser{
}); });
} }
async showusersettings(){ async showusersettings(){
const settings = new Settings("Settings"); const settings = new Settings(I18n.getTranslation("localuser.settings"));
{ {
const userOptions = settings.addButton("User Settings", { ltr: true }); const userOptions = settings.addButton(I18n.getTranslation("localuser.userSettings"), { ltr: true });
const hypotheticalProfile = document.createElement("div"); const hypotheticalProfile = document.createElement("div");
let file: undefined | File | null; let file: undefined | File | null;
let newpronouns: string | undefined; let newpronouns: string | undefined;
@ -1113,7 +1098,7 @@ class Localuser{
settingsRight.addHTMLArea(hypotheticalProfile); settingsRight.addHTMLArea(hypotheticalProfile);
const finput = settingsLeft.addFileInput( const finput = settingsLeft.addFileInput(
"Upload pfp:", I18n.getTranslation("uploadPfp"),
_=>{ _=>{
if(file){ if(file){
this.updatepfp(file); this.updatepfp(file);
@ -1139,7 +1124,7 @@ class Localuser{
}); });
let bfile: undefined | File | null; let bfile: undefined | File | null;
const binput = settingsLeft.addFileInput( const binput = settingsLeft.addFileInput(
"Upload banner:", I18n.getTranslation("uploadBanner"),
_=>{ _=>{
if(bfile !== undefined){ if(bfile !== undefined){
this.updatebanner(bfile); this.updatebanner(bfile);
@ -1165,7 +1150,7 @@ class Localuser{
}); });
let changed = false; let changed = false;
const pronounbox = settingsLeft.addTextInput( const pronounbox = settingsLeft.addTextInput(
"Pronouns:", I18n.getTranslation("pronouns"),
_=>{ _=>{
if(newpronouns || newbio || changed){ if(newpronouns || newbio || changed){
this.updateProfile({ this.updateProfile({
@ -1182,7 +1167,7 @@ class Localuser{
newpronouns = _; newpronouns = _;
regen(); regen();
}); });
const bioBox = settingsLeft.addMDInput("Bio:", _=>{}, { const bioBox = settingsLeft.addMDInput(I18n.getTranslation("bio"), _=>{}, {
initText: this.user.bio.rawString, initText: this.user.bio.rawString,
}); });
bioBox.watchForChange(_=>{ bioBox.watchForChange(_=>{
@ -1197,7 +1182,7 @@ class Localuser{
color = "transparent"; color = "transparent";
} }
const colorPicker = settingsLeft.addColorInput( const colorPicker = settingsLeft.addColorInput(
"Profile color:", I18n.getTranslation("profileColor"),
_=>{}, _=>{},
{ initColor: color } { initColor: color }
); );
@ -1210,11 +1195,11 @@ class Localuser{
}); });
} }
{ {
const tas = settings.addButton("Themes & Sounds"); const tas = settings.addButton(I18n.getTranslation("localuser.themesAndSounds"));
{ {
const themes = ["Dark", "WHITE", "Light", "Dark-Accent"]; const themes = ["Dark", "WHITE", "Light", "Dark-Accent"];
tas.addSelect( tas.addSelect(
"Theme:", I18n.getTranslation("localuser.theme:"),
_=>{ _=>{
localStorage.setItem("theme", themes[_]); localStorage.setItem("theme", themes[_]);
setTheme(); setTheme();
@ -1231,7 +1216,7 @@ class Localuser{
const sounds = AVoice.sounds; const sounds = AVoice.sounds;
tas tas
.addSelect( .addSelect(
"Notification sound:", I18n.getTranslation("localuser.notisound"),
_=>{ _=>{
AVoice.setNotificationSound(sounds[_]); AVoice.setNotificationSound(sounds[_]);
}, },
@ -1246,7 +1231,7 @@ class Localuser{
{ {
const userinfos = getBulkInfo(); const userinfos = getBulkInfo();
tas.addColorInput( tas.addColorInput(
"Accent color:", I18n.getTranslation("localuser.accentColor"),
_=>{ _=>{
userinfos.accent_color = _; userinfos.accent_color = _;
localStorage.setItem("userinfos", JSON.stringify(userinfos)); localStorage.setItem("userinfos", JSON.stringify(userinfos));
@ -1259,10 +1244,10 @@ class Localuser{
); );
} }
{ {
const box=tas.addCheckboxInput("Enable experimental Voice support",()=>{},{initState:Boolean(localStorage.getItem("Voice enabled"))}); const box=tas.addCheckboxInput(I18n.getTranslation("localuser.enableEVoice"),()=>{},{initState:Boolean(localStorage.getItem("Voice enabled"))});
box.onchange=(e)=>{ box.onchange=(e)=>{
if(e){ if(e){
if(confirm("Are you sure you want to enable this, this is very experimental and is likely to cause issues. (this feature is for devs, please don't enable if you don't know what you're doing)")){ if(confirm(I18n.getTranslation("localuser.VoiceWarning"))){
localStorage.setItem("Voice enabled","true") localStorage.setItem("Voice enabled","true")
}else{ }else{
@ -1279,33 +1264,33 @@ class Localuser{
} }
} }
{ {
const update=settings.addButton("Update settings") const update=settings.addButton(I18n.getTranslation("localuser.updateSettings"))
const sw=update.addSelect("Service Worker setting",()=>{},["False","Offline only","True"],{ const sw=update.addSelect(I18n.getTranslation("localuser.swSettings"),()=>{},["SWOff","SWOffline","SWOn"].map(e=>I18n.getTranslation("localuser."+e)),{
defaultIndex:["false","offlineOnly","true"].indexOf(localStorage.getItem("SWMode") as string) defaultIndex:["false","offlineOnly","true"].indexOf(localStorage.getItem("SWMode") as string)
}); });
sw.onchange=(e)=>{ sw.onchange=(e)=>{
SW.setMode(["false","offlineOnly","true"][e] as "false"|"offlineOnly"|"true") SW.setMode(["false","offlineOnly","true"][e] as "false"|"offlineOnly"|"true")
} }
update.addButtonInput("","Check for update",()=>{ update.addButtonInput("",I18n.getTranslation("localuser.CheckUpdate"),()=>{
SW.checkUpdate(); SW.checkUpdate();
}); });
update.addButtonInput("","Clear cache",()=>{ update.addButtonInput("",I18n.getTranslation("localuser.clearCache"),()=>{
SW.forceClear(); SW.forceClear();
}); });
} }
{ {
const security = settings.addButton("Account Settings"); const security = settings.addButton(I18n.getTranslation("localuser.accountSettings"));
const genSecurity = ()=>{ const genSecurity = ()=>{
security.removeAll(); security.removeAll();
if(this.mfa_enabled){ if(this.mfa_enabled){
security.addButtonInput("", "Disable 2FA", ()=>{ security.addButtonInput("", I18n.getTranslation("localuser.2faDisable"), ()=>{
const form = security.addSubForm( const form = security.addSubForm(
"2FA Disable", I18n.getTranslation("localuser.2faDisable"),
(_: any)=>{ (_: any)=>{
if(_.message){ if(_.message){
switch(_.code){ switch(_.code){
case 60008: case 60008:
form.error("code", "Invalid code"); form.error("code", I18n.getTranslation("badCode"));
break; break;
} }
}else{ }else{
@ -1319,10 +1304,10 @@ class Localuser{
headers: this.headers, headers: this.headers,
} }
); );
form.addTextInput("Code:", "code", { required: true }); form.addTextInput(I18n.getTranslation("localuser.2faCode"), "code", { required: true });
}); });
}else{ }else{
security.addButtonInput("", "Enable 2FA", async ()=>{ security.addButtonInput("", I18n.getTranslation("localuser.2faEnable"), async ()=>{
let secret = ""; let secret = "";
for(let i = 0; i < 18; i++){ for(let i = 0; i < 18; i++){
secret += "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"[ secret += "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567"[
@ -1330,15 +1315,15 @@ class Localuser{
]; ];
} }
const form = security.addSubForm( const form = security.addSubForm(
"2FA Setup", I18n.getTranslation("localuser.setUp2fa"),
(_: any)=>{ (_: any)=>{
if(_.message){ if(_.message){
switch(_.code){ switch(_.code){
case 60008: case 60008:
form.error("code", "Invalid code"); form.error("code", I18n.getTranslation("localuser.badCode"));
break; break;
case 400: case 400:
form.error("password", "Incorrect password"); form.error("password", I18n.getTranslation("localuser.badPassword"));
break; break;
} }
}else{ }else{
@ -1353,22 +1338,22 @@ class Localuser{
} }
); );
form.addTitle( form.addTitle(
"Copy this secret into your totp(time-based one time password) app" I18n.getTranslation("localuser.setUp2faInstruction")
); );
form.addText( form.addText(
`Your secret is: ${secret} and it's 6 digits, with a 30 second token period` I18n.getTranslation("localuser.2faCodeGive",secret)
); );
form.addTextInput("Account Password:", "password", { form.addTextInput(I18n.getTranslation("localuser.password:"), "password", {
required: true, required: true,
password: true, password: true,
}); });
form.addTextInput("Code:", "code", { required: true }); form.addTextInput(I18n.getTranslation("localuser.2faCode"), "code", { required: true });
form.setValue("secret", secret); form.setValue("secret", secret);
}); });
} }
security.addButtonInput("", "Change discriminator", ()=>{ security.addButtonInput("", I18n.getTranslation("localuser.changeDiscriminator"), ()=>{
const form = security.addSubForm( const form = security.addSubForm(
"Change Discriminator", I18n.getTranslation("localuser.changeDiscriminator"),
_=>{ _=>{
security.returnFromSub(); security.returnFromSub();
}, },
@ -1378,11 +1363,11 @@ class Localuser{
method: "PATCH", method: "PATCH",
} }
); );
form.addTextInput("New discriminator:", "discriminator"); form.addTextInput(I18n.getTranslation("lcoaluser.newDiscriminator"), "discriminator");
}); });
security.addButtonInput("", "Change email", ()=>{ security.addButtonInput("", I18n.getTranslation("lcoaluser.changeEmail"), ()=>{
const form = security.addSubForm( const form = security.addSubForm(
"Change Email", I18n.getTranslation("lcoaluser.changeEmail"),
_=>{ _=>{
security.returnFromSub(); security.returnFromSub();
}, },
@ -1392,15 +1377,15 @@ class Localuser{
method: "PATCH", method: "PATCH",
} }
); );
form.addTextInput("Password:", "password", { password: true }); form.addTextInput(I18n.getTranslation("localuser.password:"), "password", { password: true });
if(this.mfa_enabled){ if(this.mfa_enabled){
form.addTextInput("Code:", "code"); form.addTextInput(I18n.getTranslation("localuser.2faCode"), "code");
} }
form.addTextInput("New email:", "email"); form.addTextInput(I18n.getTranslation("localuser.newEmail:"), "email");
}); });
security.addButtonInput("", "Change username", ()=>{ security.addButtonInput("", I18n.getTranslation("localuser.changeUsername"), ()=>{
const form = security.addSubForm( const form = security.addSubForm(
"Change Username", I18n.getTranslation("localuser.changeUsername"),
_=>{ _=>{
security.returnFromSub(); security.returnFromSub();
}, },
@ -1410,11 +1395,11 @@ class Localuser{
method: "PATCH", method: "PATCH",
} }
); );
form.addTextInput("Password:", "password", { password: true }); form.addTextInput(I18n.getTranslation("localuser.password:"), "password", { password: true });
if(this.mfa_enabled){ if(this.mfa_enabled){
form.addTextInput("Code:", "code"); form.addTextInput(I18n.getTranslation("localuser.2faCode"), "code");
} }
form.addTextInput("New username:", "username"); form.addTextInput(I18n.getTranslation("localuser.newUsername"), "username");
}); });
security.addButtonInput("", "Change password", ()=>{ security.addButtonInput("", "Change password", ()=>{
const form = security.addSubForm( const form = security.addSubForm(

54
src/webpage/translations/en.json
View file

@ -188,7 +188,43 @@
"confirmDelete":"Are you sure you want to delete $1?", "confirmDelete":"Are you sure you want to delete $1?",
"serverName":"Name of server:", "serverName":"Name of server:",
"yesDelete":"Yes, I'm sure", "yesDelete":"Yes, I'm sure",
"noDelete":"Nevermind" "noDelete":"Nevermind",
"create":"Create guild",
"loadingDiscovery":"Loading...",
"disoveryTitle":"Guild discovery ($1) {{PLURAL:$1|entrie|entries}}"
},
"localuser":{
"settings":"Settings",
"userSettings":"User Settings",
"themesAndSounds":"Themes & Sounds",
"theme:":"Theme",
"notisound":"Notification sound:",
"accentColor":"Accent color:",
"enableEVoice":"Enable experimental Voice support",
"VoiceWarning":"Are you sure you want to enable this, this is very experimental and is likely to cause issues. (this feature is for devs, please don't enable if you don't know what you're doing)",
"updateSettings":"Update Settings",
"swSettings":"Service Worker setting",
"SWOff":"Off",
"SWOffline":"Offline only",
"SWOn":"On",
"clearCache":"Clear cache",
"CheckUpdate":"Check for updates",
"accountSettings":"Account Settings",
"2faDisable":"Disable 2FA",
"badCode":"Invalid code",
"2faEnable":"Enable 2FA",
"2faCode:":"Code:",
"setUp2fa":"2FA Setup",
"badPassword":"Incorrect password",
"setUp2faInstruction":"Copy this secret into your totp(time-based one time password) app",
"2faCodeGive":"Your secret is: $1 and it's 6 digits, with a 30 second token period",
"changeDiscriminator":"Change discriminator",
"newDiscriminator":"New discriminator:",
"changeEmail":"Change email",
"password:":"Password",
"newEmail:":"New email",
"changeUsername":"Change username",
"newUsername":"New username:"
}, },
"inviteOptions":{ "inviteOptions":{
"title":"Invite People", "title":"Invite People",
@ -206,7 +242,12 @@
"invite":{ "invite":{
"invitedBy":"You've been invited by $1", "invitedBy":"You've been invited by $1",
"alreadyJoined":"Already joined", "alreadyJoined":"Already joined",
"accept":"Accept" "accept":"Accept",
"noAccount":"Create an account to accept the invite",
"longInvitedBy":"$1 invited you to join $2",
"loginOrCreateAccount":"Login or create an account ⇌",
"joinUsing":"Join using invite",
"inviteLinkCode":"Invite Link/Code"
}, },
"replyingTo":"Replying to $1", "replyingTo":"Replying to $1",
"DMs":{ "DMs":{
@ -215,8 +256,13 @@
"close":"Close DM" "close":"Close DM"
}, },
"user":{ "user":{
"copyId":"Copy user ID" "copyId":"Copy user ID",
} "online":"Online",
"offline":"Offline"
},
"errorReconnect":"Unable to connect to the server, retrying in <b>$1</b> seconds...",
"retrying":"Retrying...",
"unableToConnect":"Unable to connect to the Spacebar server. Please try logging out and back in."
}, },
"ru": "./ru.json" "ru": "./ru.json"
} }