Skip to content

Commit 2d6e3d7

Browse files
committed
Merge branch 'main' into pr/4801
2 parents e2d8246 + a5fb1f0 commit 2d6e3d7

File tree

71 files changed

+1230
-5240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1230
-5240
lines changed

content/adventures/ar.yaml

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,14 @@ adventures:
526526
story_text_3: |
527527
يمكنك أيضاً ترك الكومبيوتر يختار لك أرقام عشوائياً بإستخدام الأمر بشكل عشوائي.
528528
يوضح هذا المثال كيفية إختيار رقم من الجداول للتدريب، و بذلك تحصل على أرقام مختلفة دائماً لتتمرن على ناتج الضرب:
529+
example_code_3: |
530+
numbers = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
531+
number_1 = _
532+
number_2 = _
533+
correct_answer = number_1 * number_2
534+
given_answer = 'What is ' number_1 ' times ' number_2 '?'
535+
{if} _
536+
{else} _
529537
start_code: '{print} "أهلاً بكم في هذه الآلة الحاسبة!"'
530538
9:
531539
story_text: |
@@ -1376,33 +1384,33 @@ adventures:
13761384
```
13771385
start_code: |4
13781386
1379-
define food_order
1380-
toppings = ask 'pepperoni, tuna, veggie or cheese?'
1381-
size = ask 'big, medium or small?'
1382-
number_of_pizza = ask 'How many these pizzas would you like?'
1387+
define food_order
1388+
toppings = ask 'pepperoni, tuna, veggie or cheese?'
1389+
size = ask 'big, medium or small?'
1390+
number_of_pizza = ask 'How many these pizzas would you like?'
13831391
1384-
print 'YOU ORDERED'
1385-
print number_of_pizzas ' size ' topping ' pizza'
1392+
print 'YOU ORDERED'
1393+
print number_of_pizzas ' size ' topping ' pizza'
13861394
1387-
define drinks_order
1388-
drink = ask 'water, coke, icetea, lemonade or coffee?'
1389-
number_of_drinks = ask 'How many of these drinks would you like?'
1395+
define drinks_order
1396+
drink = ask 'water, coke, icetea, lemonade or coffee?'
1397+
number_of_drinks = ask 'How many of these drinks would you like?'
13901398
1391-
print 'YOU ORDERED'
1392-
print number_of_drinks ' ' drink
1399+
print 'YOU ORDERED'
1400+
print number_of_drinks ' ' drink
13931401
1394-
'Welcome to Hedy pizza'
1395-
more_food = ask 'Would you like to order a pizza?'
1396-
while more_food = 'yes'
1397-
return food_order
1398-
more_food = ask 'Would you like to order a pizza?'
1399-
more_drinks = ask 'Would you like to order some drinks?'
1400-
while more_drinks == 'yes'
1401-
call drink_order
1402-
more_drinks == ask 'Would you like to order more drinks?'
1402+
'Welcome to Hedy pizza'
1403+
more_food = ask 'Would you like to order a pizza?'
1404+
while more_food = 'yes'
1405+
return food_order
1406+
more_food = ask 'Would you like to order a pizza?'
1407+
more_drinks = ask 'Would you like to order some drinks?'
1408+
while more_drinks == 'yes'
1409+
call drink_order
1410+
more_drinks == ask 'Would you like to order more drinks?'
14031411
14041412
1405-
print 'Thanks for ordering!'
1413+
print 'Thanks for ordering!'
14061414
18:
14071415
story_text: |-
14081416
### Exercise
@@ -1427,20 +1435,20 @@ adventures:
14271435
```
14281436
start_code: |4
14291437
1430-
animals = ['pig', 'dog', 'cow']
1431-
sounds = ['oink', 'woof', 'moo']
1432-
for i in range 1 to 3
1433-
animal = animals[i]
1434-
sound = sounds[i]
1435-
print 'Old McDonald had a farm'
1436-
print 'E I E I O!'
1437-
print 'and on that farm he had a ' animal
1438-
print 'E I E I O!'
1439-
print 'with a ' sound sound ' here'
1440-
print 'and a ' sound sound ' there'
1441-
print 'here a ' sound
1442-
print 'there a ' sound
1443-
print 'everywhere a ' sound sound
1438+
animals = ['pig', 'dog', 'cow']
1439+
sounds = ['oink', 'woof', 'moo']
1440+
for i in range 1 to 3
1441+
animal = animals[i]
1442+
sound = sounds[i]
1443+
print 'Old McDonald had a farm'
1444+
print 'E I E I O!'
1445+
print 'and on that farm he had a ' animal
1446+
print 'E I E I O!'
1447+
print 'with a ' sound sound ' here'
1448+
print 'and a ' sound sound ' there'
1449+
print 'here a ' sound
1450+
print 'there a ' sound
1451+
print 'everywhere a ' sound sound
14441452
default:
14451453
name: المقدمة
14461454
default_save_name: مقدمة

