Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
42eca22
first commit (yarn serve 말고 pnpm serve)
CHOHYEONUNG Mar 26, 2024
940bd00
dist
CHOHYEONUNG Apr 1, 2024
ec898d5
dist
CHOHYEONUNG Apr 1, 2024
04ae488
console.log 키값 추가
CHOHYEONUNG Jun 10, 2024
51d5710
loadproject 복구
CHOHYEONUNG Jun 12, 2024
8996a2a
[ImgBot] Optimize images
ImgBotApp Jun 24, 2024
5931897
이슈 8447 처리
Jun 26, 2024
3cbe402
금쪽이 카 이름 수정 및 isNotFor 작성
CHOHYEONUNG Jul 5, 2024
66aad4d
Merge pull request #2780 from entrylabs/issue/8447
kimorkim Jul 8, 2024
612399a
Merge pull request #2778 from entrylabs/imgbot
kimorkim Jul 8, 2024
b3555c7
fork fetch
CHOHYEONUNG Jul 8, 2024
a187362
gitignore, package.json 원상 복구
CHOHYEONUNG Jul 8, 2024
0bc7f66
깃 업로드용
CHOHYEONUNG Jul 9, 2024
1164fd3
git
CHOHYEONUNG Jul 9, 2024
0723bde
토이봇 속도 1-5까지로 변경
hagwon Jul 17, 2024
c5222c1
이슈 8512 처리
Jul 17, 2024
2e12970
다국어 추가 수정
Jul 18, 2024
1249b91
Merge pull request #2782 from CHOHYEONUNG/develop-hw
Tnks2U Jul 18, 2024
775e7fa
Merge pull request #2783 from hagwon/develop-hw
Tnks2U Jul 18, 2024
cc5a706
Merge pull request #2784 from entrylabs/issue/8512
kimorkim Jul 18, 2024
287f5d4
이미지 사운드 다국어 분리.
Jul 18, 2024
fca083a
Merge pull request #2785 from entrylabs/issue/8492
leunge Jul 18, 2024
29b8529
다국어 추가 수정
Jul 19, 2024
96c3fa9
Merge pull request #2786 from entrylabs/issue/8512
kimorkim Jul 19, 2024
c3fa071
loading이미지 교체
Jul 22, 2024
f43230a
Merge pull request #2787 from entrylabs/issue/8534
kimorkim Jul 23, 2024
fa437d5
이슈 8447 처리
Jul 23, 2024
2f5d3c7
Merge pull request #2789 from entrylabs/issue/8447-2
leunge Jul 23, 2024
35d5a8c
비동기 함수 value 실행로직 보강
Jul 23, 2024
9e93e9f
Merge pull request #2790 from entrylabs/issue/8447-2
kimorkim Jul 23, 2024
0eb8bd4
lang: 아두이노 우노 다국어 수정
Tnks2U Jul 23, 2024
55a350d
lang : 아두이노 우노 확장 블럭 다국어 수정
Tnks2U Jul 23, 2024
4a02004
lang: 아두이노 나노 다국어 수정
Tnks2U Jul 23, 2024
1bd7b27
Merge pull request #2791 from entrylabs/develop-hw
Tnks2U Jul 23, 2024
f0e153a
lang : 아두이노 다국어 수정
Tnks2U Jul 24, 2024
943370a
Merge pull request #2792 from entrylabs/develop-hw
Tnks2U Jul 24, 2024
f934173
lang: 아두이노 확장/나노 다국어 수정
Tnks2U Jul 24, 2024
4b96db4
Merge pull request #2793 from entrylabs/develop-hw
Tnks2U Jul 24, 2024
9bfa603
aiLearning reload 함수 추가.
Jul 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 73 additions & 66 deletions extern/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,6 @@ Lang.Blocks = {
VARIABLE_change_variable_2: 'by',
VARIABLE_change_variable_3: '',
VARIABLE_change_variable_name: 'Rename variable',
VARIABLE_combine_something_2: '',
VARIABLE_combine_something_3: '',
VARIABLE_get_variable_2: '',
VARIABLE_get_y: 'Y Coordinate',
VARIABLE_hide_list: '',
Expand Down Expand Up @@ -651,66 +649,69 @@ Lang.Blocks = {
JUDGEMENT_boolean_not_1: 'Is Not',
JUDGEMENT_boolean_not_2: '',
JUDGEMENT_is_boost_mode: 'Is the boost mode on?',
CALC_calc_rand_1: 'Random number between',
CALC_calc_rand_1: 'random number between',
CALC_calc_rand_2: 'and',
CALC_calc_rand_3: '',
CALC_coordinate_mouse_1: 'Mouse',
CALC_coordinate_mouse_2: 'Coordinate',
CALC_coordinate_mouse_1: 'mouse pointer',
CALC_coordinate_mouse_2: 'coordinate',
CALC_coordinate_object_1: '',
CALC_coordinate_object_2: "'s",
CALC_coordinate_x_value: 'coordinate x',
CALC_coordinate_y_value: 'coordinate y',
CALC_coordinate_object_2: 'of',
CALC_coordinate_x_value: 'x coordinate',
CALC_coordinate_y_value: 'y coordinate',
CALC_coordinate_rotation_value: 'rotation',
CALC_coordinate_direction_value: 'direction',
CALC_coordinate_size_value: 'Scale',
CALC_picture_index: 'index of picture',
CALC_picture_name: 'name of picture',
CALC_coordinate_size_value: 'size',
CALC_picture_index: 'shape number',
CALC_picture_name: 'shape name',
CALC_get_sound_volume: 'Volume',
CALC_quotient_and_mod_1: '',
CALC_quotient_and_mod_2: 'of',
CALC_quotient_and_mod_3: '/',
CALC_quotient_and_mod_sub_1: 'Quotient',
CALC_quotient_and_mod_sub_2: 'Rest',
CALC_quotient_and_mod_sub_1: 'quotient',
CALC_quotient_and_mod_sub_2: 'remainder',
CALC_calc_operation_of_1: '',
CALC_calc_operation_of_2: "'s",
CALC_calc_operation_square: 'Square',
CALC_calc_operation_root: 'Root',
CALC_calc_operation_sin: 'sin value',
CALC_calc_operation_cos: 'cos value',
CALC_calc_operation_tan: 'tan value',
CALC_calc_operation_asin: 'asin value',
CALC_calc_operation_acos: 'acos value',
CALC_calc_operation_atan: 'atan value',
CALC_calc_operation_log: 'log value',
CALC_calc_operation_ln: 'natural log value',
CALC_calc_operation_of_2: 'of',
CALC_calc_operation_square: 'square',
CALC_calc_operation_root: 'root',
CALC_calc_operation_sin: 'sin',
CALC_calc_operation_cos: 'cos',
CALC_calc_operation_tan: 'tan',
CALC_calc_operation_asin: 'asin',
CALC_calc_operation_acos: 'acos',
CALC_calc_operation_atan: 'atan',
CALC_calc_operation_log: 'log',
CALC_calc_operation_ln: 'natural log',
CALC_calc_operation_unnatural: 'decimal value',
CALC_calc_operation_floor: 'floor value',
CALC_calc_operation_ceil: 'ceil value',
CALC_calc_operation_round: 'round value',
CALC_calc_operation_factorial: 'factorial value',
CALC_calc_operation_abs: 'absolute value',
CALC_get_timer_value: 'Timer value',
CALC_get_timer_value: 'timer value',
CALC_choose_project_timer_action_sub_1: 'Start',
CALC_choose_project_timer_action_sub_2: 'Stop',
CALC_choose_project_timer_action_sub_3: 'Reset',
CALC_choose_project_timer_action_2: 'timer',
CALC_get_date_1: 'Current',
CALC_get_date_year: 'Year',
CALC_get_date_month: 'Month',
CALC_get_date_day: 'Day',
CALC_get_date_hour: 'Time(Hour)',
CALC_get_date_minute: 'Time(Minutes)',
CALC_get_date_second: 'Time(Seconds)',
CALC_get_date_day_of_week: 'Day of Week',
CALC_get_date_1: 'current',
CALC_get_date_year: 'year',
CALC_get_date_month: 'month',
CALC_get_date_day: 'day',
CALC_get_date_hour: 'time(hour)',
CALC_get_date_minute: 'time(minutes)',
CALC_get_date_second: 'time(seconds)',
CALC_get_date_day_of_week: 'day of week',
CALC_get_date_2: '',
CALC_distance_something_1: 'Distance to',
CALC_distance_something_1: 'distance to',
CALC_distance_something_2: '',
CALC_get_sound_duration_1: 'Length of',
CALC_get_sound_duration_2: 'sound',
CALC_length_of_string_1: 'length of',
CALC_reverse_of_string_1: 'Reverse',
CALC_reverse_of_string_1: 'reverse',
VARIABLE_combine_something_1: 'join',
CALC_char_at_1: 'letter',
CALC_char_at_2: 'of',
VARIABLE_combine_something_2: 'and',
VARIABLE_combine_something_3: '',
CALC_char_at_1: '',
CALC_char_at_2: 'th letter of',
hi_entry: 'Hello Entry!',
hi_entry_en: 'Hello Entry!',
CALC_substring_1: 'substring of',
Expand All @@ -725,7 +726,7 @@ Lang.Blocks = {
CALC_replace_string_3: 'with',
hello: 'Hello',
nice: 'nice to meet you',
CALC_change_string_case_2: 'of',
CALC_change_string_case_2: 'to',
CALC_change_string_case_sub_1: 'uppercase',
CALC_change_string_case_sub_2: 'lowercase',
CALC_change_string_case_3: ' ',
Expand Down Expand Up @@ -878,8 +879,8 @@ Lang.Blocks = {
EXPANSION_WEATHER_finedust: 'concentration of fine dust(㎍)',
ardublock_motor_forward: 'Forward',
ardublock_motor_backward: 'Backward',
ARDUINO_on: 'On',
ARDUINO_off: 'Off',
ARDUINO_on: 'Turn on',
ARDUINO_off: 'Turn off',
EXPANSION_FESTIVAL_title: 'Title',
EXPANSION_FESTIVAL_area: 'area',
EXPANSION_FESTIVAL_start_date: 'start date',
Expand Down Expand Up @@ -1015,7 +1016,7 @@ Lang.Blocks = {
ROBOID_sound_good_job: 'good job',
SOUND: 'Sound',
JUDGEMENT: 'Decision',
CALC: 'Calculate',
CALC: 'Figures',
VARIABLE: 'Variable',
ANALYSIS: 'Table',
EXPANSION: 'Extension',
Expand Down Expand Up @@ -1074,7 +1075,7 @@ Lang.Blocks = {
ALTINO_Steering_Angle_Center: 'center',
ALTINO_Steering_Angle_Left5: 'left5',
mouse_pointer: 'Mouse Pointer',
self: 'Self',
self: 'self',
wall_up: 'upper wall',
wall_down: 'down wall',
wall_right: 'right wall',
Expand Down Expand Up @@ -5704,20 +5705,22 @@ Lang.Helper = {
"Changes the input conditions to its opposite.\n(If the input condition is true, it returns 'False'. And if the input condition is false, it returns 'True'.)",
is_boost_mode:
'Checks whether the boost mode is turned on or not.\nIf the boost mode is on, it is judged as "true".',
calc_basic: 'Adds two input numbers.',
calc_rand: 'Selects a random value between the two input numbers.',
calc_basic:
'Reports the value of the two input numbers of quadratic operations.\n+ : Adds two input numbers.\n- : Subtracts two input numbers.\n* : Multiplies two input numbers.\n/ : Divides two input numbers.',
calc_rand:
'Selects a random value between the two input numbers. (If both of the input numbers are integers, an integer between the two numbers is selected. If either the input number is a decimal value a number up to the second decimal place is selected.)',
get_x_coordinate: 'Reports the x-position value of the object.',
get_y_coordinate: 'Reports the y-position value of the object.',
coordinate_mouse: 'Reports either the x/y coordinate value of the mouse.',
coordinate_mouse: 'Reports either the x/y coordinate value of the mouse pointer.',
coordinate_object:
'Reports the x/y coordinate value or various information (direction, rotation, scale, etc.) of the object.',
'Reports the x/y coordinate value or various information (rotation, direction, size, etc.) of the object.',
quotient_and_mod:
'quotient : The answer after dividing the first input number by the second input number.\nRemainer : The amount left over after division.',
'Reports the result of dividing the two input numbers.\n- Quotient: The answer after dividing the first input number by the second input number.\n- Remainder: The amount left over after division.',
get_rotation_direction: 'Reports the object’s value of direction and value of movement.',
calc_share: 'Reports the quotient occurring from first number divided by the second number. ',
calc_mod: 'Reports the remainder occurring from the first number divided by the second number.',
calc_operation:
'Reports calculated values of a variety of equations relating to input numbers.',
'Reports calculated values of a variety of equations relating to input numbers.\n(Square, Root, Sine, Cosine, Tangent, Arcsine, Arccosine, Arctangent, Log, Natural log, Decimal value, Floor value, Ceil value, Round value, Factorial value, Absolute value)',
get_date:
'Reports the values regarding the current year, month, day, day of the week and time.\n- Year: Returns the current year.\n- Month: Returns the current month.\n- Day: Returns the current day.\n- Day of the week: Returns the current day of the week as a number.\nReturns Sunday, Monday, Tuesdays, Wednesdays, Thursdays, Fridays, Saturdays as 0, 1, 2, 3, 4, 5, 6 in turn.\n- Time: Returns the current time in hours, minutes, and seconds, respectively.',
distance_something: 'Reports the distance between the object and the selected object.',
Expand All @@ -5726,7 +5729,7 @@ Lang.Helper = {
get_nickname: 'Reports the user nickname who runs the project.',
get_project_timer_value: 'Reports how many seconds have passed since the project started.',
choose_project_timer_action:
'Start : The timer starts.\nStop : The timer stops.\nReset : The timer resets to 0.\n(If this block is on workspace, the project will show the timer window when it runs.)',
'Sets the status of the timer.\n- Start : The timer starts.\n- Stop : The timer stops.\n- Reset : The timer resets to 0.',
reset_project_timer: 'Resets the timer to 0.',
set_visible_project_timer: 'Shows or hides the timer.',
ask_and_wait: 'The object asks the input text, and then receives an answer as a response.',
Expand Down Expand Up @@ -5805,9 +5808,12 @@ Lang.Helper = {
count_match_string:
'Reports the number of letters in a specific text in the input text case sensitively.',
replace_string:
'Reports the text that replaced all the input text with another input text. (distinguishes uppercase to lowercase)',
'Reports the text where the specific text has been replaced with the input text. (distinguishes uppercase and lowercase)',
index_of_string: 'Reports the index of first input text in second input text. (includes space)',
change_string_case: 'Reports the text that converted to uppercase or lowercase.',
get_block_count:
'Reports the number of blocks used by the selected item.\nCounts based on the blocks assembled to the start block.\n- this project: Counts all the blocks of this project\n- this object: Counts the blocks of this object\n- (object): Counts the blocks of the selected object\n- (scene): Counts the blocks of the selected scene',
get_boolean_value: 'Returns boolean to string.',
direction_relative_duration:
'Rotates the direction of the object at an angle of the input degrees for the input seconds.',
get_sound_volume: 'Reports the sound volume.',
Expand Down Expand Up @@ -6714,33 +6720,33 @@ Lang.template = {
get_rotation_direction: '%1 ',
distance_something: '%1 %2 %3',
coordinate_mouse: '%1 %2 %3',
coordinate_object: '%1 %2 %3 %4',
coordinate_object: '%1 %4 %3 %2',
calc_basic: '%1 %2 %3',
calc_plus: '%1 %2 %3',
calc_minus: '%1 %2 %3',
calc_times: '%1 %2 %3',
calc_divide: '%1 %2 %3',
calc_mod: '%1 %2 %3',
calc_share: '%1 %2 %3',
calc_operation: '%1 %2 %3 %4',
calc_rand: '%1 %2 %3 %4 %5',
calc_operation: '%1 %4 %3 %2',
calc_rand: '%1 %2 %3 %4',
get_date: '%1 %2 %3',
get_sound_duration: '%1 %2 %3',
get_user_name: 'User ID',
get_nickname: 'Nickname',
get_user_name: 'username',
get_nickname: 'nickname',
reset_project_timer: '%1',
set_visible_project_timer: '%1 %2 %3 %4',
timer_variable: '%1 %2',
get_project_timer_value: '%1 %2',
char_at: '%1 %2 %3 %4 %5',
length_of_string: '%1 %2 %3',
reverse_of_string: '%1 %2 %3',
substring: '%1 %2 %3 %4 %5 %6 %7',
replace_string: '%1 %2 %3 %4 %5 %6 %7',
change_string_case: '%1 %2 %3 %4 %5',
char_at: '%4 %3 %2',
length_of_string: '%1 %2',
reverse_of_string: '%1 %2',
combine_something: '%1 %2 %3 %4',
substring: '%1 %2 %3 %4 %5 %6',
replace_string: '%1 %4 %3 %6 %5 %2',
change_string_case: '%2 %3 %4',
count_match_string: '%2 %3 %4 %1',
index_of_string: '%1 %2 %3 %4 %5',
combine_something: '%1 %2 %3 %4 %5',
index_of_string: '%1 %4 %3 %2',
get_sound_volume: '%1 %2',
quotient_and_mod: ' %1 %6 %3 %2 %5 %4',
choose_project_timer_action: '%1 %2 %3 %4',
Expand All @@ -6764,9 +6770,10 @@ Lang.template = {
function_field_label: '%1%2',
function_field_string: '%1%2',
function_field_boolean: '%1%2',
get_block_count: 'The number of blocks in %1',
change_rgb_to_hex: 'HEX Value of R: %1 G: %2 B: %3',
change_hex_to_rgb: '%2 Value of HEX %1',
get_block_count: 'number of blocks in %1',
get_boolean_value: 'string %1',
change_rgb_to_hex: 'HEX value of R: %1 G: %2 B: %3',
change_hex_to_rgb: '%2 value of HEX %1',
function_param_string: 'Character/Number',
function_param_boolean: 'Judgement',
function_create: 'define function %1 %2',
Expand Down
Loading