Skip to content

Commit

Permalink
Merge branch 'main' into chakra-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
microbit-matt-hillsdon committed Mar 4, 2024
2 parents fea39a8 + 187368b commit c112293
Show file tree
Hide file tree
Showing 71 changed files with 9,563 additions and 19,172 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,21 @@ jobs:
PRODUCTION_CLOUDFRONT_DISTRIBUTION_ID: E2ELTBTA2OFPY2
STAGING_CLOUDFRONT_DISTRIBUTION_ID: E2ELTBTA2OFPY2
REVIEW_CLOUDFRONT_DISTRIBUTION_ID: E3267W09ZJHQG9
REACT_APP_FOUNDATION_BUILD: ${{ github.repository_owner == 'microbit-foundation' }}

steps:
# Note: This workflow disables deployment steps and micro:bit branding installation on forks.
- uses: actions/checkout@v3
- name: Configure node
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 20.x
cache: "npm"
registry-url: "https://npm.pkg.github.com"
- run: npm ci
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@0.1.0-chakra.upgrade.7 @microbit-foundation/[email protected] @microbit-foundation/[email protected] @microbit-foundation/circleci-npm-package-versioner@1
- run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@0.2.0-chakra.upgrade.24 @microbit-foundation/[email protected] @microbit-foundation/[email protected] @microbit-foundation/circleci-npm-package-versioner@1
if: github.repository_owner == 'microbit-foundation'
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -45,7 +46,9 @@ jobs:
if: github.repository_owner == 'microbit-foundation'
- run: npm run ci
env:
REACT_APP_GA_COOKIE_PREFIX: ${{ secrets.REACT_APP_GA_COOKIE_PREFIX }}
REACT_APP_GA_MEASUREMENT_ID: ${{ secrets.GA_MEASUREMENT_ID }}
REACT_APP_SENTRY_DSN: ${{ secrets.REACT_APP_SENTRY_DSN }}
- run: mkdir -p /tmp/app${PUBLIC_URL} && cp -r build/* /tmp/app${PUBLIC_URL} && npx serve --no-clipboard -l 3000 /tmp/app &
if: env.STAGE == 'REVIEW' || env.STAGE == 'STAGING'
- run: curl --insecure -4 --retry 7 --retry-connrefused http://localhost:3000 1>/dev/null
Expand Down
4 changes: 2 additions & 2 deletions bin/update-translations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ $# -eq 0 ]; then
exit 1
fi

languages="ca fr es-ES ja ko nl zh-CN zh-TW"
languages="ca de fr es-ES ja ko nl zh-CN zh-TW"

mkdir -p crowdin/translated
for language in $languages; do
Expand All @@ -36,4 +36,4 @@ npm run i18n:compile
./bin/update-typeshed.sh
# We sometimes have newer English stubs than translations and don't want to
# regress them as part of a translations update.
git checkout -- src/micropython/main/typeshed.en.json
git checkout -- src/micropython/main/typeshed.en.json
8 changes: 8 additions & 0 deletions lang/ui.ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@
"defaultMessage": "Alguna cosa ha anat malament. Baixa el teu fitxer hexadecimal per mantenir-lo segur i, a continuació, actualitza la pàgina per tornar-la a carregar.",
"description": "Text displayed when content fails to load"
},
"cookies-action": {
"defaultMessage": "Galetes",
"description": "Action to show dialog to choose website cookie preferences"
},
"copied": {
"defaultMessage": "Copiat",
"description": "Text shown after copy to clipboard"
Expand Down Expand Up @@ -562,6 +566,10 @@
"defaultMessage": "Per executar aquest fitxer hexadecimal a la teva micro:bit <link>segueix aquests passos</link>.",
"description": "Message in dialog shown after the user saves the project as a hex file."
},
"privacy-policy": {
"defaultMessage": "Política de privadesa",
"description": "Privacy policy menu option text"
},
"project-actions": {
"defaultMessage": "Accions del projecte",
"description": "Aria label for the bar with project actions"
Expand Down
Loading

0 comments on commit c112293

Please sign in to comment.