Browse Source

Russian: refacter the NUM2_THOUSANDS_VAR1 to return 1MA, not 0MB and fix the rules for them

master
kirill-jjj 2 years ago
parent
commit
95ed5c0c88
No account linked to committer's email address
2 changed files with 11 additions and 11 deletions
  1. 10
    10
      dictsource/ru_list
  2. 1
    1
      src/libespeak-ng/numbers.c

+ 10
- 10
dictsource/ru_list View File

@@ -41,34 +41,34 @@ _6C S,E#s;t;s'ot
_7C s;,Ims'ot
_8C vOs;Ims'ot
_9C dev;Vts'ot
_0MB1 t'ys;itS;V // keep '1' before thousand
_1MA1 t'ys;itS;V // keep '1' before thousand
_0MA1 t'ys;itS;i
_0M1 t'ys;itS;
_0MB2 m;,Il;I;'on
_1MA2 m;,Il;I;'on
_0MA2 m;,IlI;'ona
_0M2 m;,IlI;'onV#f
_0MB3 m;,IlI;'art
_1MA3 m;,IlI;'art
_0M3 m;,IlI;'ardV#f
_0MA3 m;,IlI;'arda
_0MB4 tr;,IlI;'on
_1MA4 tr;,IlI;'on
_0M4 tr;,IlI;'onV#f
_0MA4 tr;,IlI;'ona
_0MB5 kvVd@-r;il;i'on
_1MA5 kvVd@-r;il;i'on
_0M5 kvVd@-r;il;i'onV#f
_0MA5 kvVd@-r;il;i'ona
_0MB6 kv;int;il;i'on
_1MA6 kv;int;il;i'on
_0M6 kv;int;il;i'onV#f
_0MA6 kv;int;il;i'ona
_0MB7 s;iks;t;il;i'on
_1MA7 s;iks;t;il;i'on
_0M7 s;iks;t;il;i'onV#f
_0MA7 s;iks;t;il;i'ona
_0MB8 s;ipt;il;i'on
_1MA8 s;ipt;il;i'on
_0M8 s;ipt;il;i'onV#f
_0MA8 s;ipt;il;i'ona
_0MB9 Vkt;il;i'on
_1MA9 Vkt;il;i'on
_0M9 Vkt;il;i'onV#f
_0MA9 Vkt;il;i'ona
_0MB10 nVn;il;i'on
_1MA10 nVn;il;i'on
_0M10 nVn;il;i'onV#f
_0MA10 nVn;il;i'ona
_dpt _:'i_: // start of decimal fraction

+ 1
- 1
src/libespeak-ng/numbers.c View File

@@ -885,7 +885,7 @@ static const char *M_Variant(int value)
case NUM2_THOUSANDS_VAR1: // lang=ru
if (teens == false) {
if ((value % 10) == 1)
return "0MB";
return "1MA";
if (((value % 10) >= 2) && ((value % 10) <= 4))
return "0MA";
}

Loading…
Cancel
Save