Skip to content

Commit

Permalink
Merge pull request #279 from bitholla/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
abeikverdi authored Oct 28, 2020
2 parents 311b00c + 755c622 commit ceb570f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.12
1.5.13
2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hollaex-kit",
"version": "1.5.11",
"version": "1.5.13",
"private": true,
"dependencies": {
"@material/button": "0.7.0",
Expand Down
10 changes: 5 additions & 5 deletions web/src/config/lang/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -737,15 +737,15 @@ export default {
limit: 'limite'
},
TYPES: [
{ value: 'marché', label: 'marché' }, // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: 'limite', label: 'limite' } // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: 'market', label: 'marché' }, // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: 'limit', label: 'limite' } // DO NOT CHANGE value, ONLY TRANSLATE label
],
SIDE: 'Acheter/Vendre',
SIDES_VALUES: {
buy: 'acheter',
sell: 'vendre'
},
SIDES: [{ value: 'acheter', label: 'acheter' }, { value: 'vendre', label: 'vendre' }], // DO NOT CHANGE value, ONLY TRANSLATE label
SIDES: [{ value: 'buy', label: 'acheter' }, { value: 'sell', label: 'vendre' }], // DO NOT CHANGE value, ONLY TRANSLATE label
DEFAULT_TOGGLE_OPTIONS: [
{ value: true, label: 'on' }, // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: false, label: 'off' } // DO NOT CHANGE value, ONLY TRANSLATE label
Expand Down Expand Up @@ -975,8 +975,8 @@ export default {
],
SETTINGS_THEME_LABEL: 'Thème de l\'interface utilisateur', // TODO set right labels // ToDo
SETTINGS_THEME_OPTIONS: [
{ value: 'blanc', label: 'Blanc' }, // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: 'sombre', label: 'Sombre' } // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: 'white', label: 'Blanc' }, // DO NOT CHANGE value, ONLY TRANSLATE label
{ value: 'dark', label: 'Sombre' } // DO NOT CHANGE value, ONLY TRANSLATE label
],
SETTING_BUTTON: 'sauvegarder',
STRING_WITH_PARENTHESIS: '{0} ({1})',
Expand Down

0 comments on commit ceb570f

Please sign in to comment.