From 3d3fdd74256c2f968c06f58c0802f22c704f0103 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Dominguez Date: Fri, 7 Sep 2018 15:31:54 +0900 Subject: [PATCH 1/3] Fix languages --- src/js/services/uxLanguage.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/js/services/uxLanguage.js b/src/js/services/uxLanguage.js index 1fa446f01..b8e7c3b09 100644 --- a/src/js/services/uxLanguage.js +++ b/src/js/services/uxLanguage.js @@ -10,7 +10,7 @@ angular.module('copayApp.services') isoCode: 'en', rateCode: 'USD' }, { - name: 'català', + name: 'Català', isoCode: 'ca', rateCode: 'EUR' },{ @@ -59,10 +59,6 @@ angular.module('copayApp.services') name: 'Português', isoCode: 'pt', rateCode: 'EUR' - }, { - name: 'русский язык', - isoCode: 'ru', - rateCode: 'RUB' }, { name: '한국어', isoCode: 'ko', From 101e33ec367c3c3ea1e3103384b66bef986c5488 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Mon, 10 Sep 2018 20:26:13 +1200 Subject: [PATCH 2/3] Remove Games link on Android. --- src/js/services/bitcoincomService.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/js/services/bitcoincomService.js b/src/js/services/bitcoincomService.js index 68fd51a8a..62a75b4d1 100644 --- a/src/js/services/bitcoincomService.js +++ b/src/js/services/bitcoincomService.js @@ -85,7 +85,9 @@ angular.module('copayApp.services').factory('bitcoincomService', function(gettex }; var register = function() { - nextStepsService.register(cashGamesItem); + if (!platformInfo.isAndroid) { // To comply with Google Play policies + nextStepsService.register(cashGamesItem); + } nextStepsService.register(newsItem); nextStepsService.register(poolItem); nextStepsService.register(toolsItem); From 8bc73353d5154d9476d79fb57992cacfc6791f41 Mon Sep 17 00:00:00 2001 From: Brendon Duncan Date: Mon, 10 Sep 2018 20:26:33 +1200 Subject: [PATCH 3/3] Run command for Android emulator. --- Gruntfile.js | 4 ++++ app-template/package-template.json | 1 + 2 files changed, 5 insertions(+) diff --git a/Gruntfile.js b/Gruntfile.js index 160db85d5..1092b3de2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -65,6 +65,9 @@ module.exports = function(grunt) { run_android: { command: 'cordova run android --device', }, + run_android_emulator: { + command: 'cordova run android --emulator', + }, sign_android: { // When the build log outputs "Built the following apk(s):", it seems to need the filename to start with "android-release". // It looks like it simply lists all apk files starting with "android-release" @@ -370,6 +373,7 @@ module.exports = function(grunt) { // Build android grunt.registerTask('start-android', ['build-android-debug', 'exec:run_android']); grunt.registerTask('build-android-debug', ['exec:build_android_debug']); + grunt.registerTask('start-android-emulator', ['build-android-debug', 'exec:run_android_emulator']); grunt.registerTask('build-android-release', ['prod', 'exec:build_android_release', 'sign-android']); grunt.registerTask('sign-android', ['exec:sign_android']); diff --git a/app-template/package-template.json b/app-template/package-template.json index 200c269f6..11b15bfcd 100644 --- a/app-template/package-template.json +++ b/app-template/package-template.json @@ -126,6 +126,7 @@ "start": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0", "start:chrome": "npm run build:www && ionic serve --nolivereload --nogulp -s --address 0.0.0.0 --browser \"google chrome\"", "start:android": "grunt start-android", + "start:android-emulator": "grunt start-android", "start:android-log": "grunt start-android && npm run log:android", "start:ios": "grunt start-ios", "start:windows": "npm run build:www && npm run build:windows",