Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(svn r24373) -Codechange: Improve descriptions of plural forms.

Browse Source
replace/41b28d7194a279bdc17475d4fbe2ea6ec885a466
frosch 12 years ago
parent 61b3378895
commit 2ef319d0fe
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File

27
src/strings.cpp
Unescape Escape View File

@ -469,75 +469,74 @@ static int DeterminePluralForm(int64 count, int plural_form)
default: default:
NOT_REACHED(); NOT_REACHED();
/* Two forms, singular used for one only /* Two forms: singular used for one only.
* Used in: * Used in:
* Danish, Dutch, English, German, Norwegian, Swedish, Estonian, Finnish, * Danish, Dutch, English, German, Norwegian, Swedish, Estonian, Finnish,
* Greek, Hebrew, Italian, Portuguese, Spanish, Esperanto */ * Greek, Hebrew, Italian, Portuguese, Spanish, Esperanto */
case 0: case 0:
return n != 1; return n != 1;
/* Only one form /* Only one form.
* Used in: * Used in:
* Hungarian, Japanese, Korean, Turkish */ * Hungarian, Japanese, Korean, Turkish */
case 1: case 1:
return 0; return 0;
/* Two forms, singular used for zero and one /* Two forms: singular used for 0 and 1.
* Used in: * Used in:
* French, Brazilian Portuguese */ * French, Brazilian Portuguese */
case 2: case 2:
return n > 1; return n > 1;
/* Three forms, special case for 0 and ending in 1, except those ending in 11 /* Three forms: special cases for 0, and numbers ending in 1 except when ending in 11.
* Used in: * Used in:
* Latvian */ * Latvian */
case 3: case 3:
return n % 10 == 1 && n % 100 != 11 ? 0 : n != 0 ? 1 : 2; return n % 10 == 1 && n % 100 != 11 ? 0 : n != 0 ? 1 : 2;
/* Five forms, special case for one, two, 3 to 6 and 7 to 10 /* Five forms: special cases for 1, 2, 3 to 6, and 7 to 10.
* Used in: * Used in:
* Gaelige (Irish) */ * Gaelige (Irish) */
case 4: case 4:
return n == 1 ? 0 : n == 2 ? 1 : n < 7 ? 2 : n < 11 ? 3 : 4; return n == 1 ? 0 : n == 2 ? 1 : n < 7 ? 2 : n < 11 ? 3 : 4;
/* Three forms, special case for numbers ending in 1[2-9] /* Three forms: special cases for numbers ending in 1 except when ending in 11, and 2 to 9 except when ending in 12 to 19.
* Used in: * Used in:
* Lithuanian */ * Lithuanian */
case 5: case 5:
return n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2; return n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2;
/* Three forms, special cases for numbers ending in 1 and 2, 3, 4, except those ending in 1[1-4] /* Three forms: special cases for numbers ending in 1 except wehn ending in 11, and 2 to 4 except when ending in 12 to 14.
* Used in: * Used in:
* Croatian, Russian, Ukrainian */ * Croatian, Russian, Ukrainian */
case 6: case 6:
return n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2; return n % 10 == 1 && n % 100 != 11 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2;
/* Three forms, special case for one and some numbers ending in 2, 3, or 4 /* Three forms: special cases for 1, and numbers ending in 2 to 4 except when ending in 12 to 14.
* Used in: * Used in:
* Polish */ * Polish */
case 7: case 7:
return n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2; return n == 1 ? 0 : n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2;
/* Four forms, special case for one and all numbers ending in 02, 03, or 04 /* Four forms: special cases for numbers ending in 01, 02, and 03 to 04.
* Used in: * Used in:
* Slovenian */ * Slovenian */
case 8: case 8:
return n % 100 == 1 ? 0 : n % 100 == 2 ? 1 : n % 100 == 3 || n % 100 == 4 ? 2 : 3; return n % 100 == 1 ? 0 : n % 100 == 2 ? 1 : n % 100 == 3 || n % 100 == 4 ? 2 : 3;
/* Two forms; singular used for everything ending in 1 but not in 11. /* Two forms: singular used for numbers ending in 1 except when ending in 11.
* Used in: * Used in:
* Icelandic */ * Icelandic */
case 9: case 9:
return n % 10 == 1 && n % 100 != 11 ? 0 : 1; return n % 10 == 1 && n % 100 != 11 ? 0 : 1;
/* Three forms, special cases for one and 2, 3, or 4 /* Three forms: special cases for 1, and 2 to 4
* Used in: * Used in:
* Czech, Slovak */ * Czech, Slovak */
case 10: case 10:
return n == 1 ? 0 : n >= 2 && n <= 4 ? 1 : 2; return n == 1 ? 0 : n >= 2 && n <= 4 ? 1 : 2;
/* Two forms, special 'hack' for Korean; singular for numbers ending /* Two forms: cases for numbers ending with a consonant, and with a vowel.
* in a consonant and plural for numbers ending in a vowel.
* Korean doesn't have the concept of plural, but depending on how a * Korean doesn't have the concept of plural, but depending on how a
* number is pronounced it needs another version of a particle. * number is pronounced it needs another version of a particle.
* As such the plural system is misused to give this distinction. * As such the plural system is misused to give this distinction.
@ -562,7 +561,7 @@ static int DeterminePluralForm(int64 count, int plural_form)
NOT_REACHED(); NOT_REACHED();
} }
/* Four forms: one, 0 and everything ending in 02..10, everything ending in 11..19. /* Four forms: special cases for 1, 0 and numbers ending in 02 to 10, and numbers ending in 11 to 19.
* Used in: * Used in:
* Maltese */ * Maltese */
case 12: case 12:

