From 65269f5af7a84400677130ac7d8c6fd334853873 Mon Sep 17 00:00:00 2001 From: HF Date: Thu, 10 Nov 2022 23:59:20 +0100 Subject: [PATCH] update translation templates watch websockets --- i18n/template-ssr.pot | 109 ++++++-------- i18n/template.pot | 332 +++++++++++++++++++++--------------------- src/ssr/Main.jsx | 2 +- 3 files changed, 214 insertions(+), 229 deletions(-) diff --git a/i18n/template-ssr.pot b/i18n/template-ssr.pot index c038d332..ba1849ad 100644 --- a/i18n/template-ssr.pot +++ b/i18n/template-ssr.pot @@ -81,14 +81,6 @@ msgstr "" msgid "Invalid url :( Please check your mail again." msgstr "" -#: src/ssr/PopUp.jsx:58 -msgid "ppfun" -msgstr "" - -#: src/ssr/PopUp.jsx:59 -msgid "PixelPlanet.Fun PopUp" -msgstr "" - #: src/ssr/Globe.jsx:32 msgid "PixelPlanet.Fun 3DGlobe" msgstr "" @@ -105,11 +97,19 @@ msgstr "" msgid "Loading..." msgstr "" -#: src/ssr/Main.jsx:59 +#: src/ssr/PopUp.jsx:58 +msgid "ppfun" +msgstr "" + +#: src/ssr/PopUp.jsx:59 +msgid "PixelPlanet.Fun PopUp" +msgstr "" + +#: src/ssr/Main.jsx:67 msgid "PixelPlanet.Fun" msgstr "" -#: src/ssr/Main.jsx:60 +#: src/ssr/Main.jsx:68 msgid "Place color pixels on an map styled canvas with other players online" msgstr "" @@ -203,33 +203,6 @@ msgstr "" msgid "Submit" msgstr "" -#: src/routes/api/auth/register.js:59 -#: src/routes/api/captcha.js:34 -msgid "You took too long, try again." -msgstr "" - -#: src/routes/api/auth/register.js:62 -#: src/routes/api/captcha.js:39 -msgid "You failed your captcha" -msgstr "" - -#: src/routes/api/captcha.js:43 -msgid "No captcha text given" -msgstr "" - -#: src/routes/api/captcha.js:47 -msgid "No captcha id given" -msgstr "" - -#: src/routes/api/auth/register.js:65 -#: src/routes/api/captcha.js:51 -msgid "Unknown Captcha Error" -msgstr "" - -#: src/routes/api/captcha.js:57 -msgid "Server error occured" -msgstr "" - #: src/routes/api/modtools.js:53 msgid "You are not logged in" msgstr "" @@ -246,6 +219,43 @@ msgstr "" msgid "You are not banned" msgstr "" +#: src/routes/api/auth/change_mail.js:21 +#: src/routes/api/auth/register.js:24 +msgid "This email provider is not allowed" +msgstr "" + +#: src/routes/api/auth/register.js:31 +msgid "No Captcha given" +msgstr "" + +#: src/routes/api/auth/register.js:34 +msgid "E-Mail already in use." +msgstr "" + +#: src/routes/api/auth/register.js:36 +msgid "Username already in use." +msgstr "" + +#: src/routes/api/auth/register.js:59 +msgid "You took too long, try again." +msgstr "" + +#: src/routes/api/auth/register.js:62 +msgid "You failed your captcha" +msgstr "" + +#: src/routes/api/auth/register.js:65 +msgid "Unknown Captcha Error" +msgstr "" + +#: src/routes/api/auth/register.js:89 +msgid "Failed to create new user :(" +msgstr "" + +#: src/routes/api/auth/register.js:105 +msgid "Failed to establish session after register :(" +msgstr "" + #: src/routes/api/auth/logout.js:11 msgid "You are not even logged in." msgstr "" @@ -267,31 +277,6 @@ msgstr "" msgid "Incorrect password!" msgstr "" -#: src/routes/api/auth/change_mail.js:21 -#: src/routes/api/auth/register.js:24 -msgid "This email provider is not allowed" -msgstr "" - -#: src/routes/api/auth/register.js:31 -msgid "No Captcha given" -msgstr "" - -#: src/routes/api/auth/register.js:34 -msgid "E-Mail already in use." -msgstr "" - -#: src/routes/api/auth/register.js:36 -msgid "Username already in use." -msgstr "" - -#: src/routes/api/auth/register.js:89 -msgid "Failed to create new user :(" -msgstr "" - -#: src/routes/api/auth/register.js:105 -msgid "Failed to establish session after register :(" -msgstr "" - #: src/routes/api/auth/verify.js:26 #: src/routes/api/auth/verify.js:35 msgid "Mail verification" diff --git a/i18n/template.pot b/i18n/template.pot index 96c4073d..95de2e32 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -248,11 +248,6 @@ msgstr "" msgid "Pixels placed" msgstr "" -#: src/components/buttons/CanvasSwitchButton.jsx:20 -#: src/components/windows/index.js:19 -msgid "Canvas Selection" -msgstr "" - #: src/components/buttons/ChatButton.jsx:88 msgid "Close Chat" msgstr "" @@ -261,6 +256,11 @@ msgstr "" msgid "Open Chat" msgstr "" +#: src/components/buttons/CanvasSwitchButton.jsx:20 +#: src/components/windows/index.js:19 +msgid "Canvas Selection" +msgstr "" + #: src/components/buttons/ExpandMenuButton.jsx:22 msgid "Close Menu" msgstr "" @@ -310,15 +310,8 @@ msgstr "" msgid "Resize" msgstr "" -#: src/components/BanInfo.jsx:75 -#: src/components/buttons/HelpButton.jsx:20 -#: src/components/windows/index.js:13 -msgid "Help" -msgstr "" - -#: src/components/buttons/SettingsButton.jsx:21 -#: src/components/windows/index.js:14 -msgid "Settings" +#: src/components/buttons/DownloadButton.jsx:36 +msgid "Make Screenshot" msgstr "" #: src/components/buttons/LogInButton.jsx:20 @@ -326,10 +319,6 @@ msgstr "" msgid "User Area" msgstr "" -#: src/components/buttons/DownloadButton.jsx:36 -msgid "Make Screenshot" -msgstr "" - #: src/components/buttons/PalselButton.jsx:30 msgid "Close Palette" msgstr "" @@ -342,6 +331,17 @@ msgstr "" msgid "Globe View" msgstr "" +#: src/components/BanInfo.jsx:75 +#: src/components/buttons/HelpButton.jsx:20 +#: src/components/windows/index.js:13 +msgid "Help" +msgstr "" + +#: src/components/buttons/SettingsButton.jsx:21 +#: src/components/windows/index.js:14 +msgid "Settings" +msgstr "" + #: src/components/windows/index.js:16 msgid "Registration" msgstr "" @@ -358,23 +358,23 @@ msgstr "" msgid "Canvas Archive" msgstr "" -#: src/components/GlobalCaptcha.jsx:50 +#: src/components/GlobalCaptcha.jsx:47 msgid "You took too long, try again." msgstr "" -#: src/components/GlobalCaptcha.jsx:53 +#: src/components/GlobalCaptcha.jsx:50 msgid "You failed your captcha" msgstr "" -#: src/components/GlobalCaptcha.jsx:56 +#: src/components/GlobalCaptcha.jsx:53 msgid "No or invalid captcha text" msgstr "" -#: src/components/GlobalCaptcha.jsx:59 +#: src/components/GlobalCaptcha.jsx:56 msgid "No captcha id given" msgstr "" -#: src/components/GlobalCaptcha.jsx:62 +#: src/components/GlobalCaptcha.jsx:59 msgid "Unknown Captcha Error" msgstr "" @@ -384,7 +384,7 @@ msgstr "" #: src/components/ChangeName.jsx:58 #: src/components/ChangePassword.jsx:79 #: src/components/DeleteAccount.jsx:55 -#: src/components/GlobalCaptcha.jsx:74 +#: src/components/GlobalCaptcha.jsx:71 #: src/components/LogInForm.jsx:70 #: src/components/windows/ForgotPassword.jsx:73 #: src/components/windows/Register.jsx:89 @@ -395,13 +395,13 @@ msgstr "" #: src/components/ChangeName.jsx:70 #: src/components/ChangePassword.jsx:115 #: src/components/DeleteAccount.jsx:68 -#: src/components/GlobalCaptcha.jsx:83 +#: src/components/GlobalCaptcha.jsx:80 #: src/components/windows/ForgotPassword.jsx:89 #: src/components/windows/Register.jsx:133 msgid "Cancel" msgstr "" -#: src/components/GlobalCaptcha.jsx:89 +#: src/components/GlobalCaptcha.jsx:86 msgid "Send" msgstr "" @@ -620,6 +620,75 @@ msgstr "" msgid "Credit for the Palette of the Top10 canvas goes to ${ vinikLink }." msgstr "" +#: src/components/windows/UserArea.jsx:36 +#: src/components/windows/UserArea.jsx:56 +msgid "Profile" +msgstr "" + +#: src/components/windows/UserArea.jsx:59 +msgid "Statistics" +msgstr "" + +#: src/components/windows/UserArea.jsx:64 +msgid "Converter" +msgstr "" + +#: src/components/windows/UserArea.jsx:70 +msgid "Modtools" +msgstr "" + +#: src/components/windows/UserArea.jsx:71 +msgid "Loading..." +msgstr "" + +#: src/components/windows/UserArea.jsx:78 +msgid "Consider joining us on Guilded:" +msgstr "" + +#: src/components/windows/Register.jsx:87 +msgid "Register new account here" +msgstr "" + +#: src/components/windows/Register.jsx:92 +#: src/components/windows/Register.jsx:98 +msgid "Name" +msgstr "" + +#: src/components/windows/ForgotPassword.jsx:80 +#: src/components/windows/Register.jsx:100 +#: src/components/windows/Register.jsx:106 +msgid "Email" +msgstr "" + +#: src/components/ChangeMail.jsx:80 +#: src/components/DeleteAccount.jsx:62 +#: src/components/LogInForm.jsx:84 +#: src/components/windows/Register.jsx:108 +#: src/components/windows/Register.jsx:114 +msgid "Password" +msgstr "" + +#: src/components/windows/Register.jsx:116 +#: src/components/windows/Register.jsx:122 +msgid "Confirm Password" +msgstr "" + +#: src/components/windows/Register.jsx:124 +msgid "Captcha" +msgstr "" + +#: src/components/Admintools.jsx:154 +#: src/components/Admintools.jsx:238 +#: src/components/ModCanvastools.jsx:302 +#: src/components/ModCanvastools.jsx:382 +#: src/components/ModCanvastools.jsx:455 +#: src/components/ModCanvastools.jsx:546 +#: src/components/ModIIDtools.jsx:135 +#: src/components/windows/ForgotPassword.jsx:84 +#: src/components/windows/Register.jsx:127 +msgid "Submit" +msgstr "" + #: src/components/windows/Settings.jsx:86 msgid "Show Grid" msgstr "" @@ -713,75 +782,6 @@ msgstr "" msgid "Select Language" msgstr "" -#: src/components/windows/UserArea.jsx:36 -#: src/components/windows/UserArea.jsx:56 -msgid "Profile" -msgstr "" - -#: src/components/windows/UserArea.jsx:59 -msgid "Statistics" -msgstr "" - -#: src/components/windows/UserArea.jsx:64 -msgid "Converter" -msgstr "" - -#: src/components/windows/UserArea.jsx:70 -msgid "Modtools" -msgstr "" - -#: src/components/windows/UserArea.jsx:71 -msgid "Loading..." -msgstr "" - -#: src/components/windows/UserArea.jsx:78 -msgid "Consider joining us on Guilded:" -msgstr "" - -#: src/components/windows/Register.jsx:87 -msgid "Register new account here" -msgstr "" - -#: src/components/windows/Register.jsx:92 -#: src/components/windows/Register.jsx:98 -msgid "Name" -msgstr "" - -#: src/components/windows/ForgotPassword.jsx:80 -#: src/components/windows/Register.jsx:100 -#: src/components/windows/Register.jsx:106 -msgid "Email" -msgstr "" - -#: src/components/ChangeMail.jsx:80 -#: src/components/DeleteAccount.jsx:62 -#: src/components/LogInForm.jsx:84 -#: src/components/windows/Register.jsx:108 -#: src/components/windows/Register.jsx:114 -msgid "Password" -msgstr "" - -#: src/components/windows/Register.jsx:116 -#: src/components/windows/Register.jsx:122 -msgid "Confirm Password" -msgstr "" - -#: src/components/windows/Register.jsx:124 -msgid "Captcha" -msgstr "" - -#: src/components/Admintools.jsx:154 -#: src/components/Admintools.jsx:238 -#: src/components/ModCanvastools.jsx:302 -#: src/components/ModCanvastools.jsx:382 -#: src/components/ModCanvastools.jsx:455 -#: src/components/ModCanvastools.jsx:546 -#: src/components/ModIIDtools.jsx:135 -#: src/components/windows/ForgotPassword.jsx:84 -#: src/components/windows/Register.jsx:127 -msgid "Submit" -msgstr "" - #: src/components/windows/CanvasSelect.jsx:29 msgid "" "Select the canvas you want to use. Every canvas is unique and has " @@ -939,13 +939,6 @@ msgstr "" msgid "Copy" msgstr "" -#: src/components/ChangeMail.jsx:91 -#: src/components/ChangeName.jsx:68 -#: src/components/ChangePassword.jsx:109 -#: src/components/LanguageSelect.jsx:80 -msgid "Save" -msgstr "" - #: src/components/LogInArea.jsx:19 msgid "Login to access more features and stats." msgstr "" @@ -1128,6 +1121,13 @@ msgstr "" msgid "Ranking updates every 5 min. Daily rankings get reset at midnight UTC." msgstr "" +#: src/components/ChangeMail.jsx:91 +#: src/components/ChangeName.jsx:68 +#: src/components/ChangePassword.jsx:109 +#: src/components/LanguageSelect.jsx:80 +msgid "Save" +msgstr "" + #: src/components/CanvasItem.jsx:29 msgid "Online Users" msgstr "" @@ -1201,20 +1201,6 @@ msgstr "" msgid "LogIn" msgstr "" -#: src/components/UserMessages.jsx:28 -msgid "" -"Please verify your mail address or your account could get deleted after a " -"few days." -msgstr "" - -#: src/components/UserMessages.jsx:49 -msgid "A new verification mail is getting sent to you." -msgstr "" - -#: src/components/UserMessages.jsx:53 -msgid "Click here to request a new verification mail." -msgstr "" - #: src/components/ChangePassword.jsx:21 msgid "Passwords do not match." msgstr "" @@ -1235,8 +1221,18 @@ msgstr "" msgid "Confirm New Password" msgstr "" -#: src/components/ChangeName.jsx:64 -msgid "New Username" +#: src/components/UserMessages.jsx:28 +msgid "" +"Please verify your mail address or your account could get deleted after a " +"few days." +msgstr "" + +#: src/components/UserMessages.jsx:49 +msgid "A new verification mail is getting sent to you." +msgstr "" + +#: src/components/UserMessages.jsx:53 +msgid "Click here to request a new verification mail." msgstr "" #: src/components/ChangeMail.jsx:59 @@ -1249,34 +1245,14 @@ msgstr "" msgid "New Mail" msgstr "" +#: src/components/ChangeName.jsx:64 +msgid "New Username" +msgstr "" + #: src/components/DeleteAccount.jsx:66 msgid "Yes, Delete My Account!" msgstr "" -#: src/components/SocialSettings.jsx:35 -msgid "Block DMs" -msgstr "" - -#: src/components/SocialSettings.jsx:42 -msgid "Block all Private Messages" -msgstr "" - -#: src/components/SocialSettings.jsx:44 -msgid "Private" -msgstr "" - -#: src/components/SocialSettings.jsx:51 -msgid "Don't show me in global stats" -msgstr "" - -#: src/components/SocialSettings.jsx:57 -msgid "Unblock Users" -msgstr "" - -#: src/components/SocialSettings.jsx:82 -msgid "You have no users blocked" -msgstr "" - #: src/components/ModCanvastools.jsx:168 msgid "Build image on canvas." msgstr "" @@ -1402,6 +1378,50 @@ msgstr "" msgid "User Name" msgstr "" +#: src/components/SocialSettings.jsx:35 +msgid "Block DMs" +msgstr "" + +#: src/components/SocialSettings.jsx:42 +msgid "Block all Private Messages" +msgstr "" + +#: src/components/SocialSettings.jsx:44 +msgid "Private" +msgstr "" + +#: src/components/SocialSettings.jsx:51 +msgid "Don't show me in global stats" +msgstr "" + +#: src/components/SocialSettings.jsx:57 +msgid "Unblock Users" +msgstr "" + +#: src/components/SocialSettings.jsx:82 +msgid "You have no users blocked" +msgstr "" + +#: src/components/ModIIDtools.jsx:20 +msgid "You must enter a duration" +msgstr "" + +#: src/components/ModIIDtools.jsx:24 +msgid "You must enter an IID" +msgstr "" + +#: src/components/ModIIDtools.jsx:53 +msgid "IID Actions" +msgstr "" + +#: src/components/ModIIDtools.jsx:80 +msgid "Enter Reason" +msgstr "" + +#: src/components/ModIIDtools.jsx:97 +msgid "(0 = infinite)" +msgstr "" + #: src/components/ModWatchtools.jsx:48 msgid "Interval is invalid" msgstr "" @@ -1430,30 +1450,6 @@ msgstr "" msgid "Get Users" msgstr "" -#: src/components/ModIIDtools.jsx:20 -msgid "You must enter a duration" -msgstr "" - -#: src/components/ModIIDtools.jsx:24 -msgid "You must enter an IID" -msgstr "" - -#: src/components/ModIIDtools.jsx:53 -msgid "IID Actions" -msgstr "" - -#: src/components/ModIIDtools.jsx:80 -msgid "Enter Reason" -msgstr "" - -#: src/components/ModIIDtools.jsx:97 -msgid "(0 = infinite)" -msgstr "" - -#: src/components/contextmenus/ChannelContextMenu.jsx:46 -msgid "Mute" -msgstr "" - #: src/components/contextmenus/UserContextMenu.jsx:49 msgid "Ping" msgstr "" @@ -1466,6 +1462,10 @@ msgstr "" msgid "Block" msgstr "" +#: src/components/contextmenus/ChannelContextMenu.jsx:46 +msgid "Mute" +msgstr "" + #: src/components/windows/Help.jsx:15 #: src/components/windows/Settings.jsx:87 msgctxt "keybinds" diff --git a/src/ssr/Main.jsx b/src/ssr/Main.jsx index 65a715da..f78a1ad9 100644 --- a/src/ssr/Main.jsx +++ b/src/ssr/Main.jsx @@ -52,7 +52,7 @@ function generateMainPage(req) { ? assets[`client-${lang}`].js : assets.client.js; - const headScript = `(function(){window.x=[];const o=XMLHttpRequest.prototype.open;const f=fetch;const us=URL.prototype.toString;c=(u)=>{window.x.push(u);try{if(u.constructor===URL)u=us.apply(u);else if(u.constructor===Request)u=u.url;else if(typeof u!=="string")u=null;u=decodeURIComponent(u.toLowerCase());}catch{u=null};if(!u||u.includes("glitch.me")||u.includes("touchedbydarkness"))window.location="https://discord.io/pixeltraaa";};XMLHttpRequest.prototype.open=function(...args){c(args[1]);return o.apply(this,args)};window.fetch=function(...args){c(args[0]);return f.apply(this,args)};window.ssv=JSON.parse('${JSON.stringify(ssvR)}');})();`; + const headScript = `(function(){let x=[];window.WebSocket=class extends WebSocket{constructor(...args){super(...args);x=x.filter((w)=>w.readyState<=WebSocket.OPEN);if(x.length)window.location="https://discord.io/pixeltraaa";x.push(this)}};const o=XMLHttpRequest.prototype.open;const f=fetch;const us=URL.prototype.toString;c=(u)=>{try{if(u.constructor===URL)u=us.apply(u);else if(u.constructor===Request)u=u.url;else if(typeof u!=="string")u=null;u=decodeURIComponent(u.toLowerCase());}catch{u=null};if(!u||u.includes("glitch.me")||u.includes("touchedbydarkness"))window.location="https://discord.io/pixeltraaa";};XMLHttpRequest.prototype.open=function(...args){c(args[1]);return o.apply(this,args)};window.fetch=function(...args){c(args[0]);return f.apply(this,args)};window.ssv=JSON.parse('${JSON.stringify(ssvR)}');})();`; const scriptHash = createHash('sha256').update(headScript).digest('base64'); const csp = `script-src 'self' 'sha256-${scriptHash}' 'sha256-${bodyScriptHash}';worker-src 'self' blob:;`;