diff --git a/docs/it_IT/welcome.md b/docs/it_IT/welcome.md new file mode 100644 index 0000000..1fbbc7a --- /dev/null +++ b/docs/it_IT/welcome.md @@ -0,0 +1,73 @@ +# Altra documentazione + +Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. + +Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. + +Siamo un gruppo di programmer che spendono il loro tempo libero a sviluppare e fare reverse-engineering per i server online per la 3DS e Wii U. + +```javascript +function returnTrue() { + class trueOrFalseObject { + constructor(trueOrFalse) { + this.trueOrFalse = trueOrFalse; + } + get trueOrFalse() { + return this.trueOrFalse(); + } + convertNumberToBoolean(trueOrFalse) { + if (convertStringToNumber(trueOrFalse) === 0) { + return true; + } else if (convertStringToNumber(trueOrFalse) == 1) { + return false; + } + } + convertStringToNumber(trueOrFalse) { + if (trueOrFalse === "true") { + return 0; + } else if (trueOrFalse === "false") { + return true * 69 - 1 - false * 69 * 420 - 69 + 2; + } + } + trueOrFalse() { + return this.convertNumberToBoolean(trueOrFalse); + } + } + + let objectWhichWeKnowIsTrue = new trueOrFalseObject("true"); + + function checkIfTrueOrFalse(objectToCheckIfTrueOrFalse) { + if (objectToCheckIfTrueOrFalse === objectWhichWeKnowIsTrue.trueOrFalse) { + return objectWhichWeKnowIsTrue.trueOrFalse; + console.log( + "Successfully checked if the object is true or false. Result: the object is true." + ); + // TODO: fix text not console logging + } else { + objectWhichWeKnowIsTrue = new trueOrFalseObject("false"); + if (objectToCheckIfTrueOrFalse === objectWhichWeKnowIsTrue.trueOrFalse) { + return objectWhichWeKnowIsTrue.trueOrFalse; + console.log( + "Successfully checked if the object is true or false. Result: the object is false." + ); + // TODO: fix text not console logging + } else { + // something went horribly wrong + } + objectWhichWeKnowIsTrue = new trueOrFalseObject("true"); + } + } + + const isTrueTrueOrFalse = checkIfTrueOrFalse("true"); + const isfalseTrueOrFalse = checkIfTrueOrFalse("false"); + + const trueOrFalseJSON = { + true: isTrueTrueOrFalse, + false: isfalseTrueOrFalse, + }; + + return trueOrFalseJSON.true +} + +console.log(returnTrue()) +``` diff --git a/locales/en_US.json b/locales/en_US.json index 936f6e7..1824f8b 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -7,7 +7,6 @@ "progress": "Progress", "blog": "Blog", "account": "Account", - "donate": "Donate", "accountWidget": { "settings": "Settings", "logout": "Logout" @@ -238,7 +237,6 @@ "publishedOn": "on" }, "account": { - "account": "Account", "loginForm": { "login": "Login", "register": "Register", @@ -256,9 +254,7 @@ "downloadFiles": "Download account files", "downloadFilesDescription": "(will not work on Nintendo Network)", "upgrade": "Upgrade account", - "unavailable": "Unavailable", "settingCards": { - "userSettings": "User settings", "profile": "Profile", "nickname": "Nickname", "birthDate": "Birth date", @@ -284,10 +280,7 @@ "linkDiscord": "Link Discord account", "newsletter": "Newsletter", "newsletterPrompt": "Receive project updates via email (you can opt-out at any time)", - "passwordPrompt": "Enter your PNID password to download Cemu files", - "no_signins_notice": "Sign in history not currently tracked. Check back again later!", - "no_newsletter_notice": "Newsletter not currently available. Check back again later", - "no_edit_from_dashboard": "Editing PNID settings from user dashboard is currently unavailable. Please update user settings from your linked game console" + "passwordPrompt": "Enter your PNID password to download Cemu files" } }, "accountLevel": [ @@ -337,26 +330,10 @@ "caption": "Search for it here" } ] - }, - "search": { - "title": "Got an error code?", - "caption": "Type it in the box below to get information on your issue!", - "label": "Error code", - "no_match": "No matches found" - }, - "sidebar": { - "getting_started": "Getting started", - "welcome": "Welcome", - "install_extended": "Install Pretendo", - "install": "Install", - "search": "Search", - "juxt_err": "Error codes - Juxt" - } }, "modals": { "cancel": "Cancel", - "confirm": "Confirm", - "close": "Close" + "confirm": "Confirm" } } diff --git a/src/routes/account.js b/src/routes/account.js index fb5f8df..166e185 100644 --- a/src/routes/account.js +++ b/src/routes/account.js @@ -70,11 +70,7 @@ router.get('/', requireLoginMiddleware, async (request, response) => { }); router.get('/login', async (request, response) => { - const renderData = { - error: request.cookies.error_message - }; - - response.render('account/login', renderData); + response.render('account/login'); }); router.post('/login', async (request, response) => { @@ -101,7 +97,6 @@ router.get('/register', async (request, response) => { email: request.cookies.email, username: request.cookies.username, mii_name: request.cookies.mii_name, - error: request.cookies.error_message }; response.clearCookie('email', { domain: '.pretendo.network' }); diff --git a/src/server.js b/src/server.js index c26f332..940ed15 100644 --- a/src/server.js +++ b/src/server.js @@ -12,6 +12,7 @@ const database = require('./database'); const util = require('./util'); const logger = require('./logger'); const config = require('../config.json'); +const defaultLocale = require('../locales/en_US.json'); const { http: { port } } = config; const app = express(); @@ -136,6 +137,56 @@ app.engine('handlebars', handlebars({ neq(value1, value2) { return value1 !== value2; }, + times(n, block) { + let accum = ''; + for(let i = 0; i < n; i++) { + accum += block.fn(i); + } + return accum; + }, + localeHelper(locale, propString, propVar, extra) { + /* + locale: the json locale object + propString: the "path" to the property to get (e.g. "faq.title") + propVar: the dynamic property name to get after the "path" (e.g. localeHelper locale "account.level" would result in ) + e.g. localeHelper locale "account.test" "account.level" would result in locale.account.test[account.level] + */ + + let value = locale; + const props = propString.split('.'); + + if ( typeof propVar === 'string' || propVar instanceof String || + typeof propVar === 'number' || propVar instanceof Number ) { + props.push(propVar); + } + + function getPropFromLocale(value, props) { + for (const p of props) { + value = value[p]; + } + + return value; + } + + // fall back to english if the prop doesn't exist in the current locale + try { + value = getPropFromLocale(value, props); + } catch (e) { + value = defaultLocale; + try { + value = getPropFromLocale(value, props); + } catch (e) { + logger.error(`Could not find locale property ${props.join('.')}`); + } + } + + // TODO: Make this more dynamic + if (extra) { + value = value[extra]; + } + + return value; + }, slug(string) { return string.toLowerCase().replaceAll(/ /g, '-'); } diff --git a/src/util.js b/src/util.js index 87149b4..6598b31 100644 --- a/src/util.js +++ b/src/util.js @@ -6,14 +6,11 @@ const Stripe = require('stripe'); const { marked } = require('marked'); const { REST: DiscordRest } = require('@discordjs/rest'); const { Routes: DiscordRoutes } = require('discord-api-types/v10'); -const merge = require('lodash.merge'); - const mailer = require('./mailer'); const database = require('./database'); const logger = require('./logger'); - const config = require('../config.json'); -const baseLocale = require(`${__dirname}/../locales/en_US.json`); + const discordRest = new DiscordRest({ version: '10' }).setToken(config.discord.bot_token); const stripe = new Stripe(config.stripe.secret_key); @@ -26,15 +23,12 @@ function getLocale(language, region) { const path = `${__dirname}/../locales/${language}_${region}.json`; if (fs.pathExistsSync(path)) { - const selectedLocale = require(path); - const finalLocale = merge(baseLocale, selectedLocale); - - return finalLocale; + return require(path); } logger.warn(`Could not find locale ${language}_${region}! Loading en_US`); - return baseLocale; + return require(`${__dirname}/../locales/en_US.json`); } function getRawDocs(locale, subpath, pageName) { diff --git a/views/account/account.handlebars b/views/account/account.handlebars index 230d70c..2ffe7f6 100644 --- a/views/account/account.handlebars +++ b/views/account/account.handlebars @@ -16,29 +16,29 @@

