Skip to content

Commit 0570b78

Browse files
Separate deployment for ongoing prototyping (#241)
/thenextgen/ releases will be maintained from maint-nextgen branch as the 0.5.x series. - Remove translations for now. - Disable tests that require Welsh - Remove home page link to next gen guide and privacy policy fragment
1 parent 254bb4c commit 0570b78

File tree

11 files changed

+13
-272
lines changed

11 files changed

+13
-272
lines changed

.github/workflows/pr-url.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ jobs:
88
steps:
99
- uses: microbit-foundation/[email protected]
1010
with:
11-
uri-template: 'https://review-ml.microbit.org/{branch}/thenextgen/'
11+
uri-template: 'https://review-ml.microbit.org/{branch}/prototype/'
1212
repo-token: ${{ secrets.GITHUB_TOKEN }}

deployment.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ module.exports = {
2222
deploymentDir: './dist',
2323
...s3Config,
2424
// We deploy to a fixed path for the nextgen version
25-
bucketPrefix: posixPath.join(s3Config.bucketPrefix || '', 'thenextgen'),
25+
bucketPrefix: posixPath.join(s3Config.bucketPrefix || '', 'prototype'),
2626
region: 'eu-west-1',
2727
removeNonexistentObjects: true,
2828
enableS3StaticWebsiteHosting: true,

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ml-machine",
3-
"version": "1.0.0",
3+
"version": "0.6.0-local",
44
"author": "Center for Computational Thinking and Design at Aarhus University",
55
"private": true,
66
"type": "module",

src/__tests__/i18n.test.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ describe('Initialization tests', () => {
2323
vitest.resetModules();
2424
});
2525

26-
test('Language is set to welsh when it is the preferred browser option', async () => {
26+
// Welsh disabled for now
27+
test.skip('Language is set to welsh when it is the preferred browser option', async () => {
2728
windowSpy.mockImplementation(() => ({
2829
navigator: {
2930
languages: ['cy', 'en'],
@@ -57,7 +58,8 @@ describe('Initialization tests', () => {
5758
expect(translatedText).toBe('You are currently recording!');
5859
});
5960

60-
test('Language is set to welsh when it is defined query string', async () => {
61+
// Welsh disabled for now
62+
test.skip('Language is set to welsh when it is defined query string', async () => {
6163
windowSpy.mockImplementation(() => ({
6264
navigator: {
6365
languages: ['some languages'],

src/__tests__/translations.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
*
77
* SPDX-License-Identifier: MIT
88
*/
9-
import da from './../messages/ui.da.json';
109
import en from './../messages/ui.en.json';
10+
// TODO: actually import the right one!
11+
const da = en;
1112

1213
// We're moving translations to Crowdin so expect the English to be the only
1314
// updated language for now

src/components/control-bar/control-bar-items/HelpMenu.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
openLink('https://microbit.org/terms-of-use/');
3838
};
3939
const onPrivacyPolicyClick = () => {
40-
openLink('https://microbit.org/privacy/#the-playground-survey');
40+
openLink('https://microbit.org/privacy/');
4141
};
4242
const onHelpAndSupportClick = () => {
4343
openLink('https://support.microbit.org/support/home');

src/i18n.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,20 @@ export const allLanguages = [
3838
name: 'English',
3939
enName: 'English',
4040
},
41-
// There are no Welsh translations yet but enabled to demo the language feature
42-
{
41+
// Welsh translations disabled on this branch. Danish has never worked in this fork.
42+
/*{
4343
id: 'cy',
4444
name: 'Cymraeg',
4545
enName: 'Welsh',
4646
},
47-
// Disabled for now as this fork doesn't have full Danish translations
48-
/*{
47+
{
4948
id: 'da',
5049
name: 'Dansk',
5150
enName: 'Danish',
5251
},*/
5352
];
5453

5554
register('en', () => import('./messages/ui.en.json'));
56-
register('cy', () => import('./messages/ui.cy.json'));
5755

5856
const initialLocale =
5957
getLocaleFromQueryString('l') ||

src/messages/ui.cy.json

Lines changed: 0 additions & 237 deletions
This file was deleted.

src/messages/ui.da.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/messages/ui.en.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"alert.recordingsPerGesture": "You need at least three examples per action",
2222

2323
"content.index.title": "machine learning tool",
24-
"content.index.toolInfo": "Use this tool with the <link>BBC micro:bit playground survey</link>",
2524
"content.index.toolProcessCards.main.title": "How this tool works",
2625
"content.index.toolProcessCards.data.title": "Add data",
2726
"content.index.toolProcessCards.data.description": "Add samples of the actions you would like your model to recognise (e.g. waving and clapping).",

0 commit comments

Comments
 (0)