Skip to content

Commit

Permalink
🔩 chore: upgrade @c8y/* packages to 1005.8.0 (finally they seem to fi…
Browse files Browse the repository at this point in the history
…x the `c8y.languages` option issue there)
  • Loading branch information
dwiyatci committed Dec 17, 2019
1 parent 6ff7c4d commit 99f109f
Show file tree
Hide file tree
Showing 9 changed files with 822 additions and 393 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"build": "c8ycli build src --env.extraWebpackConfig=./c8ycli-extra-webpack.config.js",
"deploy:glenn": "yarn deploy -u https://glenn.cumulocity.com -T glenn -U admin",
"deploy": "c8ycli deploy dist/apps/hybridkitchensink",
"extract-locale": "c8ycli locale-extract ./src/app -o ./src/locales",
"extract-locale": "c8ycli locale-extract ./src/app ./src/ajs-plugins -o ./src/locales",
"compile-locale": "c8ycli locale-compile ./src/locales/*.po -o ./src/locales",
"prettier": "prettier --write",
"prettier:all": "prettier --write \"**/*.@(js|ts|html|md|css|less|json|yaml)\" \"!**/*.min.*\"",
Expand All @@ -56,11 +56,11 @@
"@angular/platform-browser-dynamic": "7.2.2",
"@angular/router": "7.2.2",
"@angular/upgrade": "7.2.2",
"@c8y/apps": "1005.6.1",
"@c8y/client": "1005.6.1",
"@c8y/ng1-modules": "1005.6.1",
"@c8y/ngx-components": "1005.6.1",
"@c8y/style": "1005.6.1",
"@c8y/apps": "1005.8.0",
"@c8y/client": "1005.8.0",
"@c8y/ng1-modules": "1005.8.0",
"@c8y/ngx-components": "1005.8.0",
"@c8y/style": "1005.8.0",
"angular": "1.6.9",
"core-js": "2.6.9",
"lodash-es": "4.17.15",
Expand All @@ -75,7 +75,7 @@
"@babel/core": "7.6.4",
"@babel/plugin-proposal-object-rest-spread": "7.6.2",
"@babel/preset-env": "7.6.3",
"@c8y/cli": "1005.6.1",
"@c8y/cli": "1005.8.0",
"@types/jest": "24.0.18",
"@types/jquery": "3.3.31",
"@types/jsdom": "12.2.4",
Expand Down
4 changes: 2 additions & 2 deletions src/ajs-plugins/legacy-hello/hello.component.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
});

/* @ngInject */
function Controller() {
function Controller(gettext) {
const vm = this;

_.assign(vm, {
Expand All @@ -25,7 +25,7 @@
////////////

function $onInit() {
vm.text = vm.text || 'hello, world';
vm.text = vm.text || gettext('hello, world');
}
}
})();
2 changes: 1 addition & 1 deletion src/ajs-plugins/legacy-hello/hello.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<div>{{ vm.text }}</div>
<div>{{ vm.text | translate }}</div>
2 changes: 1 addition & 1 deletion src/ajs-plugins/legacy-hello/main.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<c8y-hello text='"hello, world" from a legacy plugin'></c8y-hello>
<c8y-hello text="{{ '\'hello, world\' from a legacy plugin' | translate }}"></c8y-hello>
2 changes: 1 addition & 1 deletion src/app/hello-widget/hello-widget-config.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<ng-form #configForm="ngForm" class="form-group widget-config-hello">
<c8y-form-group>
<label for="helloText" translate>
Type your "hello, world" text (e.g. in your own language &#x1F47D;):
Type your 'hello, world' text (e.g. in your own language):
</label>
<input id="helloText" name="helloText" required [(ngModel)]="config.helloText" />
</c8y-form-group>
Expand Down
12 changes: 11 additions & 1 deletion src/locales/id.json
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
{"id":{"hello, world":"halo, dunia"}}
{
"id": {
"'hello, world' from a legacy plugin": "'hello, world' dari sebuah plugin yang lawas",
"Displays that classic \"hello, world\" string": "Tampilkan \"hello, world\" string yang klasik itu",
"Hello": "Halo",
"Kitchen sink": "Wastafel dapur",
"Lazy": "Mager",
"Type your 'hello, world' text (e.g. in your own language):": "Ketik teks 'hello, world'-mu (dalam bahasa ibumu):",
"hello, world": "halo, dunia"
}
}
18 changes: 18 additions & 0 deletions src/locales/id.po
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,23 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"MIME-Version: 1.0\n"

msgid "'hello, world' from a legacy plugin"
msgstr "'hello, world' dari sebuah plugin yang lawas"

msgid "Displays that classic \"hello, world\" string"
msgstr "Tampilkan \"hello, world\" string yang klasik itu"

msgid "Hello"
msgstr "Halo"

msgid "Kitchen sink"
msgstr "Wastafel dapur"

msgid "Lazy"
msgstr "Mager"

msgid "Type your 'hello, world' text (e.g. in your own language):"
msgstr "Ketik teks 'hello, world'-mu (dalam bahasa ibumu):"

msgid "hello, world"
msgstr "halo, dunia"
14 changes: 10 additions & 4 deletions src/locales/locales.pot
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,22 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: \n"

msgid "Kitchen sink"
msgid "'hello, world' from a legacy plugin"
msgstr ""

msgid "Lazy"
msgid "Displays that classic \"hello, world\" string"
msgstr ""

msgid "Hello"
msgstr ""

msgid "Save the Earth"
msgid "Kitchen sink"
msgstr ""

msgid "Lazy"
msgstr ""

msgid "Type your \"hello, world\" text (e.g. in your own language &#x1F47D;):"
msgid "Type your 'hello, world' text (e.g. in your own language):"
msgstr ""

msgid "hello, world"
Expand Down

0 comments on commit 99f109f

Please sign in to comment.