mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14791) -Add: the ability to make ISO dates with the string system (PhilSophus)

release/0.7
rubidium 2009-01-03 00:56:16 +00:00
parent 3a0d966ae4
commit aff7feb767
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lang/english.txt
View File

@ -3504,6 +3504,7 @@ STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Area: {N
STR_DATE_TINY :{RAW_STRING}-{RAW_STRING}-{NUM} STR_DATE_TINY :{RAW_STRING}-{RAW_STRING}-{NUM}
STR_DATE_SHORT :{STRING} {NUM} STR_DATE_SHORT :{STRING} {NUM}
STR_DATE_LONG :{STRING} {STRING} {NUM} STR_DATE_LONG :{STRING} {STRING} {NUM}
STR_DATE_ISO :{2:NUM}-{1:RAW_STRING}-{0:RAW_STRING}
######## ########

1
src/strgen/strgen.cpp
View File

@ -479,6 +479,7 @@ static const CmdStruct _cmd_structs[] = {
{"DATE_TINY", EmitSingleChar, SCC_DATE_TINY, 1, 0}, {"DATE_TINY", EmitSingleChar, SCC_DATE_TINY, 1, 0},
{"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, 0}, {"DATE_SHORT", EmitSingleChar, SCC_DATE_SHORT, 1, 0},
{"DATE_LONG", EmitSingleChar, SCC_DATE_LONG, 1, 0}, {"DATE_LONG", EmitSingleChar, SCC_DATE_LONG, 1, 0},
{"DATE_ISO", EmitSingleChar, SCC_DATE_ISO, 1, 0},
{"SKIP", EmitSingleChar, SCC_SKIP, 1, 0}, {"SKIP", EmitSingleChar, SCC_SKIP, 1, 0},

11
src/strings.cpp
View File

@ -284,7 +284,7 @@ static char *FormatMonthAndYear(char *buff, Date date, const char *last)
return FormatString(buff, GetStringPtr(STR_DATE_SHORT), args, 0, last); return FormatString(buff, GetStringPtr(STR_DATE_SHORT), args, 0, last);
} }
static char *FormatTinyDate(char *buff, Date date, const char *last) static char *FormatTinyOrISODate(char *buff, Date date, StringID str, const char *last)
{ {
YearMonthDay ymd; YearMonthDay ymd;
ConvertDateToYMD(date, &ymd); ConvertDateToYMD(date, &ymd);
@ -296,7 +296,7 @@ static char *FormatTinyDate(char *buff, Date date, const char *last)
snprintf(month, lengthof(month), "%02i", ymd.month + 1); snprintf(month, lengthof(month), "%02i", ymd.month + 1);
int64 args[3] = { (int64)(size_t)day, (int64)(size_t)month, ymd.year }; int64 args[3] = { (int64)(size_t)day, (int64)(size_t)month, ymd.year };
return FormatString(buff, GetStringPtr(STR_DATE_TINY), args, 0, last); return FormatString(buff, GetStringPtr(str), args, 0, last);
} }
static char *FormatGenericCurrency(char *buff, const CurrencySpec *spec, Money number, bool compact, const char *last) static char *FormatGenericCurrency(char *buff, const CurrencySpec *spec, Money number, bool compact, const char *last)
@ -714,7 +714,12 @@ static char *FormatString(char *buff, const char *str, const int64 *argv, uint c
} }
case SCC_DATE_TINY: { // {DATE_TINY} case SCC_DATE_TINY: { // {DATE_TINY}
buff = FormatTinyDate(buff, GetInt32(&argv), last); buff = FormatTinyOrISODate(buff, GetInt32(&argv), STR_DATE_TINY, last);
break;
}
case SCC_DATE_ISO: { // {DATE_ISO}
buff = FormatTinyOrISODate(buff, GetInt32(&argv), STR_DATE_ISO, last);
break; break;
} }

1
src/table/control_codes.h
View File

@ -53,6 +53,7 @@ enum StringControlCode {
SCC_DATE_TINY, SCC_DATE_TINY,
SCC_DATE_SHORT, SCC_DATE_SHORT,
SCC_DATE_LONG, SCC_DATE_LONG,
SCC_DATE_ISO,
SCC_STRING1, SCC_STRING1,
SCC_STRING2, SCC_STRING2,