[Hejes-devel] [918] tul sok szamjegy felig javitva

[hejes-devel at nytud.hu]

Revision: 918
Author:   mittelholcz
Date:     2013-08-29 18:03:08 +0200 (Thu, 29 Aug 2013)
Log Message:
-----------
tul sok szamjegy felig javitva

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/modules/szamok.py

Modified: trunk/web2py/applications/helyesiras_webdev/modules/szamok.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/szamok.py	2013-08-29 10:17:49 UTC (rev 917)
+++ trunk/web2py/applications/helyesiras_webdev/modules/szamok.py	2013-08-29 16:03:08 UTC (rev 918)
@@ -85,20 +85,20 @@
 18	: ['oktilliárd'],
 19	: ['nonillió'],
 20	: ['nonilliárd'],
-31	: ['decillió'],
-32	: ['decilliárd'], # 10^63
-33	: ['undecillió'],
-34	: ['undecilliárd'],
-35	: ['bidecillió'],
-36	: ['bidecilliárd'],
-37	: ['tridecillió'],
-38	: ['tridecilliárd'],
-39	: ['kvadecillió'],
-40	: ['kvadecilliárd'],
-41	: ['kvintdecillió'],
-42	: ['kvintdecilliárd'],
-43	: ['szexdecillió'],
-44	: ['szexdecilliárd'] # 10^99
+21	: ['decillió'], # 10^60
+22	: ['decilliárd'],
+23	: ['undecillió'],
+24	: ['undecilliárd'],
+25	: ['bidecillió'],
+26	: ['bidecilliárd'],
+27	: ['tridecillió'],
+28	: ['tridecilliárd'],
+29	: ['kvadecillió'],
+30	: ['kvadecilliárd'],
+31	: ['kvintdecillió'],
+32	: ['kvintdecilliárd'],
+33	: ['szexdecillió'],
+34	: ['szexdecilliárd'] # 10^99
 #'googol' : 10^100
 }
 
@@ -146,20 +146,20 @@
 18	: ['oktilliárdodik'],
 19	: ['nonilliomodik'],
 20	: ['nonilliárdodik'],
-31	: ['decilliomodik'],
-32	: ['decilliárdodik'], # 10^63
-33	: ['undecilliomodik'],
-34	: ['undecilliárdodik'],
-35	: ['bidecilliomodik'],
-36	: ['bidecilliárdodik'],
-37	: ['tridecilliomodik'],
-38	: ['tridecilliárdodik'],
-39	: ['kvadecilliomodik'],
-40	: ['kvadecilliárdadik'],
-41	: ['kvintdecilliomodik'],
-42	: ['kvintdecilliárdodik'],
-43	: ['szexdecilliomodik'],
-44	: ['szexdecilliárdodik'] # 10^99
+21	: ['decilliomodik'],
+22	: ['decilliárdodik'], # 10^63
+23	: ['undecilliomodik'],
+24	: ['undecilliárdodik'],
+25	: ['bidecilliomodik'],
+26	: ['bidecilliárdodik'],
+27	: ['tridecilliomodik'],
+28	: ['tridecilliárdodik'],
+29	: ['kvadecilliomodik'],
+30	: ['kvadecilliárdadik'],
+31	: ['kvintdecilliomodik'],
+32	: ['kvintdecilliárdodik'],
+33	: ['szexdecilliomodik'],
+34	: ['szexdecilliárdodik'] # 10^99
 #'googol' : 10^100
 }
 
@@ -371,7 +371,7 @@
         denom = self._translit_natural(self.m_data[3], fract=True)
         for x in nom:
           for y in denom:
-            if(((x in ONES.values()) or     # 
+            if(((x in ONES.values()) or     #
                 (x in TENS.values()) or
                 (x in ['száz', 'ezer', 'két'])) and
                ((y in FRACTS.values()) or