content/adventures/fy.yaml

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,14 @@ adventures:
541541
```
542542
story_text_3: |
543543
You can also let the computer do random calculations on its own using {random}.
544+
example_code_3: |
545+
numbers = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
546+
number_1 = _
547+
number_2 = _
548+
correct_answer = number_1 * number_2
549+
given_answer = 'What is ' number_1 ' times ' number_2 '?'
550+
{if} _
551+
{else} _
544552
start_code: '{print} ''Welcome to this calculator!'''
545553
9:
546554
story_text: |
@@ -1391,33 +1399,33 @@ adventures:
13911399
```
13921400
start_code: |4
13931401
1394-
define food_order
1395-
toppings = ask 'pepperoni, tuna, veggie or cheese?'
1396-
size = ask 'big, medium or small?'
1397-
number_of_pizza = ask 'How many these pizzas would you like?'
1402+
define food_order
1403+
toppings = ask 'pepperoni, tuna, veggie or cheese?'
1404+
size = ask 'big, medium or small?'
1405+
number_of_pizza = ask 'How many these pizzas would you like?'
13981406
1399-
print 'YOU ORDERED'
1400-
print number_of_pizzas ' size ' topping ' pizza'
1407+
print 'YOU ORDERED'
1408+
print number_of_pizzas ' size ' topping ' pizza'
14011409
1402-
define drinks_order
1403-
drink = ask 'water, coke, icetea, lemonade or coffee?'
1404-
number_of_drinks = ask 'How many of these drinks would you like?'
1410+
define drinks_order
1411+
drink = ask 'water, coke, icetea, lemonade or coffee?'
1412+
number_of_drinks = ask 'How many of these drinks would you like?'
14051413
1406-
print 'YOU ORDERED'
1407-
print number_of_drinks ' ' drink
1414+
print 'YOU ORDERED'
1415+
print number_of_drinks ' ' drink
14081416
1409-
'Welcome to Hedy pizza'
1410-
more_food = ask 'Would you like to order a pizza?'
1411-
while more_food = 'yes'
1412-
return food_order
1413-
more_food = ask 'Would you like to order a pizza?'
1414-
more_drinks = ask 'Would you like to order some drinks?'
1415-
while more_drinks == 'yes'
1416-
call drink_order
1417-
more_drinks == ask 'Would you like to order more drinks?'
1417+
'Welcome to Hedy pizza'
1418+
more_food = ask 'Would you like to order a pizza?'
1419+
while more_food = 'yes'
1420+
return food_order
1421+
more_food = ask 'Would you like to order a pizza?'
1422+
more_drinks = ask 'Would you like to order some drinks?'
1423+
while more_drinks == 'yes'
1424+
call drink_order
1425+
more_drinks == ask 'Would you like to order more drinks?'
14181426
14191427
1420-
print 'Thanks for ordering!'
1428+
print 'Thanks for ordering!'
14211429
18:
14221430
story_text: |-
14231431
### Exercise
@@ -1442,20 +1450,20 @@ adventures:
14421450
```
14431451
start_code: |4
14441452
1445-
animals = ['pig', 'dog', 'cow']
1446-
sounds = ['oink', 'woof', 'moo']
1447-
for i in range 1 to 3
1448-
animal = animals[i]
1449-
sound = sounds[i]
1450-
print 'Old McDonald had a farm'
1451-
print 'E I E I O!'
1452-
print 'and on that farm he had a ' animal
1453-
print 'E I E I O!'
1454-
print 'with a ' sound sound ' here'
1455-
print 'and a ' sound sound ' there'
1456-
print 'here a ' sound
1457-
print 'there a ' sound
1458-
print 'everywhere a ' sound sound
1453+
animals = ['pig', 'dog', 'cow']
1454+
sounds = ['oink', 'woof', 'moo']
1455+
for i in range 1 to 3
1456+
animal = animals[i]
1457+
sound = sounds[i]
1458+
print 'Old McDonald had a farm'
1459+
print 'E I E I O!'
1460+
print 'and on that farm he had a ' animal
1461+
print 'E I E I O!'
1462+
print 'with a ' sound sound ' here'
1463+
print 'and a ' sound sound ' there'
1464+
print 'here a ' sound
1465+
print 'there a ' sound
1466+
print 'everywhere a ' sound sound
14591467
default:
14601468
name: Introduction
14611469
default_save_name: intro

content/adventures/he.yaml

Lines changed: 43 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,14 @@ adventures:
542542
```
543543
story_text_3: |
544544
You can also let the computer do random calculations on its own using {random}.
545+
example_code_3: |
546+
numbers = 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
547+
number_1 = _
548+
number_2 = _
549+
correct_answer = number_1 * number_2
550+
given_answer = 'What is ' number_1 ' times ' number_2 '?'
551+
{if} _
552+
{else} _
545553
start_code: '{print} ''Welcome to this calculator!'''
546554
9:
547555
story_text: |
@@ -1393,33 +1401,33 @@ adventures:
13931401
```
13941402
start_code: |4
13951403
1396-
define food_order
1397-
toppings = ask 'pepperoni, tuna, veggie or cheese?'
1398-
size = ask 'big, medium or small?'
1399-
number_of_pizza = ask 'How many these pizzas would you like?'
1404+
define food_order
1405+
toppings = ask 'pepperoni, tuna, veggie or cheese?'
1406+
size = ask 'big, medium or small?'
1407+
number_of_pizza = ask 'How many these pizzas would you like?'
14001408
1401-
print 'YOU ORDERED'
1402-
print number_of_pizzas ' size ' topping ' pizza'
1409+
print 'YOU ORDERED'
1410+
print number_of_pizzas ' size ' topping ' pizza'
14031411
1404-
define drinks_order
1405-
drink = ask 'water, coke, icetea, lemonade or coffee?'
1406-
number_of_drinks = ask 'How many of these drinks would you like?'
1412+
define drinks_order
1413+
drink = ask 'water, coke, icetea, lemonade or coffee?'
1414+
number_of_drinks = ask 'How many of these drinks would you like?'
14071415
1408-
print 'YOU ORDERED'
1409-
print number_of_drinks ' ' drink
1416+
print 'YOU ORDERED'
1417+
print number_of_drinks ' ' drink
14101418
1411-
'Welcome to Hedy pizza'
1412-
more_food = ask 'Would you like to order a pizza?'
1413-
while more_food = 'yes'
1414-
return food_order
1415-
more_food = ask 'Would you like to order a pizza?'
1416-
more_drinks = ask 'Would you like to order some drinks?'
1417-
while more_drinks == 'yes'
1418-
call drink_order
1419-
more_drinks == ask 'Would you like to order more drinks?'
1419+
'Welcome to Hedy pizza'
1420+
more_food = ask 'Would you like to order a pizza?'
1421+
while more_food = 'yes'
1422+
return food_order
1423+
more_food = ask 'Would you like to order a pizza?'
1424+
more_drinks = ask 'Would you like to order some drinks?'
1425+
while more_drinks == 'yes'
1426+
call drink_order
1427+
more_drinks == ask 'Would you like to order more drinks?'
14201428
14211429
1422-
print 'Thanks for ordering!'
1430+
print 'Thanks for ordering!'
14231431
18:
14241432
story_text: |-
14251433
### Exercise
@@ -1444,20 +1452,20 @@ adventures:
14441452
```
14451453
start_code: |4
14461454
1447-
animals = ['pig', 'dog', 'cow']
1448-
sounds = ['oink', 'woof', 'moo']
1449-
for i in range 1 to 3
1450-
animal = animals[i]
1451-
sound = sounds[i]
1452-
print 'Old McDonald had a farm'
1453-
print 'E I E I O!'
1454-
print 'and on that farm he had a ' animal
1455-
print 'E I E I O!'
1456-
print 'with a ' sound sound ' here'
1457-
print 'and a ' sound sound ' there'
1458-
print 'here a ' sound
1459-
print 'there a ' sound
1460-
print 'everywhere a ' sound sound
1455+
animals = ['pig', 'dog', 'cow']
1456+
sounds = ['oink', 'woof', 'moo']
1457+
for i in range 1 to 3
1458+
animal = animals[i]
1459+
sound = sounds[i]
1460+
print 'Old McDonald had a farm'
1461+
print 'E I E I O!'
1462+
print 'and on that farm he had a ' animal
1463+
print 'E I E I O!'
1464+
print 'with a ' sound sound ' here'
1465+
print 'and a ' sound sound ' there'
1466+
print 'here a ' sound
1467+
print 'there a ' sound
1468+
print 'everywhere a ' sound sound
14611469
default:
14621470
name: הקדמה
14631471
default_save_name: הקדמה

0 commit comments

Comments
 (0)