Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/8512 #2784

Merged
merged 2 commits into from
Jul 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
129 changes: 68 additions & 61 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',
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 @@ -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 @@ -6723,24 +6729,24 @@ Lang.template = {
calc_mod: '%1 %2 %3',
calc_share: '%1 %2 %3',
calc_operation: '%1 %2 %3 %4',
calc_rand: '%1 %2 %3 %4 %5',
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
44 changes: 24 additions & 20 deletions extern/lang/ko.js
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ Lang.Blocks = {
CALC_calc_share_2: '/',
CALC_calc_share_3: '의 몫',
CALC_coordinate_mouse_1: '마우스',
CALC_coordinate_mouse_2: '좌표',
CALC_coordinate_mouse_2: '좌푯값',
CALC_coordinate_object_1: '',
CALC_coordinate_object_2: '의',
CALC_coordinate_object_3: '',
Expand Down Expand Up @@ -1228,20 +1228,21 @@ Lang.Blocks = {
FUNCTION_logical_variable: '판단값',
FUNCTION_function: '함수',
FUNCTION_define: '함수 정의하기',
CALC_calc_operation_sin: '사인값',
CALC_calc_operation_cos: '코사인값',
CALC_calc_operation_tan: '탄젠트값',
CALC_calc_operation_sin: '사인',
CALC_calc_operation_cos: '코사인',
CALC_calc_operation_tan: '탄젠트',
CALC_calc_operation_asin: '아크사인',
CALC_calc_operation_acos: '아크코사인',
CALC_calc_operation_atan: '아크탄젠트',
CALC_calc_operation_log: '로그',
CALC_calc_operation_ln: '자연로그',
CALC_calc_operation_natural: '정수 부분',
CALC_calc_operation_unnatural: '소수점 부분',
CALC_calc_operation_floor: '소수점 버림값',
CALC_calc_operation_ceil: '소수점 올림값',
CALC_calc_operation_round: '소수점 반올림값',
CALC_calc_operation_factorial: '펙토리얼값',
CALC_calc_operation_asin: '아크사인값',
CALC_calc_operation_acos: '아크코사인값',
CALC_calc_operation_atan: '아크탄젠트값',
CALC_calc_operation_log: '로그값',
CALC_calc_operation_ln: '자연로그값',
CALC_calc_operation_natural: '정수 부분',
CALC_calc_operation_unnatural: '소수점 부분',
CALC_calc_operation_factorial: '펙토리얼',
CALC_calc_operation_abs: '절댓값',
MOVING_locate_object_time_1: '',
MOVING_locate_object_time_2: '초 동안',
MOVING_locate_object_time_3: '위치로 이동하기',
Expand Down Expand Up @@ -1272,7 +1273,6 @@ Lang.Blocks = {
TUT_repeat_until_gold: '부품에 도달할 때 까지 반복',
TUT_declare_function: '함수 선언',
TUT_call_function: '함수 호출',
CALC_calc_operation_abs: '절댓값',
CONTEXT_COPY_option: '코드 복사',
Delete_Blocks: '코드 삭제',
Duplication_option: '코드 복사 & 붙여넣기',
Expand Down Expand Up @@ -1310,9 +1310,8 @@ Lang.Blocks = {
CALC_replace_string_2: '의',
CALC_replace_string_3: '을(를)',
CALC_replace_string_4: '(으)로 바꾼 값',
CALC_change_string_case_1: '',
CALC_change_string_case_2: '의',
CALC_change_string_case_3: ' ',
CALC_change_string_case_1: '을(를)',
CALC_change_string_case_2: '로 바꾼 값',
CALC_change_string_case_sub_1: '대문자',
CALC_change_string_case_sub_2: '소문자',
CALC_count_match_string_1: '에서',
Expand Down Expand Up @@ -6116,14 +6115,14 @@ Lang.Helper = {
get_y_coordinate: '해당 오브젝트의 y 좌푯값을 의미합니다.',
coordinate_mouse: '마우스 포인터의 x 또는 y 좌푯값입니다.',
coordinate_object:
'선택한 오브젝트의 각종 정보 값입니다. (x 좌표, y 좌표, 방향, 이동방향, 크기, 모양번호, 모양이름)',
'선택한 오브젝트의 각종 정보 값입니다. (x 좌푯값, y 좌푯값, 방향, 이동 방향, 크기, 모양 번호, 모양 이름)',
quotient_and_mod:
'입력된 두 수를 나눈 결괏값입니다.\n몫 : 앞의 수에서 뒤의 수를 나누어 생긴 몫의 값입니다. \n나머지 : 앞의 수에서 뒤의 수를 나누어 생긴 나머지 값입니다.',
'입력한 두 수를 나눈 결괏값입니다.\n- 몫 : 앞의 수에서 뒤의 수를 나누어 생긴 몫의 값입니다.\n- 나머지 : 앞의 수에서 뒤의 수를 나누어 생긴 나머지 값입니다.',
get_rotation_direction: '해당 오브젝트의 방향값, 이동 방향값을 의미합니다.',
calc_share: '앞 수에서 뒤 수를 나누어 생긴 몫을 의미합니다.',
calc_mod: '앞 수에서 뒤 수를 나누어 생긴 나머지를 의미합니다.',
calc_operation:
'입력한 수에 대한 다양한 수학식의 계산값입니다. (제곱, 루트, 사인값, 코사인값, 탄젠트값, 아크사인값, 아크코사인값, 아크탄젠트값, 로그값, 자연로그값, 소수점 부분, 소수점 버림값, 소수점 올림값, 소수점 반올림값, 펙토리얼값, 절대값)',
'입력한 수에 대한 다양한 수학식의 계산값입니다. (제곱, 루트, 사인, 코사인, 탄젠트, 아크사인, 아크코사인, 아크탄젠트, 로그, 자연로그, 소수점 부분, 소수점 버림값, 소수점 올림값, 소수점 반올림값, 팩토리얼, 절댓값)',
get_date:
'현재 날짜와 시각에 대한 값입니다.\n- 연도: 현재 연도를 반환합니다.\n- 월: 현재 월을 반환합니다.\n- 일: 현재 일을 반환합니다.\n- 요일: 현재 요일을 숫자로 반환합니다.\n일, 월, 화, 수, 목, 금, 토요일을 차례대로 0, 1, 2, 3, 4, 5, 6으로 반환합니다.\n- 시각: 현재 시각을 각각 시, 분, 초로 반환합니다.',
distance_something: '해당 오브젝트와 선택한 오브젝트 또는 마우스 포인터 간의 거릿값입니다.',
Expand Down Expand Up @@ -6216,6 +6215,10 @@ Lang.Helper = {
index_of_string:
'입력한 값에서 지정한 값이 처음으로 등장하는 위치 값입니다. (공백을 포함합니다.)',
change_string_case: '입력한 영문의 모든 알파벳을 대문자 또는 소문자로 바꾼 값입니다.',
get_block_count:
'선택한 항목에서 사용된 블록의 수입니다.\n시작 블록에 조립된 블록을 기준으로 수를 셉니다.\n- 모든: 작품의 모든 블록의 수를 셉니다.\n- 자신: 이 오브젝트의 블록 수를 셉니다.\n- (오브젝트 이름): 선택한 오브젝트의 블록 수를 셉니다.\n- (장면 이름): 선택한 장면의 블록 수를 셉니다.',
get_boolean_value:
"결합한 판단 블록의 결괏값입니다. 판단 블록이 '참'이면 'TRUE', '거짓'이면 'FALSE'를 반환합니다.",
direction_relative_duration:
'오브젝트의 이동 방향이 입력한 시간에 걸쳐 입력한 각도만큼 시계방향으로 회전합니다. (오브젝트의 중심점을 기준으로 회전합니다.)',
get_sound_volume: '작품에 설정된 소리의 크기 값입니다.',
Expand Down Expand Up @@ -7232,7 +7235,7 @@ Lang.template = {
length_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',
change_string_case: '%2 %1 %4 %3',
count_match_string: '%1 %2 %3 %4',
index_of_string: '%1 %2 %3 %4 %5',
combine_something: '%1 %2 %3 %4 %5',
Expand Down Expand Up @@ -7260,6 +7263,7 @@ Lang.template = {
function_field_string: '%1%2',
function_field_boolean: '%1%2',
get_block_count: '%1 의 블록 수',
get_boolean_value: '%1 의 값',
change_rgb_to_hex: 'R:%1G:%2B:%3의 HEX 값',
change_hex_to_rgb: 'HEX%1의 %2값',
function_param_string: '문자/숫자값',
Expand Down
1 change: 1 addition & 0 deletions extern/util/static.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ EntryStatic.getAllBlocks = function () {
'get_block_count',
'change_rgb_to_hex',
'change_hex_to_rgb',
'get_boolean_value',
],
},
{
Expand Down
Loading
Loading