26
src/table/strgen_tables.h
Unescape Escape View File

@ -160,19 +160,19 @@ struct PluralForm {
/** All plural forms used */ /** All plural forms used */
static const PluralForm _plural_forms[] = { static const PluralForm _plural_forms[] = {
{ 2, "Two forms, singular used for 1 only" }, { 2, "Two forms: singular used for 1 only." },
{ 1, "Only one form" }, { 1, "Only one form." },
{ 2, "Two forms, singular used for zero and 1" }, { 2, "Two forms: singular used for 0 and 1." },
{ 3, "Three forms, special case for 0 and ending in 1, except those ending in 11" }, { 3, "Three forms: special cases for 0, and numbers ending in 1 except when ending in 11." },
{ 5, "Five forms, special case for one, two, 3 to 6 and 7 to 10" }, { 5, "Five forms: special cases for 1, 2, 3 to 6, and 7 to 10." },
{ 3, "Three forms, special case for numbers ending in 1[2-9]" }, { 3, "Three forms: special cases for numbers ending in 1 except when ending in 11, and 2 to 9 except when ending in 12 to 19." },
{ 3, "Three forms, special cases for numbers ending in 1 and 2, 3, 4, except those ending in 1[1-4]" }, { 3, "Three forms: special cases for numbers ending in 1 except wehn ending in 11, and 2 to 4 except when ending in 12 to 14." },
{ 3, "Three forms, special case for 1 and some numbers ending in 2, 3, or 4" }, { 3, "Three forms: special cases for 1, and numbers ending in 2 to 4 except when ending in 12 to 14." },
{ 4, "Four forms, special case for 1 and all numbers ending in 02, 03, or 04" }, { 4, "Four forms: special cases for numbers ending in 01, 02, and 03 to 04." },
{ 2, "Two forms, singular used for everything ending in 1 but not in 11" }, { 2, "Two forms: singular used for numbers ending in 1 except when ending in 11." },
{ 3, "Three forms, special case for 1 and 2, 3, or 4" }, { 3, "Three forms: special cases for 1, and 2 to 4." },
{ 2, "Two forms, cases for numbers ending with a consonant and with a vowel" }, { 2, "Two forms: cases for numbers ending with a consonant, and with a vowel." },
{ 4, "Four forms: one, 0 and everything ending in 02..10, everything ending in 11..19" }, { 4, "Four forms: special cases for 1, 0 and numbers ending in 02 to 10, and numbers ending in 11 to 19." },
}; };
/* Flags: /* Flags:

Write Preview
Loading…
Cancel
Save