YourWishes/domsPlace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finalized language handover.

Browse Source
This commit is contained in:
Dominic Masters
2018-10-30 07:21:58 +11:00
parent c884efb837
commit 45866c37fc
11 changed files with 85 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
public/language/Language.jsx
View File

@ -38,36 +38,33 @@ class Language {
setLanguage(lang) { setLanguage(lang) {
this.langName = lang; this.langName = lang;
this.data = LANGUAGES[lang]; this.dataRaw = LANGUAGES[lang];
//Now parse
this.data = this.parseRecursive(this.dataRaw);
} }
getLanguage() { getLanguage() {
return this.langName; return this.langName;
} }
get(key) { parseRecursive(o) {
if(typeof key === typeof undefined) return "Key \"undefined\"."; let keys = Object.keys(o);
let j = this.getRecursive(key.split(".")); let p = {};
if(typeof j === typeof undefined || j == null) return "Missing \"" + key + "\""; keys.forEach(key => {
return j; let d = o[key];
if(typeof d === typeof undefined) d = null;
if(typeof d === 'function') {
p[key] = d();
return;
} }
if(typeof d === 'string') {
getRecursive(key_array, data_obj) { p[key] = d;
if(typeof data_obj === typeof undefined) data_obj = this.data; return;
if(typeof data_obj === typeof undefined) return null;
let k = key_array[0];
let o = data_obj[k];
if(typeof o === typeof undefined) return null;
if(typeof o === 'function') o = o();
//Awesome
if(key_array.length > 1) {
if(typeof o !== "object") return null;
key_array.shift();
return this.getRecursive(key_array, o);
} }
return o; p[key] = this.parseRecursive(d);
});
return p;
} }
getLanguages() { getLanguages() {

2
public/language/en-AU.jsx
View File

@ -163,7 +163,7 @@ export default {
</Fragment> ); } </Fragment> ); }
}, },
"footer": "Want me for your next project?", "footer": "Want me for your next project?",
"footer-button": "Contact Me" "footerButton": "Contact Me"
} }
}, },

45
public/pages/contact/ContactPage.jsx
View File

