diff --git a/assets/css/pretendo-common.css b/assets/css/pretendo-common.css index c6ea80a..01a1614 100644 --- a/assets/css/pretendo-common.css +++ b/assets/css/pretendo-common.css @@ -269,6 +269,7 @@ a.btn, a.btn-alt, a.btn:focus, a.btn-alt:focus, a.btn:hover, a.btn-alt:hover { text-decoration: none; + display: inline-block; } button, .btn, .btn-alt { margin: 0; diff --git a/locales/US_en.json b/locales/US_en.json index ca9d00f..29627c6 100644 --- a/locales/US_en.json +++ b/locales/US_en.json @@ -18,17 +18,26 @@ }, "progress": { "summary": { + "caption": "All in one", "title": "Progress Summary", "text": "We should probably pull this from a database ngl" }, "compatability": { + "caption": "Usefull info", "title": "Game Compatability" }, "misc": { + "caption": "Less usefull info", "title": "Other" } }, + "news": { + "caption": "Read up", + "title": "All news", + "button_text": "Read more" + }, "contact": { + "caption": "Have a question?", "title": "Contact Us", "button_text": "Send Message", "email_placeholder": "email@provider.com", @@ -37,12 +46,13 @@ }, "login": { "card": { + "caption": "Sign in", "title": "Login", "email_text": "Username or Email", "password_text": "Password", - "email_placeholder": "email@provider.com", - "password_placeholder": "••••••••", - "button_text": "Sign In" + "button_text": "Sign In", + "link_introduction": "Don't have an account yet?", + "link_text": "Click here to register." } }, "register": { @@ -52,23 +62,50 @@ "username_text": "Username", "password_text": "Password", "password_confirm_text": "Confirm Password", - "email_placeholder": "email@provider.com", - "password_placeholder": "••••••••", - "caption": "Sign Up" + "caption": "Sign Up", + "button_text": "Sign up", + "link_introduction": "Already have an account?", + "link_text": "Click here to login." } }, "about": { + "caption": "What is this?", "title": "About", "text": "Pretendo is an open source Nintendo Network replacement that aims to build custom servers for the WiiU and 3DS/2DS family of consoles. Our goal is to preserve the online functionality of these consoles, to allow players to continue to play their favorite WiiU and 3DS/2DS games to their fullest capacity." }, "credits": { + "caption": "Who are responsible?", "title": "Credits" }, + "latest_news": { + "caption": "Catch up", + "title": "Latest news", + "description": "Pretendo is constantly evolving to create the best possible servers. We release posts to showcase what we have been working on and how far we got with certain things.", + "button_text": "All posts", + "news_button_text": "Read more" + }, "errors": { "invalid_login": "Invalid username/password combination", "account_exists": "An account with that username already exists!" }, + "validate_email_popup": { + "text": "Your email has not been validated yet. You are restricted from certain features.", + "change_button_text": "Change email", + "repeat_button_text": "Send again" + }, + "dashboard": { + "navigation": { + "links": { + "account": "Account", + "soon": "Coming soon" + } + }, + "account": { + "caption": "Pretendo Network ID", + "title": "Account information" + } + }, "footer": { - "text": "Copyright 2018 PretendoNetwork - Site designed and developed by MrJVS and Jip" + "text": "Copyright 2018 PretendoNetwork - Site designed and developed by MrJVS, ben and Jip" } } \ No newline at end of file diff --git a/routes/admin.js b/routes/admin.js index 6f1e5ed..c7271b1 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -52,7 +52,6 @@ router.post('/admin/api/v1/login', passport.authenticate('adminUserStrategy'), ( return apiHelper.sendReturn(response, { username: user.username, - locale: user.getLocale(), // calls 'utilHelper.getLocale(user.region, user.language)' maybe? role: user.role ? user.role : undefined }); }); diff --git a/views/contact.hbs b/views/contact.hbs index c976f45..0b881bd 100644 --- a/views/contact.hbs +++ b/views/contact.hbs @@ -13,7 +13,7 @@
-

ERROR

+

{{ locale.contact.caption }}

{{ locale.contact.title }}

diff --git a/views/dashboard.hbs b/views/dashboard.hbs index 5bb23f2..e2116eb 100644 --- a/views/dashboard.hbs +++ b/views/dashboard.hbs @@ -7,12 +7,12 @@ {{> nav-default }} - +
{{> nav-dashboard }}
-

ERROR

-

ERROR

+

{{ locale.dashboard.account.caption }}

+

{{ locale.dashboard.account.title }}

{{> footer-default }} diff --git a/views/home.hbs b/views/home.hbs index 6f028df..3c39e62 100644 --- a/views/home.hbs +++ b/views/home.hbs @@ -18,7 +18,7 @@
-

ERROR

+

{{ locale.about.caption }}

{{ locale.about.title }}

{{ locale.about.text }}

@@ -26,7 +26,7 @@
-

ERROR

+

{{ locale.about.caption }}

{{ locale.credits.title }}

@@ -79,18 +79,18 @@
-

ERROR

-

ERROR

-

ERROR

- +

{{ locale.latest_news.caption }}

+

{{ locale.latest_news.title }}

+

{{ locale.latest_news.description }}

+ {{ locale.latest_news.button_text }}
- {{#each posts }} + {{#each posts as |post| }}
-

{{ this.title }}

-

{{ this.content }}

- ERROR +

{{ post.title }}

+

{{ post.content }}

+ {{ ../locale.latest_news.news_button_text }}
{{/each }} diff --git a/views/login.hbs b/views/login.hbs index c771df4..cd7c5f8 100644 --- a/views/login.hbs +++ b/views/login.hbs @@ -13,7 +13,7 @@

{{ locale.nav.brand }}

-

ERROR

+

{{ locale.login.card.caption }}

{{ locale.login.card.title }}

@@ -23,7 +23,7 @@
-

ERROR ERROR

+

{{ locale.login.card.link_introduction }} {{ locale.login.card.link_text }}

{{> footer-default }} diff --git a/views/partials/nav-dashboard.hbs b/views/partials/nav-dashboard.hbs index a6240c7..b9d1ea5 100644 --- a/views/partials/nav-dashboard.hbs +++ b/views/partials/nav-dashboard.hbs @@ -4,9 +4,7 @@

{{ user.user.pnid.username }}

\ No newline at end of file diff --git a/views/post-collection.hbs b/views/post-collection.hbs index d6a6ef8..b21ca68 100644 --- a/views/post-collection.hbs +++ b/views/post-collection.hbs @@ -11,13 +11,13 @@
-

ERROR

-

ERROR

diff --git a/views/progress.hbs b/views/progress.hbs index 5b14dd9..eaeee38 100644 --- a/views/progress.hbs +++ b/views/progress.hbs @@ -11,15 +11,15 @@
-

ERROR

-

ERROR

-

{{ summary }}

+

{{ locale.progress.summary.caption }}

+

{{ locale.progress.summary.title }}

+

{{ locale.progress.summary.text }}

-

ERROR

-

ERROR

+

{{ locale.progress.compatability.caption }}

+

{{ locale.progress.compatability.title }}

{{#each games }}

{{ this.title }}

@@ -28,8 +28,8 @@ {{/each}}
-

ERROR

-

ERROR

+

{{ locale.progress.misc.caption }}

+

{{ locale.progress.misc.title }}

{{#each backends }}

{{ this.title }}

diff --git a/views/register.hbs b/views/register.hbs index 62bffc5..8f54fdb 100644 --- a/views/register.hbs +++ b/views/register.hbs @@ -30,8 +30,8 @@
- -

ERROR ERROR

+ +

{{ locale.register.card.link_introduction }} {{ locale.register.card.link_text }}

{{> footer-default }}