localization support added, icon fix, send/recieve button color fix,
This commit is contained in:
parent
f7be60befb
commit
21b3e6459d
13
ReadMe.md
13
ReadMe.md
|
@ -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 not shown.
Binary file not shown.
Binary file not shown.
|
@ -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"
|
||||
}
|
||||
}
|
|
@ -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": "पास वाक्यांश"
|
||||
}
|
||||
}
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
"dev": false,
|
||||
"experimentalFeatures": false,
|
||||
"theme": "dark"
|
||||
"theme": "dark",
|
||||
"deflang": "en_US"
|
||||
}
|
Binary file not shown.
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 5.5 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 7.1 KiB |
|
@ -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>
|
||||
|
@ -105,12 +105,12 @@
|
|||
<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>
|
||||
|
@ -123,7 +123,7 @@
|
|||
<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 -->
|
||||
|
||||
|
@ -881,5 +881,9 @@
|
|||
<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>
|
||||
|
|
|
@ -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;
|
||||
}
|
File diff suppressed because one or more lines are too long
|
@ -2,25 +2,28 @@ var CheckMM_Interval = null;
|
|||
var CheckDefaultLogin_Interval = null;
|
||||
|
||||
$(document).ready(function() {
|
||||
var mypubkey = sessionStorage.getItem('mm_mypubkey');
|
||||
if (mypubkey !== '739860d6114f01f8bae9e1132945c4d4523a423d97c3573b84d4caf9cb8f0c78') {
|
||||
var loginstate = sessionStorage.getItem('mm_loginstate');
|
||||
if (loginstate == null || loginstate == 'default') {
|
||||
var shepherdresult = ShepherdIPC({"command":"login","passphrase":"default"});
|
||||
$('.mainbody').hide();
|
||||
$('.loginbody').hide();
|
||||
CheckMM_Interval = setInterval(CheckMMStatus,1000);
|
||||
$('.loadingbody').fadeIn();
|
||||
} else if (loginstate == 'loggedout') {
|
||||
BarterDEXInitLang();
|
||||
setTimeout(function(){
|
||||
var mypubkey = sessionStorage.getItem('mm_mypubkey');
|
||||
if (mypubkey !== '739860d6114f01f8bae9e1132945c4d4523a423d97c3573b84d4caf9cb8f0c78') {
|
||||
var loginstate = sessionStorage.getItem('mm_loginstate');
|
||||
if (loginstate == null || loginstate == 'default') {
|
||||
var shepherdresult = ShepherdIPC({"command":"login","passphrase":"default"});
|
||||
$('.mainbody').hide();
|
||||
$('.loginbody').hide();
|
||||
CheckMM_Interval = setInterval(CheckMMStatus,1000);
|
||||
$('.loadingbody').fadeIn();
|
||||
} else if (loginstate == 'loggedout') {
|
||||
$('.mainbody').hide();
|
||||
$('.loginbody').fadeIn();
|
||||
$('.loadingbody').fadeOut();
|
||||
}
|
||||
} else {
|
||||
$('.mainbody').hide();
|
||||
$('.loginbody').fadeIn();
|
||||
$('.loadingbody').fadeOut();
|
||||
}
|
||||
} else {
|
||||
$('.mainbody').hide();
|
||||
$('.loginbody').fadeIn();
|
||||
$('.loadingbody').fadeOut();
|
||||
}
|
||||
}, 1000);
|
||||
});
|
||||
|
||||
|
||||
|
@ -331,6 +334,14 @@ $('.dexsettings-btn').click(function(e){
|
|||
<option data-content="Dark Theme" data-tokens="Dark Theme">dark</option>
|
||||
<option data-content="Light Theme" data-tokens="Light Theme">light</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-sm-3" style="padding: 0;">
|
||||
<span style="float: left; font-size: 18px;">Default Language:</span>
|
||||
</div>
|
||||
<div class="input-group col-sm-2" style="margin: 10px 0;">
|
||||
<select class="selectpicker settings_deflang_select" data-hide-disabled="true" data-width="30%">
|
||||
<option data-content="English (US)" data-tokens="English US">en_US</option>
|
||||
</select>
|
||||
</div>`,
|
||||
closeButton: false,
|
||||
size: 'large',
|
||||
|
@ -349,6 +360,7 @@ $('.dexsettings-btn').click(function(e){
|
|||
ShepherdIPC({"command":"reset_settings"});
|
||||
$('#trading_mode_options_trademanual').trigger('click');
|
||||
setTimeout(function(){ BarterDEXSettingsFn(); }, 1000);
|
||||
setTimeout(function(){ BarterDEXDefaultLangFn('en_US') }, 1000);
|
||||
}
|
||||
},
|
||||
ok: {
|
||||
|
@ -357,7 +369,9 @@ $('.dexsettings-btn').click(function(e){
|
|||
callback: function(){
|
||||
var experimental_features = $('input[name=experimental_features]:checked').val();
|
||||
var selected_theme = $('.settings_theme_select').selectpicker('val');
|
||||
var selected_deflang = $('.settings_deflang_select').selectpicker('val');
|
||||
barterDEX_settings.theme = selected_theme;
|
||||
barterDEX_settings.deflang = selected_deflang;
|
||||
|
||||
console.log(experimental_features);
|
||||
if (experimental_features == 'enable') {
|
||||
|
@ -371,6 +385,7 @@ $('.dexsettings-btn').click(function(e){
|
|||
console.log(barterDEX_settings);
|
||||
ShepherdIPC({"command":"update_settings", "data":barterDEX_settings});
|
||||
BarterDEXSettingsFn();
|
||||
BarterDEXDefaultLangFn(selected_deflang);
|
||||
toastr.info('Settings update processed.', 'BarterDEX Settings');
|
||||
}
|
||||
}
|
||||
|
@ -378,6 +393,9 @@ $('.dexsettings-btn').click(function(e){
|
|||
});
|
||||
dex_settings_bootbox.init(function(){
|
||||
$('.settings_theme_select').selectpicker('render');
|
||||
$('.settings_deflang_select').html(GetListofAvailableLocalization());
|
||||
$('.settings_deflang_select').selectpicker('render');
|
||||
|
||||
console.log('settings dialog opened.');
|
||||
//var barterDEX_settings = ShepherdIPC({"command":"read_settings"});
|
||||
console.log(barterDEX_settings);
|
||||
|
@ -398,6 +416,8 @@ $('.dexsettings-btn').click(function(e){
|
|||
if (barterDEX_settings.theme == 'light') {
|
||||
$('.settings_theme_select').selectpicker('val', 'light');
|
||||
}
|
||||
|
||||
$('.settings_deflang_select').selectpicker('val', barterDEX_settings.deflang);
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -648,3 +668,4 @@ function BarterDEXSettingsFn() {
|
|||
};
|
||||
|
||||
|
||||
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -2150,8 +2150,8 @@ function PortfolioTblDataFn(portfolio_tbl_data) {
|
|||
dex_portfolio_coins_tbl_tr += '<td>' + val.goalperc + '</td>';
|
||||
dex_portfolio_coins_tbl_tr += '<td>' + val.kmd_equiv + '</td>';
|
||||
dex_portfolio_coins_tbl_tr += `<td>
|
||||
<button class="btn btn-sm btn-warning btn_portfolio_send" data-coin="` + val.coin + `">Send <span class="fa fa-paper-plane-o" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-sm btn-success btn_portfolio_receive" data-coin="` + val.coin + `">Receive <span class="fa fa-inbox" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-sm btn-success btn_portfolio_send" data-coin="` + val.coin + `">Send <span class="fa fa-paper-plane-o" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-sm btn-warning btn_portfolio_receive" data-coin="` + val.coin + `">Receive <span class="fa fa-inbox" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-sm btn-info btn_portfolio_coingoal" data-coin="` + val.coin + `" data-auto=false style="${coingoal_style_showhide}">Set Goal <span class="glyphicon glyphicon-export" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-sm btn-primary btn-portfoliogo" data-coin="` + val.coin + `" data-coinname="` + coin_name + `" data-addr="` + val.address + `" data-balance="` + val.amount + `">Exchange <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span></button>
|
||||
<button class="btn btn-sm btn-danger btn_portfolio_disable" data-electrum=true data-method="disable" data-coin="` + val.coin + `">Disable <span class="fa fa-times" aria-hidden="true"></span></button>
|
||||
|
|
|
@ -207,6 +207,22 @@ ipcMain.on('shepherd-command', (event, arg) => {
|
|||
case 'app_info':
|
||||
event.returnValue = app.getVersion();
|
||||
break;
|
||||
case 'get_lang_data':
|
||||
console.log(arg.lang);
|
||||
fs.readJson(path.join(__dirname, `../assets/languages/${arg.lang}.json`))
|
||||
.then(barterdex_deflang_file_output => {
|
||||
event.returnValue = barterdex_deflang_file_output;
|
||||
})
|
||||
.catch(err => {
|
||||
console.error(err)
|
||||
})
|
||||
break;
|
||||
case 'get_lang_file_list':
|
||||
fs.readdir(path.join(__dirname, `../assets/languages/`),function(err,lang_files){
|
||||
if(err) throw err;
|
||||
console.log(lang_files);
|
||||
event.returnValue = lang_files;
|
||||
});
|
||||
}
|
||||
})
|
||||
|
||||
|
|
Loading…
Reference in New Issue