@ -32,7 +32,7 @@ import { openModal } from '@public/actions/ModalActions';
//Components //Components
import Page, { PageBoundary } from '@components/page/Page'; import Page, { PageBoundary } from '@components/page/Page';
import Language from '@public/language/Language'; import { withLanguage } from '@public/language/Language';
import Section, { import Section, {
BodySection, BodySection,
ClearSection, ClearSection,
@ -75,13 +75,14 @@ class ContactPage extends React.Component {
onError(e, a, b) { onError(e, a, b) {
this.props.openModal( this.props.openModal(
<Modal close title={Language.get("pages.contact.error")}> <Modal close title={ this.props.lang.pages.contact.error }>
{ e } { e }
</Modal> </Modal>
); );
} }
render() { render() {
let { lang } = this.props;
//Form //Form
let inners; let inners;
@ -90,8 +91,8 @@ class ContactPage extends React.Component {
inners = ( inners = (
<ElementScrollFader from="bottom"> <ElementScrollFader from="bottom">
<ContentBox box className="u-text-center"> <ContentBox box className="u-text-center">
<Heading1>{ Language.get("pages.contact.success.heading") }</Heading1> <Heading1>{ lang.pages.contact.success.heading }</Heading1>
<Paragraph>{ Language.get("pages.contact.success.paragraph") }</Paragraph> <Paragraph>{ lang.pages.contact.success.paragraph }</Paragraph>
</ContentBox> </ContentBox>
</ElementScrollFader> </ElementScrollFader>
); );
@ -105,18 +106,18 @@ class ContactPage extends React.Component {
contentType="application/json" contentType="application/json"
ajax ajax
loader loader
onSuccess={ this.onSuccess.bind(this) } onSuccess={ (e) => this.onSuccess(e) }
onError={ this.onError.bind(this) } onError={ (e) => this.onError(e) }
manager={ this.manager } manager={ this.manager }
> >
<FormGroup> <FormGroup>
<Label htmlFor="name"> <Label htmlFor="name">
{ Language.get("pages.contact.name.label") } { lang.pages.contact.name.label }
</Label> </Label>
<Input <Input
name="name" name="name"
type="text" type="text"
placeholder={ Language.get("pages.contact.name.placeholder") } placeholder={ lang.pages.contact.name.placeholder }
required={ Forms.contact.name.required } required={ Forms.contact.name.required }
maxLength={ Forms.contact.name.maxLength } maxLength={ Forms.contact.name.maxLength }
manager={ this.manager } manager={ this.manager }
@ -125,12 +126,12 @@ class ContactPage extends React.Component {
<FormGroup > <FormGroup >
<Label htmlFor="email"> <Label htmlFor="email">
{ Language.get("pages.contact.email.label") } { lang.pages.contact.email.label }
</Label> </Label>
<Input <Input
name="email" name="email"
type="email" type="email"
placeholder={ Language.get("pages.contact.email.placeholder") } placeholder={ lang.pages.contact.email.placeholder }
required={ Forms.contact.email.required } required={ Forms.contact.email.required }
maxLength={ Forms.contact.email.maxLength } maxLength={ Forms.contact.email.maxLength }
manager={ this.manager } manager={ this.manager }
@ -139,11 +140,11 @@ class ContactPage extends React.Component {
<FormGroup> <FormGroup>
<Label> htmlFor="message"> <Label> htmlFor="message">
{ Language.get("pages.contact.message.label") } { lang.pages.contact.message.label }
</Label> </Label>
<TextArea <TextArea
name="message" name="message"
placeholder={ Language.get("pages.contact.message.placeholder") } placeholder={ lang.pages.contact.message.placeholder }
rows="8" rows="8"
className="p-contact-page__message" className="p-contact-page__message"
required={ Forms.contact.message.required } required={ Forms.contact.message.required }
@ -153,8 +154,8 @@ class ContactPage extends React.Component {
</FormGroup> </FormGroup>
<ButtonGroup> <ButtonGroup>
<Input type="submit" value={ Language.get("pages.contact.send") } primary="true" /> <Input type="submit" value={ lang.pages.contact.send } primary="true" />
<Input type="reset" value={ Language.get("pages.contact.reset") } /> <Input type="reset" value={ lang.pages.contact.reset } />
</ButtonGroup> </ButtonGroup>
</Form> </Form>
</BodySection> </BodySection>
@ -163,14 +164,14 @@ class ContactPage extends React.Component {
} }
return ( return (
<Page style="contact-page" className="p-contact-page" title={ Language.get("pages.contact.title") }> <Page style="contact-page" className="p-contact-page" title={ lang.pages.contact.title }>
<ClearSection /> <ClearSection />
<PageBoundary small> <PageBoundary small>
<ElementScrollFader from="left"> <ElementScrollFader from="left">
<ContentBox box className="u-text-center"> <ContentBox box className="u-text-center">
<Title>{ Language.get("pages.contact.heading") }</Title> <Title>{ lang.pages.contact.heading }</Title>
<Paragraph> <Paragraph>
{ Language.get("pages.contact.paragraph") } { lang.pages.contact.paragraph }
</Paragraph> </Paragraph>
</ContentBox> </ContentBox>
</ElementScrollFader> </ElementScrollFader>
@ -186,16 +187,12 @@ class ContactPage extends React.Component {
} }
} }
const mapStateToProps = function(state) { const mapStateToProps = state => {return {}};
return {
code: state.language.code
}
}
const mapDispatchToProps = (dispatch) => { const mapDispatchToProps = dispatch => {
return bindActionCreators({ return bindActionCreators({
openModal: openModal openModal: openModal
},dispatch); },dispatch);
} }
export default connect(mapStateToProps, mapDispatchToProps)(ContactPage); export default connect(mapStateToProps, mapDispatchToProps)(withLanguage(ContactPage));

32
public/pages/home/sections/ExistingWorkSection.jsx
View File

@ -22,7 +22,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react'; import React from 'react';
import Language from '@public/language/Language'; import { withLanguage } from '@public/language/Language';
import { PageBoundary } from '@components/page/Page'; import { PageBoundary } from '@components/page/Page';
import { ImageSection, SplitSection, Split, ClearSection } from '@components/section/Section'; import { ImageSection, SplitSection, Split, ClearSection } from '@components/section/Section';
import ContentBox from '@objects/content/box/ContentBox'; import ContentBox from '@objects/content/box/ContentBox';
@ -107,7 +107,9 @@ const ExistingWorkFrame = (props) => {
export default props => { export default withLanguage(props => {
let { lang } = props;
return ( return (
<ImageSection <ImageSection
className="p-home-page__promo p-home-page__promo-work" className="p-home-page__promo p-home-page__promo-work"
@ -120,10 +122,10 @@ export default props => {
<ElementScrollFader from="left"> <ElementScrollFader from="left">
<ContentBox box> <ContentBox box>
<Heading1 className="u-text-center"> <Heading1 className="u-text-center">
{ Language.get("pages.home.work.heading") } { lang.pages.home.work.heading }
</Heading1> </Heading1>
<Paragraph> <Paragraph>
{ Language.get("pages.home.work.paragraph") } { lang.pages.home.work.paragraph }
</Paragraph> </Paragraph>
</ContentBox> </ContentBox>
</ElementScrollFader> </ElementScrollFader>
@ -138,8 +140,8 @@ export default props => {
fromLeft="top" fromLeft="top"
fromRight="bottom" fromRight="bottom"
src={ require('@assets/images/work-showcase/kopalife.png') } src={ require('@assets/images/work-showcase/kopalife.png') }
title={ Language.get("pages.home.work.kopa.heading") } title={ lang.pages.home.work.kopa.heading }
description={ Language.get("pages.home.work.kopa.description") } description={ lang.pages.home.work.kopa.description }
/> />
{/* SMAI */} {/* SMAI */}
@ -149,8 +151,8 @@ export default props => {
fromRight="right" fromRight="right"
swap swap
src={ require('@assets/images/work-showcase/smai.svg') } src={ require('@assets/images/work-showcase/smai.svg') }
title={ Language.get("pages.home.work.smai.heading") } title={ lang.pages.home.work.smai.heading }
description={ Language.get("pages.home.work.smai.description") } description={ lang.pages.home.work.smai.description }
/> />
{/* Cocksox */} {/* Cocksox */}
@ -159,8 +161,8 @@ export default props => {
fromLeft="bottom" fromLeft="bottom"
fromRight="top" fromRight="top"
src={ require('@assets/images/work-showcase/cocksox.png') } src={ require('@assets/images/work-showcase/cocksox.png') }
title={ Language.get("pages.home.work.cocksox.heading") } title={ lang.pages.home.work.cocksox.heading }
description={ Language.get("pages.home.work.cocksox.description") } description={ lang.pages.home.work.cocksox.description }
/> />
{/* Oz Hair and Beauty */} {/* Oz Hair and Beauty */}
@ -170,8 +172,8 @@ export default props => {
fromRight="left" fromRight="left"
swap swap
src={ require('@assets/images/work-showcase/ozhair.png') } src={ require('@assets/images/work-showcase/ozhair.png') }
title={ Language.get("pages.home.work.ozhair.heading") } title={ lang.pages.home.work.ozhair.heading }
description={ Language.get("pages.home.work.ozhair.description") } description={ lang.pages.home.work.ozhair.description }
/> />
</PageBoundary> </PageBoundary>
@ -180,9 +182,9 @@ export default props => {
<ElementScrollFader from="bottom"> <ElementScrollFader from="bottom">
<ContentBox box className="u-text-center"> <ContentBox box className="u-text-center">
<Subtitle>{ Language.get("pages.home.work.footer") }</Subtitle> <Subtitle>{ lang.pages.home.work.footer }</Subtitle>
<Button size="large" to="/contact"> <Button size="large" to="/contact">
{ Language.get("pages.home.work.footer-button") } { lang.pages.home.work.footerButton }
</Button> </Button>
</ContentBox> </ContentBox>
</ElementScrollFader> </ElementScrollFader>
@ -191,4 +193,4 @@ export default props => {
</PageBoundary> </PageBoundary>
</ImageSection> </ImageSection>
); );
} });

2
public/pages/home/sections/PlatformsSection.jsx
View File

@ -39,7 +39,7 @@ const Platform = (props) => {
if(props.to) { if(props.to) {
children = ( children = (
<a href={props.to} target="_blank" className="p-home-page__brands-link" title={props.title}> <a href={props.to} target="_blank" className="p-home-page__brands-link" title={props.title}>
{image} { image }
</a> </a>
); );
} else { } else {

11
public/pages/home/sections/ProgrammingSection.jsx
View File

@ -23,14 +23,15 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Language from '@public/language/Language'; import { withLanguage } from '@public/language/Language';
import { PageBoundary } from '@components/page/Page'; import { PageBoundary } from '@components/page/Page';
import { ImageSection } from '@components/section/Section'; import { ImageSection } from '@components/section/Section';
import ContentBox from '@objects/content/box/ContentBox'; import ContentBox from '@objects/content/box/ContentBox';
import { Title, Paragraph, Heading1 } from '@objects/typography/Typography'; import { Title, Paragraph, Heading1 } from '@objects/typography/Typography';
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader'; import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
export default (props) => { export default withLanguage(props => {
let { lang } = props;
return ( return (
<ImageSection <ImageSection
className="p-home-page__promo p-home-page__promo-programming" className="p-home-page__promo p-home-page__promo-programming"
@ -42,12 +43,12 @@ export default (props) => {
<ElementScrollFader from="bottom"> <ElementScrollFader from="bottom">
<ContentBox box> <ContentBox box>
<Heading1 className="u-text-center"> <Heading1 className="u-text-center">
{ Language.get("pages.home.programming.heading") } { lang.pages.home.programming.heading }
</Heading1> </Heading1>
{ Language.get("pages.home.programming.paragraph") } { lang.pages.home.programming.paragraph }
</ContentBox> </ContentBox>
</ElementScrollFader> </ElementScrollFader>
</PageBoundary> </PageBoundary>
</ImageSection> </ImageSection>
); );
} });

12
public/pages/home/sections/PromoVideoSection.jsx
View File

@ -22,7 +22,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import React from 'react'; import React from 'react';
import Language from '@public/language/Language'; import { withLanguage } from '@public/language/Language';
import Page, { PageBoundary } from '@components/page/Page'; import Page, { PageBoundary } from '@components/page/Page';
import Section, { SplitSection, Split } from '@components/section/Section'; import Section, { SplitSection, Split } from '@components/section/Section';
import ContentBox from '@objects/content/box/ContentBox'; import ContentBox from '@objects/content/box/ContentBox';
@ -32,7 +32,9 @@ import { Title, Subtitle, Paragraph, Heading1 } from '@objects/typography/Typogr
import ElementScrollFader from '@objects/animation/fade/ElementScrollFader'; import ElementScrollFader from '@objects/animation/fade/ElementScrollFader';
export default (props) => { export default withLanguage(props => {
let { lang } = props;
return ( return (
<Section className="p-home-page__promo p-home-page__promo-video"> <Section className="p-home-page__promo p-home-page__promo-video">
<PageBoundary> <PageBoundary>
@ -52,10 +54,10 @@ export default (props) => {
<ElementScrollFader from="bottom"> <ElementScrollFader from="bottom">
<ContentBox box> <ContentBox box>
<Title> <Title>
{ Language.get("pages.home.video.heading") } { lang.pages.home.video.heading }
</Title> </Title>
<Paragraph> <Paragraph>
{ Language.get("pages.home.video.paragraph") } { lang.pages.home.video.paragraph }
</Paragraph> </Paragraph>
</ContentBox> </ContentBox>
</ElementScrollFader> </ElementScrollFader>
@ -65,4 +67,4 @@ export default (props) => {
</PageBoundary> </PageBoundary>
</Section> </Section>
); );
} });

22
public/pages/legal/privacy/PrivacyPolicyPage.jsx
View File

@ -23,33 +23,25 @@
import React from 'react'; import React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import Language from '@public/language/Language'; import { withLanguage } from '@public/language/Language';
import Page, { PageBoundary } from '@components/page/Page'; import Page, { PageBoundary } from '@components/page/Page';
import { BodySection, ClearSection } from '@components/section/Section'; import { BodySection, ClearSection } from '@components/section/Section';
import { Title } from '@objects/typography/Typography'; import { Title } from '@objects/typography/Typography';
const PrivacyPolicyPage = (props) => { export default withLanguage(props => {
let { lang } = props;
return ( return (
<Page style="privacy-policy" className="p-privacy-policy" title={ Language.get("pages.privacy.title") }> <Page style="privacy-policy" className="p-privacy-policy" title={ lang.pages.privacy.title }>
<PageBoundary small> <PageBoundary small>
<ClearSection /> <ClearSection />
<BodySection> <BodySection>
<Title>{ Language.get("pages.privacy.heading") }</Title> <Title>{ lang.pages.privacy.heading }</Title>
{ Language.get("pages.privacy.policy") } { lang.pages.privacy.policy }
</BodySection> </BodySection>
<ClearSection /> <ClearSection />
</PageBoundary> </PageBoundary>
</Page> </Page>
); );
}; });
const mapStateToProps = function(state) {
return {
code: state.language.code
}
}
export default connect(mapStateToProps)(PrivacyPolicyPage);

6
public/reducers/LanguageReducer.js
View File

@ -28,7 +28,7 @@ const initialState = {
code: Language.getLanguage() code: Language.getLanguage()
}; };
function language(state, action) { export default (state, action) => {
if(typeof state === typeof undefined) { if(typeof state === typeof undefined) {
state = initialState; state = initialState;
} }
@ -42,6 +42,4 @@ function language(state, action) {
default: default:
return state; return state;
} }
} };
export default language;

4
public/reducers/MenuReducer.js
View File

@ -31,7 +31,7 @@ const initialState = {
open: false open: false
} }
const menu = function(state, action) { export default (state, action) => {
if(typeof state === typeof undefined) { if(typeof state === typeof undefined) {
state = initialState; state = initialState;
} }
@ -47,5 +47,3 @@ const menu = function(state, action) {
return state; return state;
} }
} }
export default menu;

4
public/reducers/ModalReducer.js
View File

@ -30,7 +30,7 @@ const initialState = {
open: false open: false
} }
const modal = function(state, action) { export default (state, action) => {
if(typeof state === typeof undefined) { if(typeof state === typeof undefined) {
state = initialState; state = initialState;
} }
@ -47,5 +47,3 @@ const modal = function(state, action) {
return state; return state;
} }
} }
export default modal;