Skip to content

Commit fdb7ae5

Browse files
Added list for NeuterUnits
1 parent b5aaa0e commit fdb7ae5

File tree

1 file changed

+40
-12
lines changed

1 file changed

+40
-12
lines changed

Rules/Languages/nb/definitions.yaml

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#"natural-logarithm": "function=l n: den naturlige logaritmen: den naturlige logaritmen",
3131
"minus": "infix=minus || prefix=minus",
3232
"plus": "infix=pluss || prefix=pluss",
33-
#"real-part": "function=realdelen",
33+
#"real-part": "function=den reelle delen",
3434

3535
"transpose": "postfix=transponert || function=transponert",
3636
#"norm": "function=; normen; slutt norm", #NORWEGIAN: We say "normen til" (the norm to), so this rule is in linear-algebra
@@ -54,8 +54,8 @@
5454
"fraction": "teller;nevner",
5555
"msqrt": "rot",
5656
"square-root": "rot",
57-
"mroot": "rot;rot indeks",
58-
"root": "rot;rot indeks",
57+
"mroot": "rot;rotindeks",
58+
"root": "rot;rotindeks",
5959
"msub": "base;nedre indeks",
6060
"sub": "base;nedre indeks",
6161
"msup": "base;øvre indeks",
@@ -139,7 +139,7 @@
139139
# time
140140
"": "sekund", "\"": "sekund",
141141
"": "minutt", "'": "minutt", "min": "minutt",
142-
"h": "time", "hr": "time", "Hr": "time", "t": "time", #NORWEGIAN: t is often used for hour, but t is officially the symbol for "tonn"
142+
"h": "time", "hr": "time", "Hr": "time", "t": "time", #NORWEGIAN: t is often used for hour, but t is officially the symbol for "tonn". Added to rule "per-fraction" in SimpleSpeak and ClearSpeak
143143
"d": "dag", "dy": "dag",
144144
"w": "uke", "wk": "uke",
145145
"y": "år", "yr": "år",
@@ -152,7 +152,6 @@
152152
"MOA": "bueminutt",
153153
"arcsec": "buesekund",
154154
"asec": "buesekund",
155-
"as": "buesekund", #NORWEGIAN: Also a used symbol
156155

157156
# distance
158157
"au": "astronomisk enhet", "AU": "astronomisk enhet", "a.u.": "astronomisk enhet",
@@ -309,6 +308,28 @@
309308

310309
}
311310

311+
- NeuterUnits: {
312+
#SIUnits
313+
"g": "gram",
314+
"mol": "mol",
315+
"s": "sekund", "sek": "sekund",
316+
"t": "tonn",
317+
"a": "annuum",
318+
"as": "buesekund",
319+
320+
#UnitsWithoutPrefixes
321+
"": "sekund", "\"": "sekund",
322+
"": "minutt", "'": "minutt", "min": "minutt",
323+
"y": "år", "yr": "år",
324+
"arcmin": "bueminutt", "amin": "bueminutt", "am": "bueminutt", "MOA": "bueminutt",
325+
"arcsec": "buesekund", "asec": "buesekund",
326+
"ltyr": "lysår", "ly": "lysår", "l.y.": "lysår",
327+
328+
#EnglishUnits
329+
"bbl": "fat", "BBL": "fat",
330+
"lb": "pund",
331+
}
332+
312333

313334
# ---------------- Cardinal and Ordinal Numbers --------------------------
314335
# The following definitions are used to convert numbers to words
@@ -328,7 +349,16 @@
328349
# The definitions for the "ones" should extend until a regular pattern begins
329350
# The minimum length is 10.
330351

352+
# NORWEGIAN: The pattern for fraction is not correct.
353+
# 1/20 = "1 tjuende". Needs a number set for NumbersOrdinalFractionalTens. ("tidel", "tjuedel"...)
354+
# 2/24 = "2 tjue fjerde". The set NumbersOrdinalPluralOnes should be changed to ("", "endeler", "todeler", "tredeler"...)
355+
# 1/100 = "1 hundrede". Needs a number set for NumbersOrdinalFractionalHundreds". ("hundredel", "to hundredel"...)
356+
# 1/1000 = "1 én tusende". Needs number set for NumbersOrdinalFractionalLargeNumbers, and "én" should be removed. ("tusendel", "milliondel"...)
357+
# 2/1000 = "2 én tusendeler". Needs to remove "én".
358+
# 2/1008 = "2 én tusen åttende"
359+
331360
# For English, a regular pattern starts at twenty
361+
# NORWEGIAN: Added in front of the numbers in "NumbersOrdinalLarge" and "NumbersLarge". Easiest to just remove "én", but you will probably never see these big ordinal numbers.
332362
- NumbersOnes: [
333363
"null", "én", "to", "tre", "fire", "fem", "seks", "sju", "åtte", "ni",
334364
"ti", "elleve", "tolv", "tretten", "fjorten", "femten", "seksten",
@@ -341,6 +371,7 @@
341371
"syttende", "attende", "nittende"
342372
]
343373

374+
# NORWEGIAN: Should be changed to "", "endeler", "todeler"...Then, for example, the fraction 2/24 will be "2 tjue firedeler"
344375
- NumbersOrdinalPluralOnes: [
345376
"nullte", "første", "andre", "tredje", "fjerde", "femte", "sjette", "sjuende", "åttende", "niende",
346377
"tiende", "ellevte", "tolvte", "trettende", "fjortende", "femtende", "sekstende",
@@ -359,8 +390,7 @@
359390
"tideler", "ellevedeler", "tolvdeler", "trettendeler", "fjortendeler", "femtendeler", "sekstendeler",
360391
"syttendeler", "attendeler", "nittendeler"
361392
]
362-
363-
393+
364394
# What to use for multiples of 10
365395
- NumbersTens: [
366396
"", "ti", "tjue", "tretti", "førti", "femti", "seksti", "sytti", "åtti", "nitti"
@@ -374,23 +404,21 @@
374404
"", "tideler", "tjuedeler", "trettideler", "førtideler", "femtideler", "sekstideler", "syttideler", "åttideler", "nittideler"
375405
]
376406

377-
378407
- NumbersHundreds: [
379-
"", "ett hundre", "to hundre", "tre hundre", "fire hundre", "fem hundre",
408+
"", "hundre", "to hundre", "tre hundre", "fire hundre", "fem hundre",
380409
"seks hundre", "sju hundre", "åtte hundre", "ni hundre"
381410
]
382411

383412
- NumbersOrdinalHundreds: [
384-
"", "ett hundrede", "to hundrede", "tre hundrede", "fire hundrede", "fem hundrede",
413+
"", "hundrede", "to hundrede", "tre hundrede", "fire hundrede", "fem hundrede",
385414
"seks hundrede", "sju hundrede", "åtte hundrede", "ni hundrede"
386415
]
387416

388417
- NumbersOrdinalPluralHundreds: [
389-
"", "én hundredel", "to hundredeler", "tre hundredeler", "fire hundredeler", "fem hundredeler",
418+
"", "hundredeler", "to hundredeler", "tre hundredeler", "fire hundredeler", "fem hundredeler",
390419
"seks hundredeler", "sju hundredeler", "åtte hundredeler", "ni hundredeler"
391420
]
392421

393-
394422
# At this point, hopefully the language is regular. If not, code needs to be written
395423
- NumbersLarge: [
396424
"", "tusen", "million", "milliard", "billion", "billiard",

0 commit comments

Comments
 (0)