Merge pull request #5 from derzunov/develop

 - Action types constants added - `'SET_CURRENT'` renamed to `'SET_CURRENT_LANGUAGE'` - `'setCurrent'` action creator renamed to `'setCurrentLanguage'`

Author: derzunov

README.md

@@ -95,7 +95,7 @@ npm i redux-react-i18n
  - LocPresentational ( Presentational Component )
 
 ### Actions
- - setCurrent( languageCode )
+ - setCurrentLanguage( languageCode )
  - setLanguages( languageCode )
  - addDictionary( languageCode, dictionary )
  - setDictionaries( dictionaries )
@@ -155,7 +155,7 @@ store.dispatch( i18nActions.setLanguages( languages ) )
 // / Set languages (simpliest exapmple) ------------------------------------------------------------------------------------------------
 
 // Set current language code (you can map this action to select component or somth like this)
-store.dispatch( i18nActions.setCurrent( 'ru-RU' ) )
+store.dispatch( i18nActions.setCurrentLanguage( 'ru-RU' ) )
 ```
 
 #### And now you can use "Loc" container component

example/package.json

@@ -27,7 +27,7 @@
  "react-redux": "^4.4.5",
  "redux": "^3.5.2",
  "redux-form": "^6.2.0",
- "redux-react-i18n": "^1.0.2",
+ "redux-react-i18n": "^1.1.0",
  "redux-thunk": "^2.0.1",
  "run-sequence": "^1.2.2",
  "stream-combiner2": "^1.1.1",

example/src/app.js

@@ -85,4 +85,4 @@ store.dispatch( i18nActions.setDictionaries(
  }
 ) );
 
-store.dispatch( i18nActions.setCurrent( 'ru-RU' ) );
+store.dispatch( i18nActions.setCurrentLanguage( 'ru-RU' ) );

example/src/components/LanguageSwitcher.js

@@ -7,7 +7,7 @@ const mapStateToProps = ( { i18n: { currentLanguage } }, ownProps ) => ( {
 } )
 
 const mapDispatchToProps = ( dispatch ) => ( {
- switchLanguage: ( code ) => dispatch( i18nActions.setCurrent( code ) )
+ switchLanguage: ( code ) => dispatch( i18nActions.setCurrentLanguage( code ) )
 } )
 
 const LanguageSwitcher = ( {currentLanguage, switchLanguage} ) => {

package.json

@@ -1,6 +1,6 @@
 {
  "name": "redux-react-i18n",
- "version": "1.0.2",
+ "version": "1.1.0",
  "description": "i18n solution for react/redux",
  "main": "lib/index.js",
  "scripts": {

src/action-types.js

@@ -0,0 +1,4 @@
+export const SET_CURRENT_LANGUAGE = 'SET_CURRENT_LANGUAGE'
+export const SET_LANGUAGES = 'SET_LANGUAGES'
+export const SET_DICTIONARIES = 'SET_DICTIONARIES'
+export const ADD_DICTIONARY = 'ADD_DICTIONARY'

src/actions.js

@@ -1,4 +1,11 @@
-export const setCurrent = ( languageCode ) => ( { type: "SET_CURRENT", data: languageCode } )
-export const setLanguages = ( languageCode ) => ( { type: "SET_LANGUAGES", data: languageCode } )
-export const addDictionary = ( languageCode, dictionary ) => ( { type: "ADD_DICTIONARY", data: { languageCode, dictionary } } )
-export const setDictionaries = ( dictionaries ) => ( { type: "SET_DICTIONARIES", data: dictionaries } )
+import {
+ SET_CURRENT_LANGUAGE,
+ SET_LANGUAGES,
+ SET_DICTIONARIES,
+ ADD_DICTIONARY
+} from './action-types'
+
+export const setCurrentLanguage = ( languageCode ) => ( { type: SET_CURRENT_LANGUAGE, data: languageCode } )
+export const setLanguages = ( languageCode ) => ( { type: SET_LANGUAGES, data: languageCode } )
+export const addDictionary = ( languageCode, dictionary ) => ( { type: ADD_DICTIONARY, data: { languageCode, dictionary } } )
+export const setDictionaries = ( dictionaries ) => ( { type: SET_DICTIONARIES, data: dictionaries } )

src/reducer.js

@@ -1,31 +1,38 @@
+import {
+ SET_CURRENT_LANGUAGE,
+ SET_LANGUAGES,
+ SET_DICTIONARIES,
+ ADD_DICTIONARY
+} from './action-types'
+
 import initialState from './initialState'
 
 const i18n = ( state, action ) => {
 
  switch ( action.type ) {
 
- case 'SET_CURRENT': {
+ case SET_CURRENT_LANGUAGE: {
 
  let newState = Object.assign( {}, state )
  newState.currentLanguage = action.data
  return newState
  }
 
- case 'SET_LANGUAGES': {
+ case SET_LANGUAGES: {
 
  let newState = Object.assign( {}, state )
  newState.languages = action.data
  return newState
  }
 
- case 'SET_DICTIONARIES': {
+ case SET_DICTIONARIES: {
 
  let newState = Object.assign( {}, state )
  newState.dictionaries = action.data
  return newState
  }
 
- case 'ADD_DICTIONARY': {
+ case ADD_DICTIONARY: {
 
  if ( action.data && action.data.languageCode && action.data.dictionary ) {
 

tests/reducer.test.js

@@ -1,5 +1,11 @@
 import reducer from '../src/reducer'
 import initialState from '../src/initialState'
+import {
+ SET_CURRENT_LANGUAGE,
+ SET_LANGUAGES,
+ SET_DICTIONARIES,
+ ADD_DICTIONARY
+} from '../src/action-types'
 
 describe('i18n reducer', () => {
  it( 'should return the initial state', () => {
@@ -8,12 +14,12 @@ describe('i18n reducer', () => {
  ).toEqual( initialState )
  } )
 
- it( 'should handle SET_CURRENT', () => {
+ it( 'should handle SET_CURRENT_LANGUAGE', () => {
  let newState = Object.assign( {}, initialState )
  newState.currentLanguage = 'en-US'
  expect(
  reducer( initialState, {
- type: 'SET_CURRENT',
+ type: SET_CURRENT_LANGUAGE,
  data: 'en-US'
  } )
  ).toEqual(
@@ -36,7 +42,7 @@ describe('i18n reducer', () => {
  ]
  expect(
  reducer( initialState, {
- type: 'SET_LANGUAGES',
+ type: SET_LANGUAGES,
  data: [
  {
  code: 'car-CAR',
@@ -68,7 +74,7 @@ describe('i18n reducer', () => {
  }
  expect(
  reducer( initialState, {
- type: 'SET_DICTIONARIES',
+ type: SET_DICTIONARIES,
  data: {
  'car-CAR': {
  'key_1': 'Первый дефолтный ключ птичьего языка для теста',
@@ -95,7 +101,7 @@ describe('i18n reducer', () => {
 
  expect(
  reducer( initialState, {
- type: 'ADD_DICTIONARY',
+ type: ADD_DICTIONARY,
  data: {
  languageCode: 'new-NEW',
  dictionary: {