feature/add_i18n_functionality #7
Merged
Conversation
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
| import * as i18n from 'i18n'; | ||
|
|
||
| i18n.configure({ | ||
| directory: __dirname + '/locales', |
src/lib/errorParser.ts
Outdated
| if (correctMessage === error.code) { | ||
| correctMessage = error.message; | ||
| } | ||
| parsedError = Object.assign({}, error, { message: correctMessage }); | ||
| } | ||
|
|
||
| // Return object easy to use for serialisation |
There was a problem hiding this comment.
Rename file(s) to kebab-case
src/lib/importTranslations.ts
Outdated
| } | ||
| } | ||
|
|
||
| export interface Options { |
There was a problem hiding this comment.
TranslationOptions instead of Options
src/lib/errorParser.ts
Outdated
| parsedError = error; | ||
| i18n.setLocale(language); | ||
|
|
||
| let correctMessage = i18n.__(error.code); |
There was a problem hiding this comment.
Use i18n property instead of coupling code to translation key
src/lib/errorParser.ts
Outdated
|
|
||
| export function parseErrors(error: any) { | ||
| export function parseErrors(error: any, language: string) { |
There was a problem hiding this comment.
Make language optional (check if default from i18n gets used)
src/lib/errorParser.ts
Outdated
| parsedError = error; | ||
| i18n.setLocale(language); | ||
|
|
||
| let correctMessage = i18n.__(error.code); |
There was a problem hiding this comment.
translatedMessage instead of correctMessage?
horstenwillem
force-pushed
the
feature/add_i18n_functionality
branch
2 times, most recently
from
b493484
to
9394fb8
Compare
tests/errorParser.test.ts
Outdated
| @@ -63,10 +73,29 @@ describe('errorParser', () => { | |||
|
|
|||
| describe('Predefined Api errors', () => { | |||
| it('Should succesfully parse default ApiError', () => { | |||
| const errorTranslation = 'English translation'; | |||
| i18nMock.mockImplementation(() => { | |||
There was a problem hiding this comment.
Can be one line due to arrow fn
i18nMock.mockImplementation(() => errorTranslation)
tests/errorParser.test.ts
Outdated
| it('Should succesfully parse default ApiError for Dutch translation', () => { | ||
| const errorTranslation = 'Nederlands vertaling'; | ||
| i18nMock.mockImplementation(() => { | ||
| return errorTranslation; |
horstenwillem
force-pushed
the
feature/add_i18n_functionality
branch
from
9394fb8
to
5c6fb51
Compare
package.json
Outdated
| @@ -21,14 +21,17 @@ | |||
| "dependencies": { | |||
| "express-validation": "~1.0.2", | |||
| "http-status": "~1.0.1", | |||
| "i18n": "0.8.3", | |||
package.json
Outdated
| "joi": "~13.1.2", | ||
| "uuid": "~3.2.1" | ||
| }, | ||
| "devDependencies": { | ||
| "@types/http-status": "~0.2.30", | ||
| "@types/i18n": "0.8.3", |
Update package.json
horstenwillem
force-pushed
the
feature/add_i18n_functionality
branch
from
5c6fb51
to
930cde4
Compare
knor-el-snor
approved these changes
Apr 24, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add translations