Skip to content

Commit 7df6e3a

Browse files
Merge pull request #1 from sugarlabs/master
Fix SensorBlocks: getPixelXColor & duplicate fixes
2 parents 4b1d9ea + 74b88f5 commit 7df6e3a

File tree

15 files changed

+42502
-45185
lines changed

15 files changed

+42502
-45185
lines changed

README.md

Lines changed: 0 additions & 782 deletions
Large diffs are not rendered by default.

js/__tests__/languagebox.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ describe("LanguageBox Class", () => {
171171
expect(hideSpy).toHaveBeenCalled();
172172
});
173173

174-
it("should set language to zhCN and call hide when zhCN_onclick is called", () => {
174+
it("should set language to zh_CN and call hide when zhCN_onclick is called", () => {
175175
const hideSpy = jest.spyOn(languageBox, "hide").mockImplementation();
176176

177177
languageBox.zhCN_onclick();
178178

179-
expect(languageBox._language).toBe("zhCN");
179+
expect(languageBox._language).toBe("zh_CN");
180180
expect(hideSpy).toHaveBeenCalled();
181181
});
182182

js/languagebox.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class LanguageBox {
9393
* @returns {void}
9494
*/
9595
zhCN_onclick() {
96-
this._language = "zhCN";
96+
this._language = "zh_CN";
9797
this.hide();
9898
}
9999

@@ -218,7 +218,7 @@ class LanguageBox {
218218
ko: "언어 기본 설정을 변경하려면 브라우저를 새로 고치십시오.",
219219
es: "Actualice su navegador para cambiar su preferencia de idioma.",
220220
pt: "Atualize seu navegador para alterar sua preferência de idioma.",
221-
zhCN: "刷新浏览器以更改您的语言偏好",
221+
zh_CN: "刷新浏览器以更改您的语言偏好",
222222
th: "รีเฟรชเบราเซอร์เพื่อเปลี่ยนการตั้งค่าภาษาของคุณ",
223223
hi: "अपनी भाषा की वरीयता बदलने के लिए अपना ब्राउज़र ताज़ा करें",
224224
te: "మీ భాష ప్రాధాన్యతను మార్చడానికి మీ బ్రౌజర్‌ని రిఫ్రెష్ చేయండి.",

js/turtledefs.js

Lines changed: 11 additions & 3 deletions
Large diffs are not rendered by default.

js/widgets/reflection.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class ReflectionMatrix {
7676
this.isOpen = true;
7777
this.isMaximized = false;
7878
this.activity.isInputON = true;
79-
this.PORT = "http://52.65.37.66:8000"; // http://127.0.0.1:8000
79+
this.PORT = "http://3.105.177.138:8000"; // http://127.0.0.1:8000
8080

8181
const widgetWindow = window.widgetWindows.windowFor(this, "reflection", "reflection");
8282
this.widgetWindow = widgetWindow;

0 commit comments

Comments
 (0)