cpp/openttd-patchpack/source Changeset - r10534:d6624b9bdf98

Changeset - r10534:d6624b9bdf98

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

rubidium - 15 years ago 2009-01-03 00:56:16
rubidium@openttd.org

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

4 files changed with 11 insertions and 3 deletions:

src/lang/english.txt

src/strgen/strgen.cpp

src/strings.cpp

src/table/control_codes.h

0 comments (0 inline, 0 general)

src/lang/english.txt

➞

Show inline comments

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

src/strgen/strgen.cpp

➞

Show inline comments

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

src/strings.cpp

➞

Show inline comments

@@ @@ -284,7 +284,7 @@ static char *FormatMonthAndYear(char *bu @@
 	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;
 	ConvertDateToYMD(date, &ymd);
@@ @@ -296,7 +296,7 @@ static char *FormatTinyDate(char *buff, @@
 	snprintf(month, lengthof(month), "%02i", ymd.month + 1);
 	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)
@@ @@ -714,7 +714,12 @@ static char *FormatString(char *buff, co @@
+			}
 			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;
+			}

src/table/control_codes.h

➞

Show inline comments

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

0 comments (0 inline, 0 general)