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

1 files changed, 31 insertions, 0 deletions

diff --git a/python/problems/functions/body_mass_index_2/sl.py b/python/problems/functions/body_mass_index_2/sl.py
new file mode 100644
index 0000000..8cd56c7
--- /dev/null
+++ b/python/problems/functions/body_mass_index_2/sl.py
@@ -0,0 +1,31 @@
+# coding=utf-8
+import server
+mod = server.problems.load_language('python', 'sl')
+
+name = 'Indeks telesne teže 2'
+slug = 'Indeks telesne teže 2'
+
+description = '''\
+<p>
+Naloga je podobna prejšnji, le da imamo tokrat podatke v drugačni obliki:
+<pre>
+>>> imena = ['Ana', 'Berta']
+>>> teze = [55, 60]
+>>> visine = [165, 153]
+>>> bmi2(imena, teze, visine)
+[('Ana', 20.202020202020204), ('Berta', 25.63116749967961)]
+</pre>
+</p>'''
+
+plan = ['''\
+<p></p>
+''',
+        '''\
+<p></p>''']
+
+hint = {
+    'final_hint': ['''\
+<p>Program je pravilen! <br>
+</p>
+'''],
+}