1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 10:19:30 +02:00

Fixed gulp translate not being called in sequence.

This commit is contained in:
Gunther Brunner 2015-07-01 21:58:17 +09:00
parent e5d90dc30f
commit 4ece69bf5c
2 changed files with 56 additions and 24 deletions

View file

@ -169,7 +169,7 @@ gulp.task("webpack:others", function (callback) {
gulp.task('translate', ['jade', 'translate:extract', 'translate:compile']) gulp.task('translate', ['jade', 'translate:extract', 'translate:compile'])
gulp.task('jade', function (cb) { gulp.task('jade', function (cb) {
gulp.src([ return gulp.src([
'./res/**/*.jade', '!./res/bower_components/**' './res/**/*.jade', '!./res/bower_components/**'
]) ])
.pipe(jade({ .pipe(jade({
@ -182,26 +182,23 @@ gulp.task('jade', function (cb) {
} }
})) }))
.pipe(gulp.dest('./tmp/html/')) .pipe(gulp.dest('./tmp/html/'))
cb()
}) })
gulp.task('translate:extract', ['jade'], function (cb) { gulp.task('translate:extract', ['jade'], function (cb) {
gulp.src([ return gulp.src([
'./tmp/html/**/*.html', './res/**/*.js', '!./res/bower_components/**', './tmp/html/**/*.html', './res/**/*.js', '!./res/bower_components/**',
'!./res/build/**' '!./res/build/**'
]) ])
.pipe(gettext.extract('stf.pot')) .pipe(gettext.extract('stf.pot'))
.pipe(gulp.dest('./res/common/lang/po/')) .pipe(gulp.dest('./res/common/lang/po/'))
cb()
}) })
gulp.task('translate:compile', ['translate:extract'], function (cb) { gulp.task('translate:compile', ['translate:extract'], function (cb) {
gulp.src('./res/common/lang/po/**/*.po') return gulp.src('./res/common/lang/po/**/*.po')
.pipe(gettext.compile({ .pipe(gettext.compile({
format: 'json' format: 'json'
})) }))
.pipe(gulp.dest('./res/common/lang/translations/')) .pipe(gulp.dest('./res/common/lang/translations/'))
cb()
}) })
gulp.task('clean', function (cb) { gulp.task('clean', function (cb) {

View file

@ -28,7 +28,7 @@ msgid "A secure container mount point couldn't be accessed on external media."
msgstr "" msgstr ""
#: app/control-panes/info/info.html:1 #: app/control-panes/info/info.html:1
#: app/device-list/column/device-column-service.js:160 #: app/device-list/column/device-column-service.js:178
msgid "ABI" msgid "ABI"
msgstr "" msgstr ""
@ -136,23 +136,23 @@ msgstr ""
msgid "Battery" msgid "Battery"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:187 #: app/device-list/column/device-column-service.js:202
msgid "Battery Health" msgid "Battery Health"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:214 #: app/device-list/column/device-column-service.js:226
msgid "Battery Level" msgid "Battery Level"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:196 #: app/device-list/column/device-column-service.js:210
msgid "Battery Source" msgid "Battery Source"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:205 #: app/device-list/column/device-column-service.js:218
msgid "Battery Status" msgid "Battery Status"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:228 #: app/device-list/column/device-column-service.js:239
msgid "Battery Temp" msgid "Battery Temp"
msgstr "" msgstr ""
@ -160,7 +160,7 @@ msgstr ""
msgid "Bluetooth" msgid "Bluetooth"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:135 #: app/device-list/column/device-column-service.js:153
msgid "Browser" msgid "Browser"
msgstr "" msgstr ""
@ -202,6 +202,11 @@ msgstr ""
msgid "Chat" msgid "Chat"
msgstr "" msgstr ""
#: auth/ldap/scripts/signin/signin.html:1
#: auth/mock/scripts/signin/signin.html:1
msgid "Check errors below"
msgstr ""
#: app/components/stf/common-ui/clear-button/clear-button.html:1 #: app/components/stf/common-ui/clear-button/clear-button.html:1
#: app/control-panes/advanced/run-js/run-js.html:2 #: app/control-panes/advanced/run-js/run-js.html:2
#: app/control-panes/logs/logs.html:20 #: app/control-panes/logs/logs.html:20
@ -509,6 +514,11 @@ msgstr ""
msgid "IMEI" msgid "IMEI"
msgstr "" msgstr ""
#: auth/ldap/scripts/signin/signin.html:1
#: auth/mock/scripts/signin/signin.html:1
msgid "Incorrect login details"
msgstr ""
#: app/control-panes/control-panes-controller.js:26 #: app/control-panes/control-panes-controller.js:26
msgid "Info" msgid "Info"
msgstr "" msgstr ""
@ -578,7 +588,7 @@ msgstr ""
msgid "Local Settings" msgid "Local Settings"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:240 #: app/device-list/column/device-column-service.js:250
msgid "Location" msgid "Location"
msgstr "" msgstr ""
@ -595,7 +605,7 @@ msgid "Manage Apps"
msgstr "" msgstr ""
#: app/control-panes/info/info.html:1 #: app/control-panes/info/info.html:1
#: app/device-list/column/device-column-service.js:147 #: app/device-list/column/device-column-service.js:165
msgid "Manufacturer" msgid "Manufacturer"
msgstr "" msgstr ""
@ -664,7 +674,7 @@ msgid "Navigation"
msgstr "" msgstr ""
#: app/control-panes/info/info.html:1 #: app/control-panes/info/info.html:1
#: app/device-list/column/device-column-service.js:111 #: app/device-list/column/device-column-service.js:129
msgid "Network" msgid "Network"
msgstr "" msgstr ""
@ -720,7 +730,7 @@ msgstr ""
msgid "Not Charging" msgid "Not Charging"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:246 #: app/device-list/column/device-column-service.js:256
msgid "Notes" msgid "Notes"
msgstr "" msgstr ""
@ -783,15 +793,15 @@ msgstr ""
msgid "Pause" msgid "Pause"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:166 #: app/device-list/column/device-column-service.js:184
msgid "Phone" msgid "Phone"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:180 #: app/device-list/column/device-column-service.js:196
msgid "Phone ICCID" msgid "Phone ICCID"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:173 #: app/device-list/column/device-column-service.js:190
msgid "Phone IMEI" msgid "Phone IMEI"
msgstr "" msgstr ""
@ -819,6 +829,26 @@ msgstr ""
msgid "Play/Pause" msgid "Play/Pause"
msgstr "" msgstr ""
#: auth/mock/scripts/signin/signin.html:1
msgid "Please enter a valid email"
msgstr ""
#: auth/mock/scripts/signin/signin.html:1
msgid "Please enter your email"
msgstr ""
#: auth/ldap/scripts/signin/signin.html:1
msgid "Please enter your LDAP username"
msgstr ""
#: auth/mock/scripts/signin/signin.html:1
msgid "Please enter your name"
msgstr ""
#: auth/ldap/scripts/signin/signin.html:1
msgid "Please enter your password"
msgstr ""
#: app/control-panes/automation/store-account/store-account.html:1 #: app/control-panes/automation/store-account/store-account.html:1
msgid "Please enter your Store password" msgid "Please enter your Store password"
msgstr "" msgstr ""
@ -1004,7 +1034,7 @@ msgstr ""
msgid "Save..." msgid "Save..."
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:117 #: app/device-list/column/device-column-service.js:135
msgid "Screen" msgid "Screen"
msgstr "" msgstr ""
@ -1021,7 +1051,7 @@ msgid "SD Card Mounted"
msgstr "" msgstr ""
#: app/control-panes/info/info.html:1 #: app/control-panes/info/info.html:1
#: app/device-list/column/device-column-service.js:153 #: app/device-list/column/device-column-service.js:171
msgid "SDK" msgid "SDK"
msgstr "" msgstr ""
@ -1038,10 +1068,15 @@ msgid "Selects Next IME"
msgstr "" msgstr ""
#: app/control-panes/info/info.html:1 #: app/control-panes/info/info.html:1
#: app/device-list/column/device-column-service.js:141 #: app/device-list/column/device-column-service.js:159
msgid "Serial" msgid "Serial"
msgstr "" msgstr ""
#: auth/ldap/scripts/signin/signin.html:1
#: auth/mock/scripts/signin/signin.html:1
msgid "Server error. Check log output."
msgstr ""
#: app/control-panes/resources/resources.html:1 #: app/control-panes/resources/resources.html:1
msgid "Set" msgid "Set"
msgstr "" msgstr ""
@ -1377,7 +1412,7 @@ msgstr ""
msgid "Use" msgid "Use"
msgstr "" msgstr ""
#: app/device-list/column/device-column-service.js:252 #: app/device-list/column/device-column-service.js:262
msgid "User" msgid "User"
msgstr "" msgstr ""