diff --git a/locales/ar_AR.json b/locales/ar_AR.json index df0188c..2043310 100644 --- a/locales/ar_AR.json +++ b/locales/ar_AR.json @@ -68,25 +68,6 @@ } ] }, - "showcase": { - "title": "What we make", - "text": "Our project has many components. Here are some of them.", - "cards": [ - { - "title": "Game servers", - "caption": "Bringing back your favorite games and content using custom servers." - }, - { - "title": "Juxtaposition", - "caption": "A re-imagining of Miiverse, as if it were made in the modern era." - }, - { - "title": "Cemu support", - "caption": "Play your favorite Wii U titles even without a console!" - } - - ] - }, "credits": { "title": "الفريق", "text": "قابل الفريق وراء المشروع", @@ -195,25 +176,6 @@ } ] }, - "discordJoin": { - "title": "Stay up to date", - "text": "Join our Discord server to get the latest updates on the project.", - "widget": { - "text": "Get realtime updates to our progress", - "button": "Join the server" - } - }, - "footer": { - "socials": "Socials", - "usefulLinks": "Useful links", - "widget": { - "captions": [ - "Want to keep updated?", - "Join our Discord server!" - ], - "button": "Join now!" - } - }, "progressPage": { "title": "تقدمنا", "description": "تحقق من تقدم المشروع والأهداف! (يتم تحديثه كل ساعة أو نحو ذلك ، ولا يعكس جميع أهداف المشروع أو تقدمه)" @@ -222,37 +184,10 @@ "title": "البلوج", "description": "آخر التحديثات في أجزاء مكثفة. إذا كنت ترغب في رؤية المزيد من التحديثات المتكررة ، ففكر في دعمنا على Patreon . " }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "!لنترجم", "description": "الصق رابطا إلي لغة الزيسون يمكن الوصول إليها بشكل عام لاختبارها على موقع الويب", "instructions": "اظهر خطوات الترجمة", - "fileInput": "ملف للتجربة", - "filePlaceholder": "https://a.link.to/the_file.json", - "button": "Test file" - }, - "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", - "quickLinks": { - "header": "Quick links", - "links": [ - { - "header": "Install Pretendo", - "caption": "View the setup instructions" - }, - { - "header": "Got an error?", - "caption": "Search for it here" - } - ] - } + "fileInput": "ملف للتجربة" } } diff --git a/locales/de_DE.json b/locales/de_DE.json index d9db7b3..899e3c6 100644 --- a/locales/de_DE.json +++ b/locales/de_DE.json @@ -4,9 +4,7 @@ "faq": "FAQ", "docs": "Docs", "credits": "Mitwirkende", - "progress": "Fortschritt", - "blog": "Blog", - "account": "Account" + "progress": "Fortschritt" }, "hero": { "subtitle": "Spiel-Server", @@ -222,38 +220,5 @@ "blogPage": { "title": "Blog", "description": "Die letzten Updates in Kurzform. Wenn du Updates häufiger einsehen möchtest, unterstütze uns doch bei Patreon." - }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, - "localizationPage": { - "title": "Let's localize", - "description": "Paste a link to a publicly accessible JSON locale to test it on the website", - "instructions": "View localization instructions", - "fileInput": "File to test", - "filePlaceholder": "https://a.link.to/the_file.json", - "button": "Test file" - }, - "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", - "quickLinks": { - "header": "Quick links", - "links": [ - { - "header": "Install Pretendo", - "caption": "View the setup instructions" - }, - { - "header": "Got an error?", - "caption": "Search for it here" - } - ] - } } } diff --git a/locales/en_US.json b/locales/en_US.json index 019c350..2f2e595 100644 --- a/locales/en_US.json +++ b/locales/en_US.json @@ -6,7 +6,11 @@ "credits": "Credits", "progress": "Progress", "blog": "Blog", - "account": "Account" + "account": "Account", + "accountWidget": { + "settings": "Settings", + "logout": "Logout" + } }, "hero": { "subtitle": "Game servers", @@ -25,10 +29,7 @@ }, "progress": { "title": "Progress", - "paragraphs": [ - "Currently, we are working on Miiverse, along with our account servers and its integration with the services.", - "For 3DS, we are also working on Mario Kart 7, with a desire to continue working on other games when possible." - ] + "githubRepo": "Github repository" }, "faq": { "title": "Frequently Asked Questions", @@ -221,9 +222,57 @@ }, "blogPage": { "title": "Blog", - "description": "The latest updates in condensed chunks. If you want to see more frequent updates, consider supporting us on Patreon." + "description": "The latest updates in condensed chunks. If you want to see more frequent updates, consider supporting us on Patreon.", + "published": "Published by", + "publishedOn": "on" }, "account": { + "loginForm": { + "login": "Login", + "register": "Register", + "detailsPrompt": "Enter your account details below", + "username": "Username", + "password": "Password", + "confirmPassword": "Confirm password", + "email": "Email", + "miiName": "Mii name", + "forgotPassword": "Forgot your password?", + "registerPrompt": "Don't have an account?", + "loginPrompt": "Already have an account?" + }, + "settings": { + "downloadFiles": "Download account files", + "downloadFilesDescription": "(will not work on Nintendo Network)", + "upgrade": "Upgrade account", + "settingCards": { + "profile": "Profile", + "nickname": "Nickname", + "birthDate": "Birth date", + "gender": "Gender", + "country": "Country/region", + "timezone": "Timezone", + "serverEnv": "Server environment", + "production": "Production", + "beta": "Beta", + "upgradePrompt": "Beta servers are exclusive to beta testers.
To become a beta tester, upgrade to a higher account tier.", + "hasAccessPrompt": "Your current tier gives you beta server access. Cool!", + "signInSecurity": "Sign in and security", + "email": "Email", + "password": "Password", + "passwordResetNotice": "After changing your password, you will be signed out from all devices.", + "signInHistory": "Sign in history", + "fullSignInHistory": "View full sign in history", + "otherSettings": "Other settings", + "discord": "Discord", + "connectedToDiscord": "Connected to Discord as", + "removeDiscord": "Remove Discord account", + "noDiscordLinked": "No Discord account linked.", + "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" + } + }, "accountLevel": [ "Standard", "Tester", @@ -232,6 +281,23 @@ ], "banned": "Banned" }, + "upgrade": { + "title": "Upgrade", + "description": "Reaching the monthly goal will make Pretendo a full time job, providing better quality updates at a faster rate.", + "month": "month", + "tierSelectPrompt": "Select a tier", + "unsub": "Unsubscribe", + "unsubPrompt": "Are you sure you want to unsubscribe from tiername? You will lose access to the perks associated with that tier.", + "unsubConfirm": "Unsubscribe", + "changeTier": "Change tier", + "changeTierPrompt": "Are you sure you want to unsubscribe from oldtiername and subscribe to newtiername?", + "changeTierConfirm": "Change tier", + "back": "Back" + }, + "donation": { + "progress": "$${totd} of $${goald}/month, ${perc}% of the monthly goal.", + "upgradePush": "To become a subscriber and gain access to cool perks, visit the upgrade page." + }, "localizationPage": { "title": "Let's localize", "description": "Paste a link to a publicly accessible JSON locale to test it on the website", @@ -255,5 +321,9 @@ } ] } + }, + "modals": { + "cancel": "Cancel", + "confirm": "Confirm" } } diff --git a/locales/es_ES.json b/locales/es_ES.json index d6b4e24..42ef30b 100644 --- a/locales/es_ES.json +++ b/locales/es_ES.json @@ -223,15 +223,6 @@ "title": "Blog", "description": "Las últimas actualizaciones en pequeñas cantidades. Si quieres ver actualizaciones más frecuentes, considera apoyarnos en Patreon." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "Vamos a localizar", "description": "Pega un enlace a una localización JSON accesible pulicamente para probarla en el sitio", diff --git a/locales/fr_FR.json b/locales/fr_FR.json index 8dfc2fb..709c0de 100644 --- a/locales/fr_FR.json +++ b/locales/fr_FR.json @@ -225,15 +225,6 @@ "title": "Blog", "description": "Les dernières mises à jour en blocs condensés. Si vous souhaitez voir des mises à jour plus fréquentes, envisagez de nous soutenir sur Patreon." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "Localisons", "description": "Collez un lien vers un paramètre régional JSON accessible au public pour le tester sur le site Web", diff --git a/locales/ja_JP.json b/locales/ja_JP.json index b5a5492..042cc3b 100644 --- a/locales/ja_JP.json +++ b/locales/ja_JP.json @@ -223,15 +223,6 @@ "title": "ブログ（英語）", "description": "最新のアップデートをまとめてお届けします。もっと多くのアップデートを貰いたい方は、Patreonでの寄付をご検討ください。" }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "レッツローカライズ", "description": "公開されているJSONへのリンクを貼り付けてこのサイトに試してみて下さい！", diff --git a/locales/ko_KR.json b/locales/ko_KR.json index bd0949d..409ad8c 100644 --- a/locales/ko_KR.json +++ b/locales/ko_KR.json @@ -223,15 +223,6 @@ "title": "블로그", "description": "내용이 압축된 최신 업데이트입니다. 만약 더 많은 업데이트를 원하신다면, Patreon에 기부하는 것을 검토해 주세요." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "같이 번역해 주세요!", "description": "액세스 가능한 JSON의 링크를 붙여넣어서, 웹사이트에서 테스트해 보세요!", diff --git a/locales/nb_NO.json b/locales/nb_NO.json index 0e431a8..3003a95 100644 --- a/locales/nb_NO.json +++ b/locales/nb_NO.json @@ -223,15 +223,6 @@ "title": "Blogg", "description": "De nyeste oppdateringen er i kondensert biter. Hvis du har lyst til å se mer hyppig oppdateringen, tenk om å støtte oss på Patreon." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "La oss lokalisere", "description": "Lim inn en lenke til en offentlig JSON lokal til å teste det på nettsiden", diff --git a/locales/nl_NL.json b/locales/nl_NL.json index da83bf8..6396fe9 100644 --- a/locales/nl_NL.json +++ b/locales/nl_NL.json @@ -4,9 +4,7 @@ "faq": "FAQ", "docs": "Docs", "credits": "Credits", - "progress": "Vooruitgang", - "blog": "Blog", - "account": "Account" + "progress": "Vooruitgang" }, "hero": { "subtitle": "Game servers", @@ -68,25 +66,6 @@ } ] }, - "showcase": { - "title": "What we make", - "text": "Our project has many components. Here are some of them.", - "cards": [ - { - "title": "Game servers", - "caption": "Bringing back your favorite games and content using custom servers." - }, - { - "title": "Juxtaposition", - "caption": "A re-imagining of Miiverse, as if it were made in the modern era." - }, - { - "title": "Cemu support", - "caption": "Play your favorite Wii U titles even without a console!" - } - - ] - }, "credits": { "title": "Het team", "text": "Ontmoet het team achter het project", @@ -196,25 +175,6 @@ } ] }, - "discordJoin": { - "title": "Stay up to date", - "text": "Join our Discord server to get the latest updates on the project.", - "widget": { - "text": "Get realtime updates to our progress", - "button": "Join the server" - } - }, - "footer": { - "socials": "Socials", - "usefulLinks": "Useful links", - "widget": { - "captions": [ - "Want to keep updated?", - "Join our Discord server!" - ], - "button": "Join now!" - } - }, "progressPage": { "title": "Onze vooruitgang", "description": "Zie hier onze vooruitgang! (Wordt elk uur ververst, geeft niet ALLE vooruitgang en doelen weer)" @@ -223,15 +183,6 @@ "title": "Blog", "description": "De meest recente samenvattingen. Als je vaker nieuws wil, overweeg ons op Patreon te ondersteunen." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "Laten we meer talen toe voegen!", "description": "Voeg hier een link in voor een openbaar JSON bestand om het op de site te testen.", @@ -239,21 +190,5 @@ "fileInput": "Bestand om te testen", "filePlaceholder": "https://een.link.naar/het_bestand.json", "button": "Test bestand" - }, - "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", - "quickLinks": { - "header": "Quick links", - "links": [ - { - "header": "Install Pretendo", - "caption": "View the setup instructions" - }, - { - "header": "Got an error?", - "caption": "Search for it here" - } - ] - } } } diff --git a/locales/pl_PL.json b/locales/pl_PL.json index c1bdb73..3e8a99f 100644 --- a/locales/pl_PL.json +++ b/locales/pl_PL.json @@ -222,15 +222,6 @@ "title": "Blog", "description": "Najnowsze informacje w krótkich tekstach. Jeśli chcesz otrzymywać częstsze aktualizacje, pomyśl nad wsparciem nas na Patreon." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "Tłumaczmy", "description": "Wklej link do publicznego pliku JSON, aby przetestować go na stronie", diff --git a/locales/pt_BR.json b/locales/pt_BR.json index f9ca0cb..5855a50 100644 --- a/locales/pt_BR.json +++ b/locales/pt_BR.json @@ -223,15 +223,6 @@ "title": "Blog", "description": "As atualizações mais recentes em postagens condensadas. Se você quiser ver atualizações com mais frequência, considere nos ajudar no Patreon." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "Vamos traduzir", "description": "Cole um link para um arquivo JSON acessível publicamente para testá-lo no site", @@ -239,21 +230,5 @@ "fileInput": "Arquivo para testar", "filePlaceholder": "https://a.link.to/the_file.json", "button": "Testar aqui" - }, - "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", - "quickLinks": { - "header": "Quick links", - "links": [ - { - "header": "Install Pretendo", - "caption": "View the setup instructions" - }, - { - "header": "Got an error?", - "caption": "Search for it here" - } - ] - } } } diff --git a/locales/ro_RO.json b/locales/ro_RO.json index 384c2e1..06d37ec 100644 --- a/locales/ro_RO.json +++ b/locales/ro_RO.json @@ -4,9 +4,7 @@ "faq": "FAQ", "docs": "Docs", "credits": "Mulțumiri", - "progress": "Progres", - "blog": "Blog", - "account": "Account" + "progress": "Progres" }, "hero": { "subtitle": "Servere de Jocuri", @@ -223,15 +221,6 @@ "title": "Blog", "description": "Ultimele actualizări în bucăți condensate. Dacă vrei să vezi mai multe actualizări, consideră să ne susții pe Patreon." }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "Hai să localizăm", "description": "Inserați un link către un JSON public pentru a testa traducerea pe site", @@ -239,21 +228,5 @@ "fileInput": "Fișier de testare", "filePlaceholder": "https://a.link.to/the_file.json", "button": "Testează fișier" - }, - "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", - "quickLinks": { - "header": "Quick links", - "links": [ - { - "header": "Install Pretendo", - "caption": "View the setup instructions" - }, - { - "header": "Got an error?", - "caption": "Search for it here" - } - ] - } } } diff --git a/locales/ru_RU.json b/locales/ru_RU.json index bb4e695..ee14c33 100644 --- a/locales/ru_RU.json +++ b/locales/ru_RU.json @@ -4,9 +4,7 @@ "faq": "ЧаВо", "docs": "Docs", "credits": "Команда", - "progress": "Прогресс", - "blog": "Blog", - "account": "Account" + "progress": "Прогресс" }, "hero": { "subtitle": "Игровые сервера", @@ -68,25 +66,6 @@ } ] }, - "showcase": { - "title": "What we make", - "text": "Our project has many components. Here are some of them.", - "cards": [ - { - "title": "Game servers", - "caption": "Bringing back your favorite games and content using custom servers." - }, - { - "title": "Juxtaposition", - "caption": "A re-imagining of Miiverse, as if it were made in the modern era." - }, - { - "title": "Cemu support", - "caption": "Play your favorite Wii U titles even without a console!" - } - - ] - }, "credits": { "title": "Наша команда", "text": "Ознакомтесь с командой, которая работает над разработкой Pretendo.", diff --git a/locales/tr_TR.json b/locales/tr_TR.json index 8b2ab66..d26f668 100644 --- a/locales/tr_TR.json +++ b/locales/tr_TR.json @@ -4,9 +4,7 @@ "faq": "SSS", "docs": "Docs", "credits": "Katkıda Bulunanlar", - "progress": "İlerleme", - "blog": "Blog", - "account": "Account" + "progress": "İlerleme" }, "hero": { "subtitle": "Oyun sunucuları", @@ -68,25 +66,6 @@ } ] }, - "showcase": { - "title": "What we make", - "text": "Our project has many components. Here are some of them.", - "cards": [ - { - "title": "Game servers", - "caption": "Bringing back your favorite games and content using custom servers." - }, - { - "title": "Juxtaposition", - "caption": "A re-imagining of Miiverse, as if it were made in the modern era." - }, - { - "title": "Cemu support", - "caption": "Play your favorite Wii U titles even without a console!" - } - - ] - }, "credits": { "title": "Ekip", "text": "Projenin arkasındaki ekiple tanışın", @@ -196,64 +175,8 @@ } ] }, - "discordJoin": { - "title": "Stay up to date", - "text": "Join our Discord server to get the latest updates on the project.", - "widget": { - "text": "Get realtime updates to our progress", - "button": "Join the server" - } - }, - "footer": { - "socials": "Socials", - "usefulLinks": "Useful links", - "widget": { - "captions": [ - "Want to keep updated?", - "Join our Discord server!" - ], - "button": "Join now!" - } - }, "progressPage": { "title": "İlerlememiz", "description": "Proje ilerlemesini ve hedeflerini kontrol edin! (Her saat başı güncellenir. TÜM proje hedeflerini veya ilerlemesini yansıtmaz)" - }, - "blogPage": { - "title": "Blog", - "description": "The latest updates in condensed chunks. If you want to see more frequent updates, consider supporting us on Patreon." - }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, - "localizationPage": { - "title": "Let's localize", - "description": "Paste a link to a publicly accessible JSON locale to test it on the website", - "instructions": "View localization instructions", - "fileInput": "File to test", - "filePlaceholder": "https://a.link.to/the_file.json", - "button": "Test file" - }, - "docs": { - "missingInLocale": "This page is unavailable in your locale. Please check the English version below.", - "quickLinks": { - "header": "Quick links", - "links": [ - { - "header": "Install Pretendo", - "caption": "View the setup instructions" - }, - { - "header": "Got an error?", - "caption": "Search for it here" - } - ] - } } } diff --git a/locales/zh_CN.json b/locales/zh_CN.json index bbb5d4a..99d5fcb 100644 --- a/locales/zh_CN.json +++ b/locales/zh_CN.json @@ -223,15 +223,6 @@ "title": "博客", "description": "压缩块的最新更新。如果您想看到更频繁的更新，请考虑在 Patreon 上支持我们。" }, - "account": { - "accountLevel": [ - "Standard", - "Tester", - "Moderator", - "Developer" - ], - "banned": "Banned" - }, "localizationPage": { "title": "让我们本地化", "description": "粘贴指向可公开访问的 JSON 语言环境的链接以在网站上对其进行测试", diff --git a/src/server.js b/src/server.js index 2dce61b..8c4bf7d 100644 --- a/src/server.js +++ b/src/server.js @@ -136,28 +136,43 @@ app.engine('handlebars', handlebars({ neq(value1, value2) { return value1 !== value2; }, - localeHelper(...args) { - let userLocaleString = args[0]; - + localeHelper(locale, propString, propVar) { /* - * Removes the first and the last argument, and then loops through the rest to - * get the string in the user's locale. If not available, it will return it in - * the default locale. - */ + 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] + */ - args.slice(1, -1).forEach(arg => { - userLocaleString = userLocaleString?.[arg]; - }); + let value = locale; + const props = propString.split('.'); - if (!userLocaleString) { - let defaultLocaleString = defaultLocale; - args.slice(1, -1).forEach(arg => { - defaultLocaleString = defaultLocaleString?.[arg]; - }); - return defaultLocaleString; - } else { - return userLocaleString; + 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('.')}`); + } + } + + return value; } } })); diff --git a/views/account/account.handlebars b/views/account/account.handlebars index a4b5b01..c94cbff 100644 --- a/views/account/account.handlebars +++ b/views/account/account.handlebars @@ -14,21 +14,21 @@

{{tierName}}

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

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

+

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

{{else}} -

{{ localeHelper locale "account" "banned" }}

+

{{ localeHelper locale "account.banned" }}

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

Download account files

-

(will not work on Nintendo Network)

+

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

+

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

 -

Upgrade account

+

{{ localeHelper locale "account.settings.upgrade" }}
@@ -36,7 +36,7 @@

User settings

-

Profile

+

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

@@ -44,30 +44,30 @@
-

Server environment

+

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

@@ -80,7 +80,7 @@ -

Production

+

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

{{#if isTester}} @@ -88,19 +88,19 @@ -

Beta

+

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

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

Beta servers are exclusive to beta testers.
To become a beta tester, upgrade to a higher account tier.

+

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

{{else}} -

Your current tier gives you beta server access. Cool!

+

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

{{/unless}}
-

Sign in and security

+

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

Account

@@ -110,19 +110,19 @@ -

After changing your password, you will be signed out from all devices.

+

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

-

Sign in history

+

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

- +
-

Other settings

+

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

-

Discord

+

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

{{#if discordUser}} -

Connected to Discord as {{ discordUser.username }}#{{ discordUser.discriminator }}

- +

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

+ {{else}} -

No Discord account linked. Link Discord account here

+

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

{{/if}}
-

Newsletter

+

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

- +
@@ -178,12 +178,12 @@ diff --git a/views/account/login.handlebars b/views/account/login.handlebars index 03e004c..7664ed6 100644 --- a/views/account/login.handlebars +++ b/views/account/login.handlebars @@ -6,22 +6,22 @@
-

Sign in

-

Enter your account details below

+

{{ localeHelper locale "account.loginForm.login" }}

+

{{ localeHelper locale "account.loginForm.detailsPrompt" }}

- +
- + - Forgot your password? + {{ localeHelper locale "account.loginForm.forgotPassword" }}
- - Don't have an account? + + {{ localeHelper locale "account.loginForm.registerPrompt" }}
diff --git a/views/account/register.handlebars b/views/account/register.handlebars index a9b3b61..8419bad 100644 --- a/views/account/register.handlebars +++ b/views/account/register.handlebars @@ -7,33 +7,33 @@
-

Register

-

Enter your account details below

+

{{ localeHelper locale "account.loginForm.register" }}

+

{{ localeHelper locale "account.loginForm.detailsPrompt" }}

- +
- +
- +
- +
- - Already have an account? + + {{ localeHelper locale "account.loginForm.loginPrompt" }}
diff --git a/views/account/upgrade.handlebars b/views/account/upgrade.handlebars index 32a8bb9..6e8b32a 100644 --- a/views/account/upgrade.handlebars +++ b/views/account/upgrade.handlebars @@ -2,7 +2,7 @@
- Back + {{ localeHelper locale "upgrade.back" }}
@@ -31,17 +31,15 @@ -

Upgrade

-

- Reaching the monthly goal will make Pretendo a full time job, providing better quality updates at a faster rate. -

+

{{ localeHelper locale "upgrade.title" }}

+

{{ localeHelper locale "upgrade.description" }}

-

- ${{donationCache.total_dollars}} of ${{donationCache.goal_dollars}}/month, ${{donationCache.completed_real}}% of the monthly goal. +

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

@@ -64,41 +62,49 @@

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

{{/each}}
- - + +
+ +