diff options
| author | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
|---|---|---|
| committer | Jure Žabkar <jure.zabkar@fri.uni-lj.si> | 2015-10-12 14:19:07 +0200 |
| commit | 0a88716110994f789f764704a96791fdfb5fa288 (patch) | |
| tree | 788c16ab578cf76eda358abc1d0587503d413a87 /python/problems/while_and_if/buy_five/sl.py | |
| parent | 1a7678b37a25a76aeaef7ebb225f85406b19f928 (diff) | |
| parent | 5a01c2bb184152c6ccc3c536e9b857d247bc55ad (diff) | |
Merge branch 'master' of ssh://212.235.189.51:22122/codeq-problems
Conflicts:
robot/problems/introduction/forward/en.py
robot/problems/introduction/forward/sl.py
Diffstat (limited to 'python/problems/while_and_if/buy_five/sl.py')
| -rw-r--r-- | python/problems/while_and_if/buy_five/sl.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/python/problems/while_and_if/buy_five/sl.py b/python/problems/while_and_if/buy_five/sl.py index 22fa7b4..3dbc9d3 100644 --- a/python/problems/while_and_if/buy_five/sl.py +++ b/python/problems/while_and_if/buy_five/sl.py @@ -2,7 +2,6 @@ import server mod = server.problems.load_language('python', 'sl') -id = 185 name = 'Blagajna "vse po pet"' slug = 'Blagajna "vse po pet"' @@ -22,7 +21,7 @@ Vsota: 16 ''' bad_solution = ['''\ -<p><b>Primer, kako NE reševati</b></h3> +<p>Primer, kako NE reševati</h3> <pre> cena1 = float(input('Cena artikla: ')) cena2 = float(input('Cena artikla: ')) @@ -36,7 +35,7 @@ print ("Vsota: " + vsota) <p>Rešitev je slaba, saj imamo pet enakih vrstic! Uporabite zanko! </p>'''] main_plan = ['''\ -<p><b>Plan:</b></p> +<p>Plan:</p> <pre> 1. Ponavljaj 5x: 2. Preberi ceno. @@ -45,9 +44,9 @@ main_plan = ['''\ </pre>'''] while_clause = ['''\ -<p>Kako bi nekaj <b>5x ponovil</b>?</p>''', +<p>Uporabi zanko <code>while</code>.</p>''', '''\ -<p>Zanka while ima naslednjo sintakso:</p> +<p>Zanka <code>while</code> ima naslednjo sintakso:</p> <pre> while Pogoj: stavek 1 @@ -62,7 +61,7 @@ našem primeru s stavkom n.</p>''' ] reading_while = ['''\ -<p>Za <b>večkratno branje</b> želimo uporabiti zanko</p>''', +<p>Za večkratno branje želimo uporabiti zanko</p>''', '''\ <pre> @@ -94,7 +93,7 @@ while stevec < 5: '''] summation = ['''\ -<p><b>Računanje vsote</b> bo najlažje sproti v zanki. <p>''', +<p>Računaj vsoto sproti v zanki. <p>''', '''\ <p>Izmisli si spremenljivko, ki bo predstavljala vsoto, jo na |