-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
set up basic i18n #20
Open
amneacsu
wants to merge
6
commits into
code4romania:master
Choose a base branch
from
amneacsu:feature/i18n
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
7cd7365
set up basic i18n
amneacsu 15a7cca
fix missing package.json entries
amneacsu 7b6bc0c
set up redux-thunk
amneacsu 1612dac
use default i18n provider
amneacsu 2f36f35
add setLocale thunk
amneacsu cf8c4ea
split translation into files
amneacsu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
import i18nInstance from './i18n'; | ||
|
||
export const setLocale = locale => dispatch => { | ||
dispatch({ | ||
type: 'SET_LOCALE', | ||
locale | ||
}); | ||
|
||
i18nInstance.changeLanguage(locale); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import i18next from 'i18next'; | ||
|
||
import ro from './translations/ro.json'; | ||
import en from './translations/en.json'; | ||
|
||
i18next.init({ | ||
interpolation: { | ||
// React already does escaping | ||
escapeValue: false | ||
}, | ||
lng: 'ro', | ||
resources: { | ||
ro, | ||
en | ||
} | ||
}); | ||
|
||
export default i18next; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
export { default as i18nInstance } from './i18n'; | ||
export { default as i18n } from './reducer'; | ||
export * from './actions'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
const i18n = ( | ||
state = { | ||
locale: 'ro' | ||
}, | ||
action | ||
) => { | ||
switch (action.type) { | ||
case 'SET_LOCALE': | ||
return { | ||
// set to 'cimode' to have i18next render translation keys instead of values | ||
locale: action.locale | ||
}; | ||
default: | ||
return state; | ||
} | ||
}; | ||
|
||
export default i18n; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"translation": { | ||
"proposals": { | ||
"pageTitle": "Proposals page" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"translation": { | ||
"proposals": { | ||
"pageTitle": "Pagina de propuneri" | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { translate } from 'react-i18next'; | ||
|
||
export default class ProposalsPage extends Component { | ||
class ProposalsPage extends Component { | ||
render() { | ||
return <p>Proposals page</p>; | ||
return <p>{this.props.t('proposals.pageTitle')}</p>; | ||
} | ||
} | ||
|
||
ProposalsPage.propTypes = { | ||
// translate HoC: | ||
t: PropTypes.func | ||
}; | ||
|
||
export default translate()(ProposalsPage); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