Merge commit 'd88e5a8df6af4beb7700ed84abab8ad1f79a44c1'

This commit is contained in:
Reece H. Dunn
2013-10-20 09:25:33 +01:00
5 changed files with 44 additions and 113 deletions
+5 -1
View File
@@ -511,6 +511,8 @@ Translator *SelectTranslator(const char *name)
break;
case L('a','r'): // Arabic
tr->letter_bits_offset = OFFSET_ARABIC;
tr->langopts.numbers = NUM_SWAP_TENS | NUM_AND_UNITS | NUM_HUNDRED_AND | NUM_OMIT_1_HUNDRED | NUM_AND_HUNDRED | NUM_THOUSAND_AND | NUM_OMIT_1_THOUSAND;
@@ -1260,7 +1262,7 @@ SetLengthMods(tr,3); // all equal
}
break;
case L('o','m'):
case L('o','m'): // Oromo
{
static const unsigned char stress_amps_om[] = {18,15, 20,20, 20,22, 22,22 };
static const short stress_lengths_om[8] = {200,200, 200,200, 0,0, 200,200};
@@ -1268,6 +1270,8 @@ SetLengthMods(tr,3); // all equal
SetupTranslator(tr,stress_lengths_om,stress_amps_om);
tr->langopts.stress_rule = STRESSPOSN_2R;
tr->langopts.stress_flags = S_FINAL_DIM_ONLY | S_FINAL_NO_2 | 0x80000;
tr->langopts.numbers = NUM_OMIT_1_HUNDRED | NUM_HUNDRED_AND;
tr->langopts.numbers2 = 0x200; // say "thousands" before its number
}
break;