{{tierName}}

{{else}} {{#if (neq account.access_level -1)}} -

{{ lookup locale.account.accountLevel account.access_level }}

+

{{ localeHelper locale "account.accountLevel" account.access_level }}

{{else}} -

{{ locale.account.banned }}

+

{{ localeHelper locale "account.banned" }}

{{/if}} {{/if}}
-

{{ locale.account.settings.downloadFiles }}

-

{{ locale.account.settings.downloadFilesDescription }}

+

{{ localeHelper locale "account.settings.downloadFiles" }}

+

{{ localeHelper locale "account.settings.downloadFilesDescription" }}

 -

{{ locale.account.settings.upgrade }}

+

{{ localeHelper locale "account.settings.upgrade" }}
-

{{ locale.account.settings.settingCards.userSettings }}

+

User settings

-

{{ locale.account.settings.settingCards.profile }}

+

{{ localeHelper locale "account.settings.settingCards.profile" }}

@@ -46,30 +46,30 @@
-

{{ locale.account.settings.settingCards.serverEnv }}

+

{{ localeHelper locale "account.settings.settingCards.serverEnv" }}

@@ -82,7 +82,7 @@ -

{{ locale.account.settings.settingCards.production }}

+

{{ localeHelper locale "account.settings.settingCards.production" }}

{{#if isTester}} @@ -90,21 +90,21 @@ -

{{ locale.account.settings.settingCards.beta }}

+

{{ localeHelper locale "account.settings.settingCards.beta" }}

{{/if}}
{{#unless isTester}} -

{{{ locale.account.settings.settingCards.upgradePrompt }}}

+

{{{ localeHelper locale "account.settings.settingCards.upgradePrompt" }}}

{{else}} -

{{ locale.account.settings.settingCards.hasAccessPrompt }}

+

{{ localeHelper locale "account.settings.settingCards.hasAccessPrompt" }}

{{/unless}}
-

{{ locale.account.settings.settingCards.signInSecurity }}

+

{{ localeHelper locale "account.settings.settingCards.signInSecurity" }}

-

{{ locale.account.account }}

+

Account

@@ -112,20 +112,20 @@ -

{{ locale.account.settings.settingCards.passwordResetNotice }}

+

{{ localeHelper locale "account.settings.settingCards.passwordResetNotice" }}

-

{{ locale.account.settings.settingCards.signInHistory }}

-

{{ locale.account.settings.settingCards.no_signins_notice }}

+

{{ localeHelper locale "account.settings.settingCards.signInHistory" }}

+

Sign in history not currently tracked. Check back again later

- +
-

{{ locale.account.settings.settingCards.otherSettings }}

+

{{ localeHelper locale "account.settings.settingCards.otherSettings" }}

-

{{ locale.account.settings.settingCards.discord }}

+

{{ localeHelper locale "account.settings.settingCards.discord" }}

{{#if discordUser}} -

{{ locale.account.settings.settingCards.connectedToDiscord }} {{ discordUser.username }}#{{ discordUser.discriminator }}

+

{{ localeHelper locale "account.settings.settingCards.connectedToDiscord" }} {{ discordUser.username }}#{{ discordUser.discriminator }}

- + {{else}} -

{{ locale.account.settings.settingCards.noDiscordLinked }} {{ locale.account.settings.settingCards.linkDiscord }}

+

{{ localeHelper locale "account.settings.settingCards.noDiscordLinked" }} {{ localeHelper locale "account.settings.settingCards.linkDiscord" }}

{{/if}}
-

{{ locale.account.settings.settingCards.newsletter }}

-

{{ locale.account.settings.settingCards.no_newsletter_notice }}

+

{{ localeHelper locale "account.settings.settingCards.newsletter" }}

+

Newsletter not currently available. Check back again later

@@ -185,22 +185,23 @@ + diff --git a/views/account/login.handlebars b/views/account/login.handlebars index 6ae3aa3..7664ed6 100644 --- a/views/account/login.handlebars +++ b/views/account/login.handlebars @@ -6,22 +6,22 @@
diff --git a/views/account/register.handlebars b/views/account/register.handlebars index 0c8b726..8419bad 100644 --- a/views/account/register.handlebars +++ b/views/account/register.handlebars @@ -7,33 +7,33 @@
diff --git a/views/account/upgrade.handlebars b/views/account/upgrade.handlebars index 5ef9a07..d353629 100644 --- a/views/account/upgrade.handlebars +++ b/views/account/upgrade.handlebars @@ -2,7 +2,7 @@
- {{ locale.upgrade.back }} + {{ localeHelper locale "upgrade.back" }}

- {{this.price}} / {{ locale.upgrade.month }} + {{this.price}} / {{ localeHelper locale "upgrade.month" }}

{{/each}}
- - + +
diff --git a/views/blog/blog.handlebars b/views/blog/blog.handlebars index ee03b0a..d5056e9 100644 --- a/views/blog/blog.handlebars +++ b/views/blog/blog.handlebars @@ -7,8 +7,8 @@
-

{{ locale.blogPage.title }}

-

{{{ locale.blogPage.description }}}

+

{{ localeHelper locale "blogPage.title" }}

+

{{{ localeHelper locale "blogPage.description" }}}

@@ -18,12 +18,12 @@

{{{ this.postInfo.title }}}

{{{ this.postInfo.caption }}}

- {{ ../locale.blogPage.published }} + {{ localeHelper ../locale "blogPage.published" }}
{{{ this.postInfo.author }}}
- {{ ../locale.blogPage.publishedOn }} + {{ localeHelper ../locale "blogPage.publishedOn" }} {{{ this.postInfo.date }}}
diff --git a/views/blog/blogpost.handlebars b/views/blog/blogpost.handlebars index 21ac56b..dfb61ec 100644 --- a/views/blog/blogpost.handlebars +++ b/views/blog/blogpost.handlebars @@ -9,12 +9,12 @@

{{{ postInfo.title }}}

- {{ locale.blogPage.published }} + {{ localeHelper locale "blogPage.published" }}
{{ postInfo.author }} {{{ postInfo.author }}}
- {{ locale.blogPage.publishedOn }} + {{ localeHelper locale "blogPage.publishedOn" }} {{{ postInfo.date }}}
diff --git a/views/docs/docs.handlebars b/views/docs/docs.handlebars index b080960..ec5394c 100644 --- a/views/docs/docs.handlebars +++ b/views/docs/docs.handlebars @@ -38,9 +38,15 @@
- +
+ Note! +
+ Pretendo Network is currently in closed beta! The servers are only accessible to testers. To become a tester, + upgrade your PNID here +
+ {{#if missingInLocale}} -

{{ locale.docs.missingInLocale }}

+

{{ localeHelper locale "docs.missingInLocale" }}

{{/if}} {{{ content }}} diff --git a/views/docs/search.handlebars b/views/docs/search.handlebars index b05907a..339a4a2 100644 --- a/views/docs/search.handlebars +++ b/views/docs/search.handlebars @@ -39,9 +39,9 @@
-

{{ locale.docs.search.title }}

-

{{ locale.docs.search.caption }}

- +

Got an error code?

+

Type it in the box below to get information on your issue!

+
@@ -107,7 +107,7 @@ }); } else { const noMatch = document.createElement('p'); - noMatch.innerText = '{{ locale.docs.search.no_match }}'; + noMatch.innerText = 'No matches found'; matchesContainer.appendChild(noMatch); } }); diff --git a/views/docs/welcome.handlebars b/views/docs/welcome.handlebars index 76d7b25..5424440 100644 --- a/views/docs/welcome.handlebars +++ b/views/docs/welcome.handlebars @@ -44,7 +44,7 @@
-

{{ locale.docs.quickLinks.header }}

+

{{ localeHelper locale "docs.quickLinks.header" }}

-

{{ locale.docs.quickLinks.links.[0].header }}

-

{{ locale.docs.quickLinks.links.[0].caption }}

+

{{ localeHelper locale "docs.quickLinks.links" 0 "header" }}

+

{{ localeHelper locale "docs.quickLinks.links" 0 "caption" }}

-

{{ locale.docs.quickLinks.links.[1].header }}

-

{{ locale.docs.quickLinks.links.[1].caption }}

+

{{ localeHelper locale "docs.quickLinks.links" 1 "header" }}

+

{{ localeHelper locale "docs.quickLinks.links" 1 "caption" }}

- + \ No newline at end of file diff --git a/views/home.handlebars b/views/home.handlebars index 7a41f4f..e96c33d 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -5,13 +5,15 @@
-

{{ locale.hero.subtitle }}

-

{{ locale.hero.title }}

-

{{ locale.hero.text }}

+

{{ localeHelper locale "hero.subtitle" }}

+

{{ localeHelper locale "hero.title" }}

+

+ {{ localeHelper locale "hero.text" }} +

@@ -73,7 +75,7 @@
-

{{ locale.aboutUs.title }}

+

{{ localeHelper locale "aboutUs.title" }}

{{#each locale.aboutUs.paragraphs}}

{{ this }}

{{/each}} @@ -81,7 +83,7 @@

- {{ locale.progress.title }} + {{ localeHelper locale "progress.title" }}

{{> progress-list data=featuredFeatureList purple=true }}
@@ -89,8 +91,8 @@
-

{{ locale.faq.title }}

-

{{ locale.faq.text }}

+

{{ localeHelper locale "faq.title" }}

+

{{ localeHelper locale "faq.text" }}

{{#doFaq locale.faq.QAs}} @@ -108,32 +110,32 @@
-

{{ locale.showcase.title }}

-

{{ locale.showcase.text }}

+

{{ localeHelper locale "showcase.title" }}

+

{{ localeHelper locale "showcase.text" }}

-

{{ locale.showcase.cards.0.title }}

-

{{ locale.showcase.cards.0.caption }}

+

{{ localeHelper locale "showcase.cards.0.title" }}

+

{{ localeHelper locale "showcase.cards.0.caption" }}

-

{{ locale.showcase.cards.1.title }}

-

{{ locale.showcase.cards.1.caption }}

+

{{ localeHelper locale "showcase.cards.1.title" }}

+

{{ localeHelper locale "showcase.cards.1.caption" }}

-

{{ locale.showcase.cards.2.title }}

-

{{ locale.showcase.cards.2.caption }}

+

{{ localeHelper locale "showcase.cards.2.title" }}

+

{{ localeHelper locale "showcase.cards.2.caption" }}

-

{{ locale.credits.title }}

-

{{ locale.credits.text }}

+

{{ localeHelper locale "credits.title" }}

+

{{ localeHelper locale "credits.text" }}

{{#each locale.credits.people}} @@ -158,8 +160,8 @@
-

{{ locale.specialThanks.title }}

-

{{ locale.specialThanks.text }}

+

{{ localeHelper locale "specialThanks.title" }}

+

{{ localeHelper locale "specialThanks.text" }}

@@ -196,12 +198,12 @@ diff --git a/views/localization.handlebars b/views/localization.handlebars index 83034b9..4db42b2 100644 --- a/views/localization.handlebars +++ b/views/localization.handlebars @@ -6,17 +6,17 @@
-

{{ locale.localizationPage.title" }}

-

{{ locale.localizationPage.description" }}

+

{{ localeHelper locale "localizationPage.title" }}

+

{{ localeHelper locale "localizationPage.description" }}

- {{ locale.localizationPage.instructions" }} + {{ localeHelper locale "localizationPage.instructions" }}
- +
- - + +
diff --git a/views/partials/docs-sidebar.handlebars b/views/partials/docs-sidebar.handlebars index 8c63f45..5737935 100644 --- a/views/partials/docs-sidebar.handlebars +++ b/views/partials/docs-sidebar.handlebars @@ -1,13 +1,13 @@
-
{{ locale.docs.sidebar.getting_started }}
- {{ locale.docs.sidebar.welcome }} - {{ locale.docs.sidebar.install_extended }} - {{ locale.docs.sidebar.search }} +
Getting started
+ Welcome + Install Pretendo + Search
-
{{ locale.docs.sidebar.install }}
+
Install
Wii U 3DS Cemu @@ -16,7 +16,7 @@
-
{{ locale.docs.sidebar.juxt_err }}
+
Error codes - Juxt
JXT-598-0009 JXT-598-0010 JXT-598-0011 diff --git a/views/partials/footer.handlebars b/views/partials/footer.handlebars index a5c7b20..c9f3beb 100644 --- a/views/partials/footer.handlebars +++ b/views/partials/footer.handlebars @@ -28,30 +28,29 @@

Site by mrjvs, jipfr & monty

-

{{ locale.footer.socials }}

+

{{ localeHelper locale "footer.socials" }}

Twitter Discord GitHub
-

{{ locale.footer.widget.captions.[0] }}

-

{{ locale.footer.widget.captions.[1] }}

+

{{ localeHelper locale "footer.widget.captions.0" }}

+

{{ localeHelper locale "footer.widget.captions.1" }}

- {{ locale.footer.widget.button }} + {{ localeHelper locale "footer.widget.button" }}
@@ -74,11 +73,10 @@ return el.innerText; } - const randomSentences = [ - {{#each locale.footer.bandwidthRaccoonQuotes}} - `${unescapeHTML("{{this}}")}`, - {{/each}} + {{#times 9}} + `${unescapeHTML("{{localeHelper locale "footer.bandwidthRaccoonQuotes" this }}")}`, + {{/times}} ] bandwidthRaccoon.addEventListener("click", () => diff --git a/views/partials/header.handlebars b/views/partials/header.handlebars index b82936b..be2e392 100644 --- a/views/partials/header.handlebars +++ b/views/partials/header.handlebars @@ -27,13 +27,13 @@
@@ -156,12 +156,12 @@
diff --git a/views/partials/progress-list.handlebars b/views/partials/progress-list.handlebars index 4395bdf..fdeb9f5 100644 --- a/views/partials/progress-list.handlebars +++ b/views/partials/progress-list.handlebars @@ -13,7 +13,7 @@
{{/if}} diff --git a/views/progress.handlebars b/views/progress.handlebars index 9be28da..2f0f574 100644 --- a/views/progress.handlebars +++ b/views/progress.handlebars @@ -7,8 +7,8 @@
-

{{ locale.progressPage.title }}

-

{{ locale.progressPage.description }}

+

{{ localeHelper locale "progressPage.title" }}

+

{{ localeHelper locale "progressPage.description" }}

@@ -18,7 +18,7 @@
-

{{{ locale.donation.progress }}} {{{ locale.donation.upgradePush }}}

+

{{{ localeHelper locale "donation.progress" }}} {{{ localeHelper locale "donation.upgradePush" }}}