diff --git a/.travis.yml b/.travis.yml index b9194064c..9070921e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,7 +79,7 @@ script: - sudo mkdir -p /harbor - sudo mv ./VERSION /harbor/VERSION - sudo service mysql stop - - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.1 + - sudo make run_clarity_ut CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.2 - cat ./src/ui_ng/lib/npm-ut-test-results - sudo ./tests/testprepare.sh - sudo docker-compose -f ./make/docker-compose.test.yml up -d @@ -99,7 +99,7 @@ script: - docker-compose -f make/docker-compose.test.yml down - sudo rm -rf /data/config/* - ls /data/cert - - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.1 NOTARYFLAG=true + - sudo make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.2 NOTARYFLAG=true - docker ps - ./tests/notarytest.sh diff --git a/docs/compile_guide.md b/docs/compile_guide.md index ba3ca977b..34e3df554 100644 --- a/docs/compile_guide.md +++ b/docs/compile_guide.md @@ -50,13 +50,13 @@ You can compile the code by one of the three approaches: * Build, install and bring up Harbor without Notary: ```sh - $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.1 + $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.2 ``` * Build, install and bring up Harbor with Notary: ```sh - $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.1 NOTARYFLAG=true + $ make install GOBUILDIMAGE=golang:1.7.3 COMPILETAG=compile_golangimage CLARITYIMAGE=vmware/harbor-clarity-ui-builder:1.1.2 NOTARYFLAG=true ``` #### II. Compile code with your own Golang environment, then build Harbor diff --git a/src/ui_ng/package.json b/src/ui_ng/package.json index 0433d9138..126283738 100644 --- a/src/ui_ng/package.json +++ b/src/ui_ng/package.json @@ -27,11 +27,11 @@ "@ngx-translate/http-loader": "0.0.3", "@types/jquery": "^2.0.41", "@webcomponents/custom-elements": "1.0.0-alpha.3", - "angular2-cookie": "^1.2.6", "clarity-angular": "^0.9.0", "clarity-icons": "^0.9.0", "clarity-ui": "^0.9.0", "core-js": "^2.4.1", + "intl": "^1.2.5", "mutationobserver-shim": "^0.3.2", "ngx-cookie": "^1.0.0", "rxjs": "^5.0.1", diff --git a/src/ui_ng/src/polyfills.ts b/src/ui_ng/src/polyfills.ts index 75db19a93..a5db6b79a 100644 --- a/src/ui_ng/src/polyfills.ts +++ b/src/ui_ng/src/polyfills.ts @@ -30,6 +30,10 @@ import 'core-js/es6/reflect'; import 'core-js/es7/reflect'; +import 'intl'; +import 'intl/locale-data/jsonp/en'; +import 'intl/locale-data/jsonp/es'; +import 'intl/locale-data/jsonp/zh'; import 'zone.js/dist/zone';