Skip to content

Commit

Permalink
localization support added, icon fix, send/recieve button color fix,
Browse files Browse the repository at this point in the history
  • Loading branch information
satindergrewal committed Dec 23, 2017
1 parent f7be60b commit 21b3e64
Show file tree
Hide file tree
Showing 16 changed files with 216 additions and 25 deletions.
13 changes: 13 additions & 0 deletions ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,16 @@ electron-packager . --platform=win32 --arch=ia32 --icon=assets/icons/barterdex/b
electron-packager . --platform=win32 --arch=all --icon=assets/icons/barterdex/barterdex.ico --out=build/ --buildVersion=VERSION_NUMBER_HERE --ignore=assets/bin/osx --ignore=assets/bin/linux64 --overwrite
```
change architecture build parameter to ```--arch=x64``` for 64 bit build



## Localization Instructions

BarterDEX follows langauge and country code list localization file names. Please use the following links to get more info on the standard codes for country and language codes:

https://datahub.io/core/language-codes

https://datahub.io/core/country-list



Binary file modified assets/bin/linux64/marketmaker
Binary file not shown.
Binary file modified assets/bin/osx/marketmaker
Binary file not shown.
Binary file modified assets/bin/win64/marketmaker.exe
Binary file not shown.
22 changes: 22 additions & 0 deletions assets/languages/en_US.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"langinfo": {
"name": "English (US)",
"tag": "en_US",
"version": "0.8.0",
"creationDate": "23 Dec 2017",
"author": "Satinder Greawl",
"authorEmail": "satinder@komodoplatform.com"
},
"loading": {
"starting_barterdex": "Starting BarterDEX. Please wait..."
},
"login": {
"welcome_to_barterdex": "Welcome to BarterDEX",
"please_login": "Please Login",
"passphrase": "Passphrase",
"login_passphrase_label": "Login",
"login_btn": "Login",
"generate_a_new_passphrase": "Generate a New Passphrase",
"login_passphrase_input_placeholder": "Passphrase"
}
}
22 changes: 22 additions & 0 deletions assets/languages/hi_IN.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"langinfo": {
"name": "Hindi (India)",
"tag": "hi_IN",
"version": "0.8.0",
"creationDate": "23 Dec 2017",
"author": "Satinder Greawl",
"authorEmail": "satinder@komodoplatform.com"
},
"loading": {
"starting_barterdex": "BarterDEX शुरू हो रहा है। कृपया प्रतीक्षा करें..."
},
"login": {
"welcome_to_barterdex": "BarterDEX में आपका स्वागत है",
"please_login": "कृपया लॉगिन करें",
"passphrase": "पास वाक्यांश",
"login_passphrase_label": "लॉग इन करें",
"login_btn": "लॉग इन करें",
"generate_a_new_passphrase": "एक नया पास वाक्यांश उत्पन्न करें",
"login_passphrase_input_placeholder": "पास वाक्यांश"
}
}
3 changes: 2 additions & 1 deletion assets/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"dev": false,
"experimentalFeatures": false,
"theme": "dark"
"theme": "dark",
"deflang": "en_US"
}
Binary file modified gui/img/cryptologo/hush.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified gui/img/cryptologo/lbc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 11 additions & 7 deletions gui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@
<div class="loginbody" style="display: none;">
<div class="container">
<form class="form-signin">
<h3 class="form-signin-heading" style="text-align: center;">Welcome to BarterDEX</h3>
<h4 style="text-align: center;">Please Login</h4>
<h3 class="form-signin-heading language" style="text-align: center;" data-langstr="Welcome_to_BarterDEX"></h3>
<h4 class="language" data-langstr="please_login" style="text-align: center;"></h4>

<label for="loginPassphrase" class="sr-only">Passphrase</label>
<label for="loginPassphrase" class="sr-only language" data-langstr="login_passphrase_label"></label>
<div class="input-group col-sm-12" style="margin-bottom: 10px;">
<input type="password" id="loginPassphrase" class="form-control loginPassphrase" placeholder="Passphrase" data-toggle="password" required>
<input type="password" id="loginPassphrase" class="form-control loginPassphrase language" data-langstr="login_passphrase_input_placeholder" placeholder="" data-toggle="password" required>
<!--
<span class="input-group-btn">
<button class="btn btn-grey btn_login_show_passphrase" style="height: 44px; margin-bottom: 10px;"><span class="glyphicon glyphicon-eye-close" aria-hidden="true"></span></button>
Expand All @@ -105,12 +105,12 @@ <h4 style="text-align: center;">Please Login</h4>
<div class="input-group col-sm-12" style="margin-bottom: 10px;">
<select class="selectpicker login_mode_options" data-hide-disabled="true" data-width="30%"></select>
<span class="input-group-btn">
<button class="btn btn-lg btn-primary btn-block login-btn" type="submit" style="height: 64px;">Login</button>
<button class="btn btn-lg btn-primary btn-block login-btn language" data-langstr="login_btn" type="submit" style="height: 64px;"></button>
</span>
</div>
<!--<input type="password" id="loginPassphrase" class="form-control loginPassphrase" placeholder="Passphrase" required>-->
<!--<button class="btn btn-lg btn-primary btn-block login-btn" type="submit">Login</button>-->
<button class="btn btn-lg btn-default btn-block login-genpass-btn">Generate a New Passphrase</button>
<button class="btn btn-lg btn-default btn-block login-genpass-btn language" data-langstr="generate_a_new_passphrase"></button>
</form>
</div>
</div>
Expand All @@ -123,7 +123,7 @@ <h4 style="text-align: center;">Please Login</h4>
<div class="dot1"></div>
<div class="dot2"></div>
</div>
<h3 style="text-align: center;font-weight: lighter;">Starting BarterDEX. Please wait...</h3>
<h3 class="language" data-langstr="starting_barterdex" style="text-align: center;font-weight: lighter;"></h3>
</div>
<!-- LOADING BODY END -->

Expand Down Expand Up @@ -881,5 +881,9 @@ <h3 class="panel-title"><strong>Trade Status</strong></h3>
<script src="js/simpledexactions.js" type="text/javascript"></script>
<script src="js/electrum_list.js" type="text/javascript"></script>
<script src="js/barterdex_remote_alerts.js" type="text/javascript"></script>

<script src="js/language-codes_json.js" type="text/javascript"></script>
<script src="js/country_list_json.js" type="text/javascript"></script>
<script src="js/barterdex_localization.js" type="text/javascript"></script>
</body>
</html>
56 changes: 56 additions & 0 deletions gui/js/barterdex_localization.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@

function BarterDEXInitLang() {
var barterDEX_settings = ShepherdIPC({"command":"read_settings"});
console.log(barterDEX_settings.deflang);
if (barterDEX_settings.deflang == undefined) {
ShepherdIPC({"command":"reset_settings"});
BarterDEXDefaultLangFn('en_US');
} else {
BarterDEXDefaultLangFn(barterDEX_settings.deflang);
}
}

function BarterDEXDefaultLangFn(lang_data) {
//console.log(lang_data);
var default_lang = ShepherdIPC({"command":"get_lang_data","lang":lang_data});
sessionStorage.setItem('mm_default_lang', JSON.stringify(default_lang));
PopulateDefaultLanguage();
}

function PopulateDefaultLanguage() {
var default_lang = JSON.parse(sessionStorage.getItem('mm_default_lang'));
//console.log(default_lang);

// Populate loading screen localization
$('.language[data-langstr="starting_barterdex"]').text(default_lang.loading.starting_barterdex);

// Populate login screen localization
$('.language[data-langstr="Welcome_to_BarterDEX"]').text(default_lang.login.welcome_to_barterdex);
$('.language[data-langstr="please_login"]').text(default_lang.login.please_login);
$('.language[data-langstr="passphrase"]').text(default_lang.login.passphrase);
$('.language[data-langstr="login_passphrase_input_placeholder"]').attr('placeholder',default_lang.login.login_passphrase_input_placeholder);
$('.language[data-langstr="login_btn"]').text(default_lang.login.login_btn);
$('.language[data-langstr="generate_a_new_passphrase"]').text(default_lang.login.generate_a_new_passphrase);

}

function GetListofAvailableLocalization() {
//var barterDEX_settings = ShepherdIPC({"command":"read_settings"});
//console.log(barterDEX_settings.deflang);


var BarterDEX_langauge_files_list = ShepherdIPC({"command":"get_lang_file_list"});

var langauge_list_options = '';
$.each(BarterDEX_langauge_files_list, function(index, value) {
//console.log(index);
//console.log(value);
console.log(value.slice(0, -5));
var temp_lang_code_array = value.split('_');
var first_word = temp_lang_code_array[0];
var second_word = temp_lang_code_array[temp_lang_code_array.length-1];
langauge_list_options += `<option data-content="${GetLanguageName(first_word)} (${GetCountryName(second_word.slice(0, 2))})" data-tokens="${GetLanguageName(first_word)} (${GetCountryName(second_word.slice(0, 2))})">${value.slice(0, -5)}</option>`
});
//console.log(langauge_list_options);
return langauge_list_options;
}
18 changes: 18 additions & 0 deletions gui/js/country_list_json.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 21b3e64

Please sign in to comment.