Skip to content

Commit

Permalink
Merge pull request #1205 from aeternity/release/v0.11.0
Browse files Browse the repository at this point in the history
Release 0.11.0
  • Loading branch information
davidyuk authored Oct 4, 2019
2 parents b607048 + 7a245f1 commit a2291ea
Show file tree
Hide file tree
Showing 12 changed files with 736 additions and 15 deletions.
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.aeternity.base" version="0.10.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.aeternity.base" version="0.11.0" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>Base æpp</name>
<author href="https://aeternity.com">
aeternity developers
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aepp-base",
"version": "0.10.2",
"version": "0.11.0",
"author": "Sascha Hanse <[email protected]>",
"private": true,
"scripts": {
Expand Down
5 changes: 4 additions & 1 deletion src/components/AeInputAccount.vue
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ export default {
this.showAccountsDropdown = false;
},
async readValueFromQrCode() {
this.setValue(await this.$store.dispatch('modals/open', { name: 'readQrCode', title: 'Scan AE Address' }));
this.setValue(await this.$store.dispatch('modals/open', {
name: 'readQrCode',
title: this.$t('transfer.send.to.scan-address'),
}));
},
async readValueFromClipboard() {
this.setValue(await (process.env.IS_CORDOVA
Expand Down
5 changes: 3 additions & 2 deletions src/locales/cn.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
"address": "ak_ …",
"paste": "复制",
"scan": "扫描",
"scan-address": "Scan AE Address",
"subaccount": "或发送给子账户",
"confirm-sending-to-same-account": "The account you are sending from and the recipient are the same account. Are you sure you would like to send to the same account?"
},
Expand Down Expand Up @@ -293,6 +294,7 @@
"air-gap": {
"account-name": "AirGap 账户",
"scan-signed-transaction": "扫描签署交易",
"link-vault": "连接 Vault",

"setup": {
"title": "AirGap 设置",
Expand All @@ -314,8 +316,7 @@
"<primary>以正确的顺序写下它</primary><br />恢复时你需要用到.",
"<primary>添加一个æternity 钱包</primary><br />点击钱包, 添加钱包并选择æternity.",
"<primary>连接æternity钱包</primary><br />连接你的Vault到æternity地址."
],
"link": "连接 Vault"
]
}
},

Expand Down
5 changes: 3 additions & 2 deletions src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@
"address": "ak_ …",
"paste": "Paste",
"scan": "Scan",
"scan-address": "Scan AE Address",
"subaccount": "Or send to subaccount",
"confirm-sending-to-same-account": "The account you are sending from and the recipient are the same account. Are you sure you would like to send to the same account?"
},
Expand Down Expand Up @@ -293,6 +294,7 @@
"air-gap": {
"account-name": "AirGap account",
"scan-signed-transaction": "Scan Signed Transaction",
"link-vault": "Link Vault",

"setup": {
"title": "AirGap Setup",
Expand All @@ -314,8 +316,7 @@
"<primary>Write it down in the right order</primary><br />You will need it for recovery.",
"<primary>Add an æternity wallet</primary><br />Tap wallet, add wallet and choose æternity.",
"<primary>Link your æternity wallet</primary><br />Finish by linking your vault to you æternity address."
],
"link": "Link Vault"
]
}
},

Expand Down
Loading

0 comments on commit a2291ea

Please sign in to comment.