diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 1fd54237f1..22437ff088 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -203,6 +203,7 @@ module.exports = (grunt) -> }, "merge-json": # TODO: generate this list... bg: {src: [ "locales/bg-*.json" ], dest: "build/locales/bg.json"} + cs: {src: [ "locales/cs-*.json" ], dest: "build/locales/cs.json"} da: {src: [ "locales/da-*.json" ], dest: "build/locales/da.json"} de: {src: [ "locales/de-*.json" ], dest: "build/locales/de.json"} el: {src: [ "locales/el-*.json" ], dest: "build/locales/el.json"} @@ -225,6 +226,7 @@ module.exports = (grunt) -> sv: {src: [ "locales/sv-*.json" ], dest: "build/locales/sv.json"} th: {src: [ "locales/th-*.json" ], dest: "build/locales/th.json"} tr: {src: [ "locales/tr-*.json" ], dest: "build/locales/tr.json"} + uk: {src: [ "locales/uk-*.json" ], dest: "build/locales/uk.json"} vi: {src: [ "locales/vi-*.json" ], dest: "build/locales/vi.json"} "zh-cn": {src: [ "locales/zh-cn-*.json" ], dest: "build/locales/zh-cn.json"} diff --git a/app/landing.jade b/app/landing.jade index 3f830e0a16..c4d2204799 100644 --- a/app/landing.jade +++ b/app/landing.jade @@ -44,7 +44,7 @@ h2.em-200.mvn.font-4.font-3-mobile.center(translate=".NEW_TO_BITCOIN") .new.container-max-width.container-fluid.width-100 .flex-row.flex-column-mobile.flex-column-med - video-container.col-md-6.blue-play-button.small-image(img="img/blockchain-ad-placeholder.jpg" src="https://storage.googleapis.com/bc_public_assets/video/blockchain-ad.mp4") + video-container.col-md-6.blue-play-button.small-image(img="img/blockchain-ad-placeholder.jpg" ng-src="adUrl") .flex-column.width-50.flex-1.flex-center.flex-justify #timeline.flex-row.flex-1.flex-center.mhvl.mhl-mobile.mbl img.flex-1(src='img/logo-timeline.png' alt="Blockchain Bitcoin Timeline") diff --git a/assets/js/landingCtrl.js b/assets/js/landingCtrl.js index 71c21a183b..5263bb2732 100644 --- a/assets/js/landingCtrl.js +++ b/assets/js/landingCtrl.js @@ -1,6 +1,17 @@ angular.module('walletApp').controller('LandingCtrl', LandingCtrl); -function LandingCtrl ($scope, $state) { +function LandingCtrl ($scope, $state, $sce, languages) { + $scope.firstLoad = () => { + let language_code = languages.get(); + + if (language_code === 'zh-cn' || language_code === 'zh_CN') { + $scope.adUrl = $sce.trustAsResourceUrl('https://storage.googleapis.com/bc_public_assets/video/blockchain-ad-zh-cn.mp4'); + } else { + $scope.adUrl = $sce.trustAsResourceUrl('https://storage.googleapis.com/bc_public_assets/video/blockchain-ad.mp4'); + } + }; + + $scope.firstLoad(); $scope.signup = () => { $state.go('public.signup', { email: $scope.fields.email }); }; diff --git a/assets/js/services/bcTranslationLoader.service.js b/assets/js/services/bcTranslationLoader.service.js index 38328a2607..e9f005d071 100644 --- a/assets/js/services/bcTranslationLoader.service.js +++ b/assets/js/services/bcTranslationLoader.service.js @@ -10,6 +10,7 @@ BCTranslateStaticFilesLoader.$inject = ['$http', '$q', '$translateStaticFilesLoa function BCTranslateStaticFilesLoader ($http, $q, $translateStaticFilesLoader, $rootScope) { const map = { de: 'build/locales/de.json', + cs: 'build/locales/cs.json', hi: 'build/locales/hi.json', no: 'build/locales/no.json', ru: 'build/locales/ru.json', @@ -34,7 +35,8 @@ function BCTranslateStaticFilesLoader ($http, $q, $translateStaticFilesLoader, $ da: 'build/locales/da.json', ro: 'build/locales/ro.json', nl: 'build/locales/nl.json', - tr: 'build/locales/tr.json' + tr: 'build/locales/tr.json', + uk: 'build/locales/uk.json' }; return function (options) { diff --git a/assets/js/sharedDirectives/public-header.directive.js b/assets/js/sharedDirectives/public-header.directive.js index c0ebd3f474..82276657aa 100644 --- a/assets/js/sharedDirectives/public-header.directive.js +++ b/assets/js/sharedDirectives/public-header.directive.js @@ -23,7 +23,7 @@ function publicHeader ($rootScope, $location, languages) {