scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #779 from chrisgarrity/update-l10n

Browse source 
Update scratch-l10n dependency
This commit is contained in:
chrisgarrity 2018-12-03 14:23:24 -05:00 committed by GitHub
commit f1efb97ace
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -19,17 +19,25 @@ deploy:
- provider: script - provider: script
on: on:
all_branches: true all_branches: true
condition: $TRAVIS_BRANCH != develop condition: $TRAVIS_BRANCH != develop && $TRAVIS_EVENT_TYPE != cron
skip_cleanup: true skip_cleanup: true
script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git script: npm run deploy -- -x -e $TRAVIS_BRANCH -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
- provider: script - provider: script
on: on:
branch: develop branch: develop
condition: $TRAVIS_EVENT_TYPE != cron
skip_cleanup: true skip_cleanup: true
script: npm run --silent deploy -- -x -a -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git script: npm run --silent deploy -- -x -a -r https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git
- provider: npm - provider: npm
on: on:
branch: develop branch: develop
condition: $TRAVIS_EVENT_TYPE != cron
skip_cleanup: true skip_cleanup: true
email: $NPM_EMAIL email: $NPM_EMAIL
api_key: $NPM_TOKEN api_key: $NPM_TOKEN
- provider: script
on:
branch: develop
condition: $TRAVIS_EVENT_TYPE == cron
skip_cleanup: true
script: npm run i18n:src && npm run i18n:push

5
package.json
View file

@ -8,7 +8,8 @@
"build": "npm run clean && webpack --progress --colors --bail", "build": "npm run clean && webpack --progress --colors --bail",
"clean": "rimraf ./dist && mkdirp dist && rimraf ./playground && mkdirp playground", "clean": "rimraf ./dist && mkdirp dist && rimraf ./playground && mkdirp playground",
"deploy": "touch playground/.nojekyll && gh-pages -t -d playground -m \"Build for $(git log --pretty=format:%H -n1)\"", "deploy": "touch playground/.nojekyll && gh-pages -t -d playground -m \"Build for $(git log --pretty=format:%H -n1)\"",
"i18n:src": "babel src > tmp.js && rimraf tmp.js && ./scripts/build-i18n-source.js ./translations/messages/ ./translations/", "i18n:push": "tx-push-src scratch-editor paint-editor ./translations/en.json",
"i18n:src": "rimraf ./translations/messages && babel src > tmp.js && rimraf tmp.js && ./scripts/build-i18n-source.js ./translations/messages/ ./translations/",
"lint": "eslint . --ext .js,.jsx", "lint": "eslint . --ext .js,.jsx",
"start": "webpack-dev-server", "start": "webpack-dev-server",
"test": "npm run lint && npm run unit && NODE_ENV=production npm run build", "test": "npm run lint && npm run unit && NODE_ENV=production npm run build",
@ -31,7 +32,6 @@
"minilog": "3.1.0", "minilog": "3.1.0",
"parse-color": "1.0.0", "parse-color": "1.0.0",
"prop-types": "^15.5.10", "prop-types": "^15.5.10",
"scratch-l10n": "^2.0.0",
"scratch-svg-renderer": "0.2.0-prerelease.20181126212715" "scratch-svg-renderer": "0.2.0-prerelease.20181126212715"
}, },
"peerDependencies": { "peerDependencies": {
@ -90,6 +90,7 @@
"redux-throttle": "0.1.1", "redux-throttle": "0.1.1",
"regenerator-runtime": "^0.12.0", "regenerator-runtime": "^0.12.0",
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"scratch-l10n": "3.1.20181129221712",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"svg-url-loader": "^2.3.2", "svg-url-loader": "^2.3.2",
"tap": "^11.1.0", "tap": "^11.1.0",

2
src/playground/reducers/intl.js
View file

@ -3,7 +3,7 @@ import {updateIntl as superUpdateIntl} from 'react-intl-redux';
import {IntlProvider, intlReducer} from 'react-intl-redux'; import {IntlProvider, intlReducer} from 'react-intl-redux';
import localeData from 'scratch-l10n'; import localeData from 'scratch-l10n';
import paintMessages from 'scratch-l10n/locales/paint-msgs'; import paintMessages from 'scratch-l10n/locales/paint-editor-msgs';
Object.keys(localeData).forEach(locale => { Object.keys(localeData).forEach(locale => {
// TODO: will need to handle locales not in the default intl - see www/custom-locales // TODO: will need to handle locales not in the default intl - see www/custom-locales