Italian translations in companion - fix for singular/plural forms in italian
This commit is contained in:
@@ -40,23 +40,23 @@ enum ItalianPrompts {
|
||||
IT_PROMPT_SECONDI,
|
||||
|
||||
IT_PROMPT_UNITS_BASE = 113,
|
||||
IT_PROMPT_VOLTS = IT_PROMPT_UNITS_BASE+UNIT_VOLTS,
|
||||
IT_PROMPT_AMPS = IT_PROMPT_UNITS_BASE+UNIT_AMPS,
|
||||
IT_PROMPT_METERS_PER_SECOND = IT_PROMPT_UNITS_BASE+UNIT_METERS_PER_SECOND,
|
||||
IT_PROMPT_SPARE1 = IT_PROMPT_UNITS_BASE+UNIT_RAW,
|
||||
IT_PROMPT_KMH = IT_PROMPT_UNITS_BASE+UNIT_SPEED,
|
||||
IT_PROMPT_METERS = IT_PROMPT_UNITS_BASE+UNIT_DIST,
|
||||
IT_PROMPT_DEGREES = IT_PROMPT_UNITS_BASE+UNIT_TEMPERATURE,
|
||||
IT_PROMPT_PERCENT = IT_PROMPT_UNITS_BASE+UNIT_PERCENT,
|
||||
IT_PROMPT_MILLIAMPS = IT_PROMPT_UNITS_BASE+UNIT_MILLIAMPS,
|
||||
IT_PROMPT_MAH = IT_PROMPT_UNITS_BASE+UNIT_MAH,
|
||||
IT_PROMPT_WATTS = IT_PROMPT_UNITS_BASE+UNIT_WATTS,
|
||||
IT_PROMPT_FEET = IT_PROMPT_UNITS_BASE+UNIT_FEET,
|
||||
IT_PROMPT_KTS = IT_PROMPT_UNITS_BASE+UNIT_KTS,
|
||||
IT_PROMPT_VOLTS = IT_PROMPT_UNITS_BASE+(UNIT_VOLTS*2),
|
||||
IT_PROMPT_AMPS = IT_PROMPT_UNITS_BASE+(UNIT_AMPS*2),
|
||||
IT_PROMPT_METERS_PER_SECOND = IT_PROMPT_UNITS_BASE+(UNIT_METERS_PER_SECOND*2),
|
||||
IT_PROMPT_SPARE1 = IT_PROMPT_UNITS_BASE+(UNIT_RAW*2),
|
||||
IT_PROMPT_KMH = IT_PROMPT_UNITS_BASE+(UNIT_SPEED*2),
|
||||
IT_PROMPT_METERS = IT_PROMPT_UNITS_BASE+(UNIT_DIST*2),
|
||||
IT_PROMPT_DEGREES = IT_PROMPT_UNITS_BASE+(UNIT_TEMPERATURE*2),
|
||||
IT_PROMPT_PERCENT = IT_PROMPT_UNITS_BASE+(UNIT_PERCENT*2),
|
||||
IT_PROMPT_MILLIAMPS = IT_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2),
|
||||
IT_PROMPT_MAH = IT_PROMPT_UNITS_BASE+(UNIT_MAH*2),
|
||||
IT_PROMPT_WATTS = IT_PROMPT_UNITS_BASE+(UNIT_WATTS*2),
|
||||
IT_PROMPT_FEET = IT_PROMPT_UNITS_BASE+(UNIT_FEET*2),
|
||||
IT_PROMPT_KTS = IT_PROMPT_UNITS_BASE+(UNIT_KTS*2),
|
||||
#if defined(CPUARM)
|
||||
IT_PROMPT_MILLILITERS = IT_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
|
||||
IT_PROMPT_FLOZ = IT_PROMPT_UNITS_BASE+UNIT_FLOZ,
|
||||
IT_PROMPT_FEET_PER_SECOND = IT_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
|
||||
IT_PROMPT_MILLILITERS = IT_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2),
|
||||
IT_PROMPT_FLOZ = IT_PROMPT_UNITS_BASE+(UNIT_FLOZ*2),
|
||||
IT_PROMPT_FEET_PER_SECOND = IT_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*2),
|
||||
#endif
|
||||
|
||||
};
|
||||
@@ -114,11 +114,18 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
PLAY_NUMBER(qr.rem, unit, 0);
|
||||
}
|
||||
else {
|
||||
PLAY_NUMBER(qr.quot, unit, 0);
|
||||
if (qr.quot==1) {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UN);
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UNITS_BASE+(unit*2));
|
||||
}
|
||||
} else {
|
||||
PLAY_NUMBER(qr.quot, unit, 0);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (number >= 1000) {
|
||||
if (number >= 2000) {
|
||||
PLAY_NUMBER(number / 1000, 0, 0);
|
||||
@@ -141,7 +148,7 @@ I18N_PLAY_FUNCTION(it, playNumber, getvalue_t number, uint8_t unit, uint8_t att)
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_ZERO+number);
|
||||
|
||||
if (unit) {
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UNITS_BASE+unit-1);
|
||||
PUSH_NUMBER_PROMPT(IT_PROMPT_UNITS_BASE+(unit*2)+1);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user