diff --git a/resources/numex/fr.json b/resources/numex/fr.json index 7917ca20..7dd32243 100644 --- a/resources/numex/fr.json +++ b/resources/numex/fr.json @@ -151,6 +151,7 @@ "name": "soixante", "value": 60, "type": "cardinal", + "radix": 20, "right": "add" }, { @@ -159,13 +160,6 @@ "type": "cardinal", "right": "add" }, - { - "name": "soixante", - "value": 70, - "type": "cardinal", - "radix": 20, - "right": "add" - }, { "name": "huitante", "value": 80, diff --git a/src/numex_data.c b/src/numex_data.c index 0880a6dc..595a2122 100644 --- a/src/numex_data.c +++ b/src/numex_data.c @@ -1525,7 +1525,6 @@ char *numex_keys[] = { "cinquante", "soixante", "septante", - "soixante", "huitante", "octante", "quatre vignts", @@ -5066,9 +5065,8 @@ numex_rule_t numex_rules[] = { {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 30LL}, {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 40LL}, {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 50LL}, - {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 60LL}, + {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 60LL}, {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 70LL}, - {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 70LL}, {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL}, {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 10, 80LL}, {NUMEX_LEFT_CONTEXT_NONE, NUMEX_RIGHT_CONTEXT_ADD, NUMEX_CARDINAL_RULE, GENDER_NONE, CATEGORY_DEFAULT, 20, 80LL}, @@ -7924,27 +7922,27 @@ numex_language_source_t numex_languages[] = { {"es", 1, 1206, 133, 273, 71}, {"et", 1, 1339, 49, 344, 0}, {"fi", 1, 1388, 107, 344, 19}, - {"fr", 1, 1495, 194, 363, 80}, - {"ga", 1, 1689, 86, 443, 0}, - {"hr", 1, 1775, 188, 443, 0}, - {"hu", 1, 1963, 66, 443, 0}, - {"it", 1, 2029, 163, 443, 40}, - {"ja", 0, 2192, 18, 483, 0}, - {"ko", 0, 2210, 18, 483, 0}, - {"la", 1, 2228, 31, 483, 0}, - {"lt", 1, 2259, 69, 483, 0}, - {"lv", 1, 2328, 102, 483, 0}, - {"mt", 1, 2430, 93, 483, 0}, - {"nb", 1, 2523, 46, 483, 0}, - {"nl", 1, 2569, 68, 483, 184}, - {"pl", 1, 2637, 82, 667, 10}, - {"pt", 1, 2719, 170, 677, 40}, - {"ro", 1, 2889, 53, 717, 0}, - {"ru", 1, 2942, 192, 717, 86}, - {"sk", 1, 3134, 72, 803, 0}, - {"sl", 1, 3206, 59, 803, 0}, - {"sv", 1, 3265, 95, 803, 20}, - {"tr", 1, 3360, 70, 823, 0}, - {"uk", 1, 3430, 77, 823, 0}, - {"zh", 0, 3507, 33, 823, 0} + {"fr", 1, 1495, 193, 363, 80}, + {"ga", 1, 1688, 86, 443, 0}, + {"hr", 1, 1774, 188, 443, 0}, + {"hu", 1, 1962, 66, 443, 0}, + {"it", 1, 2028, 163, 443, 40}, + {"ja", 0, 2191, 18, 483, 0}, + {"ko", 0, 2209, 18, 483, 0}, + {"la", 1, 2227, 31, 483, 0}, + {"lt", 1, 2258, 69, 483, 0}, + {"lv", 1, 2327, 102, 483, 0}, + {"mt", 1, 2429, 93, 483, 0}, + {"nb", 1, 2522, 46, 483, 0}, + {"nl", 1, 2568, 68, 483, 184}, + {"pl", 1, 2636, 82, 667, 10}, + {"pt", 1, 2718, 170, 677, 40}, + {"ro", 1, 2888, 53, 717, 0}, + {"ru", 1, 2941, 192, 717, 86}, + {"sk", 1, 3133, 72, 803, 0}, + {"sl", 1, 3205, 59, 803, 0}, + {"sv", 1, 3264, 95, 803, 20}, + {"tr", 1, 3359, 70, 823, 0}, + {"uk", 1, 3429, 77, 823, 0}, + {"zh", 0, 3506, 33, 823, 0} };