This repository has been archived by the owner on Apr 15, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 60
Find all strings for i18n - Closes #557 #759
Merged
Merged
Changes from 15 commits
Commits
Show all changes
36 commits
Select commit
Hold shift + click to select a range
43da21d
Disable debug mode in i18next
yasharAyari f9cad7c
Add i18n strings to account components
yasharAyari 5d395c5
Add i18n strings to secondPassphrase component
yasharAyari 5f3acfe
Add i18n strings to tabs component
yasharAyari a932abf
Add i18n strings to timestamp component
yasharAyari 1e63d96
Add i18n strings to transactionsp components
yasharAyari 824b36f
Add some translation strings
yasharAyari 7bbfa04
Update translation strings in header component
yasharAyari ce8ce82
fix a bug in address component test file
yasharAyari b1debb4
Add i18n strings to forging components
yasharAyari fc6b52e
Add forging strings to common.json
yasharAyari 422bcb2
Add i18n strings to login component
yasharAyari 2efeaf2
Add strings that used in login component to common.json
yasharAyari 73e0ea9
Merge branch 'development' into '557-find-all-strings-for-i18n'
yasharAyari dce60ef
fix a bug in transactionRow component
yasharAyari 055ebe9
Add i18n strings to voting components
yasharAyari 33e63e9
Add some newi18n strings to login component
yasharAyari 56a17cf
Add voting strings translation to login common.json
yasharAyari 523015d
Fix an eslint error in transactions component
yasharAyari 7a83d0c
Add i18n strings to transactionRow component
yasharAyari a5eda1d
Add transactionRow strings translation to common.json
yasharAyari c06591e
Select current language in language menu
yasharAyari e070ae7
Fix a translation bug in forgingTitle
yasharAyari 95206ac
Update some translation strings
yasharAyari aa59e8d
Merge branch 'development' into '557-find-all-strings-for-i18n'
yasharAyari e8b3af9
Fix a bug in login component
yasharAyari 8afc356
Fix a bug in header component
yasharAyari 5ee9c36
Fix a bug in login
yasharAyari 4209c2b
Fix an eslint bug in transactionRow.test.js
yasharAyari 3b98503
Refactor forgingStats
slaweet 643258e
Fix login test
slaweet 7e17036
Capitalize first letter of translation keys
slaweet bb967d4
Remove duplicate translation key
slaweet 0154d68
Move languages list into a constants file
slaweet 87ca8b0
Fix Send translation key capitalization
slaweet f61f7a7
Skip a test in AccountHOC
slaweet 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
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
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
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
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
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
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,6 +1,7 @@ | ||
import React from 'react'; | ||
import { Card, CardText } from 'react-toolbox/lib/card'; | ||
import moment from 'moment'; | ||
import { translate } from 'react-i18next'; | ||
import grid from 'flexboxgrid/dist/flexboxgrid.css'; | ||
import LiskAmount from '../liskAmount'; | ||
import style from './forging.css'; | ||
|
@@ -21,7 +22,7 @@ class ForgingTitle extends React.Component { | |
{this.props.account.delegate.username} | ||
</h2> | ||
<span> | ||
<LiskAmount val={this.props.statistics.total} roundTo={2} /> LSK Earned | ||
<LiskAmount val={this.props.statistics.total} roundTo={2} /> LSK {this.props.t('Earned')} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
</span> | ||
</div> | ||
</CardText> | ||
|
@@ -30,4 +31,4 @@ class ForgingTitle extends React.Component { | |
} | ||
} | ||
|
||
export default ForgingTitle; | ||
export default translate()(ForgingTitle); |
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
Oops, something went wrong.
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.
This condition is ugly and hacky. I would move the definition of
statCardObjects
insideForgingStats.render
so that it can usethis.props.t
and here the code can stay the way it was.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.
The key should be
Last {{day}} days
for better readability. Or maybeLast {{count}} days
as well as the value.