Fix many to long lines issues

Signed-off-by: William Moreno Reyes <williamjmorenor@gmail.com>
This commit is contained in:
William Moreno Reyes
2017-10-24 17:48:51 -06:00
parent 6462321257
commit 0600fbb183
13 changed files with 131 additions and 76 deletions

View File

@@ -21,6 +21,7 @@
from __future__ import unicode_literals
from .lang_EU import Num2Word_EU
class Num2Word_SL(Num2Word_EU):
def set_high_numwords(self, high):
max = 3 + 6*len(high)
@@ -29,7 +30,6 @@ class Num2Word_SL(Num2Word_EU):
self.cards[10**n] = word + "iljard"
self.cards[10**(n-3)] = word + "iljon"
def setup(self):
self.negword = "minus "
self.pointword = "celih"
@@ -37,30 +37,33 @@ class Num2Word_SL(Num2Word_EU):
self.errmsg_toobig = "Number is too large to convert to words."
self.exclude_title = []
self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"), (800, "osemsto"),
(700, "sedemsto"), (600, "šesto"), (500, "petsto"), (400, "štiristo"), (300, "tristo"),
self.mid_numwords = [(1000, "tisoč"), (900, "devetsto"),
(800, "osemsto"), (700, "sedemsto"),
(600, "šesto"), (500, "petsto"),
(400, "štiristo"), (300, "tristo"),
(200, "dvesto"), (100, "sto"),
(90, "devetdeset"), (80, "osemdeset"), (70, "sedemdeset"),
(60, "šestdeset"), (50, "petdeset"), (40, "štirideset"),
(90, "devetdeset"), (80, "osemdeset"),
(70, "sedemdeset"), (60, "šestdeset"),
(50, "petdeset"), (40, "štirideset"),
(30, "trideset")]
self.low_numwords = ["dvajset", "devetnajst", "osemnajst", "sedemnajst",
"šestnajst", "petnajst", "štirinajst", "trinajst",
"dvanajst", "enajst", "deset", "devet", "osem", "sedem",
self.low_numwords = ["dvajset", "devetnajst", "osemnajst",
"sedemnajst", "šestnajst", "petnajst",
"štirinajst", "trinajst", "dvanajst",
"enajst", "deset", "devet", "osem", "sedem",
"šest", "pet", "štiri", "tri", "dve", "ena",
"nič"]
self.ords = { "ena" : "prv",
"dve" : "drug",
"tri" : "tretj",
"štiri" : "četrt",
"sedem" : "sedm",
"osem" : "osm",
"sto" : "stot",
"tisoč" : "tisoč",
"miljon" : "miljont"
self.ords = {"ena": "prv",
"dve": "drug",
"tri": "tretj",
"štiri": "četrt",
"sedem": "sedm",
"osem": "osm",
"sto": "stot",
"tisoč": "tisoč",
"miljon": "miljont"
}
self.ordflag = False
def merge(self, curr, next):
ctext, cnum, ntext, nnum = curr + next
@@ -97,21 +100,20 @@ class Num2Word_SL(Num2Word_EU):
else:
ntext += "ov"
if nnum >= 10**2 and self.ordflag == False:
if nnum >= 10**2 and self.ordflag is False:
ctext += " "
val = cnum * nnum
else:
if nnum < 10 < cnum < 100:
ntext, ctext = ctext, ntext + "in"
elif cnum >= 10**2 and self.ordflag == False:
ntext, ctext = ctext, ntext + "in"
elif cnum >= 10**2 and self.ordflag is False:
ctext += " "
val = cnum + nnum
word = ctext + ntext
return (word, val)
def to_ordinal(self, value):
self.verify_ordinal(value)
self.ordflag = True
@@ -123,27 +125,25 @@ class Num2Word_SL(Num2Word_EU):
break
return outword + "i"
# Is this correct??
def to_ordinal_num(self, value):
self.verify_ordinal(value)
return str(value) + "."
def to_currency(self, val, longval=True, old=False):
if old:
return self.to_splitnum(val, hightxt="evro/a/v", lowtxt="stotin/a/i/ov",
jointxt="in",longval=longval)
return self.to_splitnum(val, hightxt="evro/a/v",
lowtxt="stotin/a/i/ov",
jointxt="in", longval=longval)
return super(Num2Word_SL, self).to_currency(val, jointxt="in",
longval=longval)
def to_year(self, val, longval=True):
if not (val//100)%10:
if not (val//100) % 10:
return self.to_cardinal(val)
return self.to_splitnum(val, hightxt="hundert", longval=longval)
n2w = Num2Word_SL()
to_card = n2w.to_cardinal
to_ord = n2w.to_ordinal
@@ -151,15 +151,16 @@ to_ordnum = n2w.to_ordinal_num
def main():
for val in [ 1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155,
180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]:
for val in [1, 11, 12, 21, 31, 33, 71, 80, 81, 91, 99, 100, 101, 102, 155,
180, 300, 308, 832, 1000, 1001, 1061, 1100, 1500, 1701, 3000,
8280, 8291, 150000, 500000, 1000000, 2000000, 2000001,
-21212121211221211111, -2.121212, -1.0000100]:
n2w.test(val)
n2w.test(1325325436067876801768700107601001012212132143210473207540327057320957032975032975093275093275093270957329057320975093272950730)
print(n2w.to_currency(112121))
print(n2w.to_year(2000))
if __name__ == "__main__":
main()