From 5783873f4411a99d17ced802c672476852dcedfa Mon Sep 17 00:00:00 2001 From: Grace Date: Thu, 3 Apr 2025 11:57:11 +0100 Subject: [PATCH 1/5] Add menu items --- src/deployment/index.ts | 2 ++ src/workbench/HelpMenu.tsx | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/deployment/index.ts b/src/deployment/index.ts index e8faf0216..ded41b9d1 100644 --- a/src/deployment/index.ts +++ b/src/deployment/index.ts @@ -44,6 +44,8 @@ export interface DeploymentConfig { supportLink?: string; guideLink?: string; + userGuideLink?: string; + accessibilityLink?: string; termsOfUseLink?: string; privacyPolicyLink?: string; translationLink?: string; diff --git a/src/workbench/HelpMenu.tsx b/src/workbench/HelpMenu.tsx index ed78ee986..a7defe480 100644 --- a/src/workbench/HelpMenu.tsx +++ b/src/workbench/HelpMenu.tsx @@ -88,6 +88,28 @@ const HelpMenu = ({ size, ...props }: HelpMenuProps) => { )} + {(true || deployment.userGuideLink) && ( + } + > + + + )} + {(true || deployment.accessibilityLink) && ( + } + > + + + )} Date: Thu, 3 Apr 2025 11:57:24 +0100 Subject: [PATCH 2/5] Add strings for translations --- lang/ui.ca.json | 8 ++++++++ lang/ui.de.json | 8 ++++++++ lang/ui.en.json | 10 +++++++++- lang/ui.es-es.json | 8 ++++++++ lang/ui.fr.json | 8 ++++++++ lang/ui.ja.json | 8 ++++++++ lang/ui.ko.json | 8 ++++++++ lang/ui.lol.json | 8 ++++++++ lang/ui.nl.json | 8 ++++++++ lang/ui.pl.json | 8 ++++++++ lang/ui.zh-cn.json | 8 ++++++++ lang/ui.zh-tw.json | 8 ++++++++ src/messages/ui.ca.json | 12 ++++++++++++ src/messages/ui.de.json | 12 ++++++++++++ src/messages/ui.en.json | 12 ++++++++++++ src/messages/ui.es-es.json | 12 ++++++++++++ src/messages/ui.fr.json | 12 ++++++++++++ src/messages/ui.ja.json | 12 ++++++++++++ src/messages/ui.ko.json | 12 ++++++++++++ src/messages/ui.lol.json | 12 ++++++++++++ src/messages/ui.nl.json | 12 ++++++++++++ src/messages/ui.pl.json | 12 ++++++++++++ src/messages/ui.zh-cn.json | 12 ++++++++++++ src/messages/ui.zh-tw.json | 12 ++++++++++++ 24 files changed, 241 insertions(+), 1 deletion(-) diff --git a/lang/ui.ca.json b/lang/ui.ca.json index 47c0a8a3f..fa9071237 100644 --- a/lang/ui.ca.json +++ b/lang/ui.ca.json @@ -23,6 +23,10 @@ "defaultMessage": "Llegeix més sobre MicroPython", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "S'ha afegit el fitxer {changeName}", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "Fitxer actualitzat {changeName}", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "visita microbit.org (s'obre en una pestanya nova)", "description": "alt text for logo link to .org" diff --git a/lang/ui.de.json b/lang/ui.de.json index af469cdc4..aacae923d 100644 --- a/lang/ui.de.json +++ b/lang/ui.de.json @@ -23,6 +23,10 @@ "defaultMessage": "Mehr über MicroPython lesen", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "Datei {changeName} hinzugefügt", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "Aktualisierte Datei {changeName}", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "besuche microbit.org (öffnet in neuen Tab)", "description": "alt text for logo link to .org" diff --git a/lang/ui.en.json b/lang/ui.en.json index 585c00b02..738872769 100644 --- a/lang/ui.en.json +++ b/lang/ui.en.json @@ -23,6 +23,10 @@ "defaultMessage": "Read more about MicroPython", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "Added file {changeName}", "description": "Change made to file" @@ -1123,6 +1127,10 @@ "defaultMessage": "Updated file {changeName}", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "visit microbit.org (opens in a new tab)", "description": "alt text for logo link to .org" @@ -1183,4 +1191,4 @@ "defaultMessage": "Zoom out", "description": "Text label for zoom out button" } -} \ No newline at end of file +} diff --git a/lang/ui.es-es.json b/lang/ui.es-es.json index 99ded6713..fb13420e4 100644 --- a/lang/ui.es-es.json +++ b/lang/ui.es-es.json @@ -23,6 +23,10 @@ "defaultMessage": "Leer más sobre MicroPython", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "Archivo {changeName} añadido", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "Archivo {changeName} actualizado", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "visitar microbit.org (abre en una nueva pestaña)", "description": "alt text for logo link to .org" diff --git a/lang/ui.fr.json b/lang/ui.fr.json index 4c8fa173a..a6f641f41 100644 --- a/lang/ui.fr.json +++ b/lang/ui.fr.json @@ -23,6 +23,10 @@ "defaultMessage": "En savoir plus sur MicroPython", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "Fichier ajouté {changeName}", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "Le fichier {changeName} a été mis à jour", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "visiter microbit.org (s’ouvre dans un nouvel onglet)", "description": "alt text for logo link to .org" diff --git a/lang/ui.ja.json b/lang/ui.ja.json index c0fa76fa5..ad5c24e24 100644 --- a/lang/ui.ja.json +++ b/lang/ui.ja.json @@ -23,6 +23,10 @@ "defaultMessage": "MicroPythonについてもっと読む", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "ファイル {changeName} を追加しました", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "ファイル {changeName} を更新しました", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "microbit.orgにアクセスします（新しいタブで開きます）", "description": "alt text for logo link to .org" diff --git a/lang/ui.ko.json b/lang/ui.ko.json index 7c03c5213..e0e176fc5 100644 --- a/lang/ui.ko.json +++ b/lang/ui.ko.json @@ -23,6 +23,10 @@ "defaultMessage": "MicroPython 세부 정보 표시하기", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "{changeName} 파일 추가됨", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "{changeName} 파일 업데이트됨", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "microbit.org 방문(새 탭에서 열기)", "description": "alt text for logo link to .org" diff --git a/lang/ui.lol.json b/lang/ui.lol.json index aa47355d9..232a09a7f 100644 --- a/lang/ui.lol.json +++ b/lang/ui.lol.json @@ -23,6 +23,10 @@ "defaultMessage": "crwdns331366:0crwdne331366:0", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "crwdns331368:0{changeName}crwdne331368:0", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "crwdns331782:0{changeName}crwdne331782:0", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "crwdns331784:0crwdne331784:0", "description": "alt text for logo link to .org" diff --git a/lang/ui.nl.json b/lang/ui.nl.json index 8005d1fac..77a1abbb2 100644 --- a/lang/ui.nl.json +++ b/lang/ui.nl.json @@ -23,6 +23,10 @@ "defaultMessage": "Lees meer over MicroPython", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "Toegevoegd bestand {changeName}", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "Bestand {changeName} bijgewerkt", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "bezoek microbit.org (opent in een nieuw tabblad)", "description": "alt text for logo link to .org" diff --git a/lang/ui.pl.json b/lang/ui.pl.json index 2c45910d5..0103178ca 100644 --- a/lang/ui.pl.json +++ b/lang/ui.pl.json @@ -23,6 +23,10 @@ "defaultMessage": "Dowiedz się więcej o MicroPythonie", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "Dodany plik {changeName}", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "Zaktualizowany plik {changeName}", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "odwiedź microbit.org (otwiera się w nowej karcie)", "description": "alt text for logo link to .org" diff --git a/lang/ui.zh-cn.json b/lang/ui.zh-cn.json index f9de8a7d8..fc93fb451 100644 --- a/lang/ui.zh-cn.json +++ b/lang/ui.zh-cn.json @@ -23,6 +23,10 @@ "defaultMessage": "阅读更多有关 MicroPython 的信息", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "已添加文件 {changeName}", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "已更新文件 {changeName}", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "访问 microbit.org (在新标签页中打开)", "description": "alt text for logo link to .org" diff --git a/lang/ui.zh-tw.json b/lang/ui.zh-tw.json index d1eb115ee..64e96c791 100644 --- a/lang/ui.zh-tw.json +++ b/lang/ui.zh-tw.json @@ -23,6 +23,10 @@ "defaultMessage": "深入瞭解 MicroPython", "description": "Aria label to expand a collapsed section about MicroPython" }, + "accessibility": { + "defaultMessage": "Accessibility", + "description": "Menu item for link to accessibility site" + }, "added-change": { "defaultMessage": "已新增檔案 {changeName}", "description": "Change made to file" @@ -1122,6 +1126,10 @@ "defaultMessage": "已更新檔案 {changeName}", "description": "Change made to file" }, + "user-guide": { + "defaultMessage": "User guide", + "description": "Menu item for link to user guide site" + }, "visit-dot-org": { "defaultMessage": "造訪 microbit.org (在新索引標籤中開啟)", "description": "alt text for logo link to .org" diff --git a/src/messages/ui.ca.json b/src/messages/ui.ca.json index aa2392b77..341e5c206 100644 --- a/src/messages/ui.ca.json +++ b/src/messages/ui.ca.json @@ -59,6 +59,12 @@ "value": "Llegeix més sobre MicroPython" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2405,6 +2411,12 @@ "value": "changeName" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.de.json b/src/messages/ui.de.json index 748857ca2..783653125 100644 --- a/src/messages/ui.de.json +++ b/src/messages/ui.de.json @@ -59,6 +59,12 @@ "value": "Mehr über MicroPython lesen" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2487,6 +2493,12 @@ "value": "changeName" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.en.json b/src/messages/ui.en.json index 3471dbc26..9698703d9 100644 --- a/src/messages/ui.en.json +++ b/src/messages/ui.en.json @@ -59,6 +59,12 @@ "value": "Read more about MicroPython" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2439,6 +2445,12 @@ "value": "changeName" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.es-es.json b/src/messages/ui.es-es.json index 7cabeb680..71f50ae4a 100644 --- a/src/messages/ui.es-es.json +++ b/src/messages/ui.es-es.json @@ -59,6 +59,12 @@ "value": "Leer más sobre MicroPython" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2431,6 +2437,12 @@ "value": " actualizado" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.fr.json b/src/messages/ui.fr.json index 9e674cff8..a0a583eb0 100644 --- a/src/messages/ui.fr.json +++ b/src/messages/ui.fr.json @@ -59,6 +59,12 @@ "value": "En savoir plus sur MicroPython" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2431,6 +2437,12 @@ "value": " a été mis à jour" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.ja.json b/src/messages/ui.ja.json index 9dde023d5..8700d62a3 100644 --- a/src/messages/ui.ja.json +++ b/src/messages/ui.ja.json @@ -59,6 +59,12 @@ "value": "MicroPythonについてもっと読む" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2433,6 +2439,12 @@ "value": " を更新しました" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.ko.json b/src/messages/ui.ko.json index 3637bb5e7..a1a8e7f25 100644 --- a/src/messages/ui.ko.json +++ b/src/messages/ui.ko.json @@ -59,6 +59,12 @@ "value": "MicroPython 세부 정보 표시하기" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 1, @@ -2427,6 +2433,12 @@ "value": " 파일 업데이트됨" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.lol.json b/src/messages/ui.lol.json index b5d049eee..cf3f0c32d 100644 --- a/src/messages/ui.lol.json +++ b/src/messages/ui.lol.json @@ -35,6 +35,12 @@ "value": "crwdns331366:0crwdne331366:0" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -1997,6 +2003,12 @@ "value": "crwdne331782:0" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.nl.json b/src/messages/ui.nl.json index be4bbd7bd..3fc1b94aa 100644 --- a/src/messages/ui.nl.json +++ b/src/messages/ui.nl.json @@ -59,6 +59,12 @@ "value": "Lees meer over MicroPython" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2474,6 +2480,12 @@ "value": " bijgewerkt" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.pl.json b/src/messages/ui.pl.json index 1fc05eb40..cbff5f3bd 100644 --- a/src/messages/ui.pl.json +++ b/src/messages/ui.pl.json @@ -59,6 +59,12 @@ "value": "Dowiedz się więcej o MicroPythonie" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2527,6 +2533,12 @@ "value": "changeName" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.zh-cn.json b/src/messages/ui.zh-cn.json index b158d6eb1..eaaaec2ce 100644 --- a/src/messages/ui.zh-cn.json +++ b/src/messages/ui.zh-cn.json @@ -59,6 +59,12 @@ "value": "阅读更多有关 MicroPython 的信息" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2440,6 +2446,12 @@ "value": "changeName" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, diff --git a/src/messages/ui.zh-tw.json b/src/messages/ui.zh-tw.json index e1fdc916d..61efcd24e 100644 --- a/src/messages/ui.zh-tw.json +++ b/src/messages/ui.zh-tw.json @@ -55,6 +55,12 @@ "value": "深入瞭解 MicroPython" } ], + "accessibility": [ + { + "type": 0, + "value": "Accessibility" + } + ], "added-change": [ { "type": 0, @@ -2439,6 +2445,12 @@ "value": "changeName" } ], + "user-guide": [ + { + "type": 0, + "value": "User guide" + } + ], "visit-dot-org": [ { "type": 0, From ba9bb8f34be0295d37b1e1c8ed2f3fae3f2cd9a8 Mon Sep 17 00:00:00 2001 From: Grace Date: Thu, 3 Apr 2025 12:03:38 +0100 Subject: [PATCH 3/5] Position user guide before support --- src/workbench/HelpMenu.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/workbench/HelpMenu.tsx b/src/workbench/HelpMenu.tsx index a7defe480..d4025c435 100644 --- a/src/workbench/HelpMenu.tsx +++ b/src/workbench/HelpMenu.tsx @@ -77,26 +77,26 @@ const HelpMenu = ({ size, ...props }: HelpMenuProps) => { /> - {deployment.supportLink && ( + {(true || deployment.userGuideLink) && ( } > - + )} - {(true || deployment.userGuideLink) && ( + {deployment.supportLink && ( } > - + )} {(true || deployment.accessibilityLink) && ( From 7d95c587d96d80ddb2a1b753ab6a638ffb4ad391 Mon Sep 17 00:00:00 2001 From: Grace Date: Thu, 3 Apr 2025 13:29:58 +0100 Subject: [PATCH 4/5] Remove forcing of help items to be shown --- src/workbench/HelpMenu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/workbench/HelpMenu.tsx b/src/workbench/HelpMenu.tsx index d4025c435..45940aec2 100644 --- a/src/workbench/HelpMenu.tsx +++ b/src/workbench/HelpMenu.tsx @@ -77,7 +77,7 @@ const HelpMenu = ({ size, ...props }: HelpMenuProps) => { /> - {(true || deployment.userGuideLink) && ( + {deployment.userGuideLink && ( { )} - {(true || deployment.accessibilityLink) && ( + {deployment.accessibilityLink && ( Date: Thu, 3 Apr 2025 13:43:23 +0100 Subject: [PATCH 5/5] Update python-editor-v3-microbit version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1d130bcc..d797e5b2e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: - run: npm ci env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@0.2.0-dev.43 @microbit-foundation/website-deploy-aws@0.6.0 @microbit-foundation/website-deploy-aws-config@0.9.0 @microbit-foundation/circleci-npm-package-versioner@1 + - run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@0.2.0-dev.45 @microbit-foundation/website-deploy-aws@0.6.0 @microbit-foundation/website-deploy-aws-config@0.9.0 @microbit-foundation/circleci-npm-package-versioner@1 if: github.repository_owner == 'microbit-foundation' env: NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}