fs6047.diff

Return to the initial folder
  1. diff --git a/src/date_gui.cpp b/src/date_gui.cpp
  2. --- a/src/date_gui.cpp
  3. +++ b/src/date_gui.cpp
  4. @@ -75,7 +75,7 @@ struct SetDateWindow : Window {
  5.  
  6.  			case WID_SD_DAY:
  7.  				for (uint i = 0; i < 31; i++) {
  8. -					*list->Append() = new DropDownListStringItem(STR_ORDINAL_NUMBER_1ST + i, i + 1, false);
  9. +					*list->Append() = new DropDownListStringItem(STR_DAY_NUMBER_1ST + i, i + 1, false);
  10.  				}
  11.  				selected = this->date.day;
  12.  				break;
  13. @@ -108,7 +108,7 @@ struct SetDateWindow : Window {
  14.  
  15.  			case WID_SD_DAY:
  16.  				for (uint i = 0; i < 31; i++) {
  17. -					d = maxdim(d, GetStringBoundingBox(STR_ORDINAL_NUMBER_1ST + i));
  18. +					d = maxdim(d, GetStringBoundingBox(STR_DAY_NUMBER_1ST + i));
  19.  				}
  20.  				break;
  21.  
  22. @@ -132,7 +132,7 @@ struct SetDateWindow : Window {
  23.  	virtual void SetStringParameters(int widget) const
  24.  	{
  25.  		switch (widget) {
  26. -			case WID_SD_DAY:   SetDParam(0, this->date.day - 1 + STR_ORDINAL_NUMBER_1ST); break;
  27. +			case WID_SD_DAY:   SetDParam(0, this->date.day - 1 + STR_DAY_NUMBER_1ST); break;
  28.  			case WID_SD_MONTH: SetDParam(0, this->date.month + STR_MONTH_JAN); break;
  29.  			case WID_SD_YEAR:  SetDParam(0, this->date.year); break;
  30.  		}
  31. diff --git a/src/lang/english.txt b/src/lang/english.txt
  32. --- a/src/lang/english.txt
  33. +++ b/src/lang/english.txt
  34. @@ -470,7 +470,7 @@ STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES    
  35.  STR_ABOUT_MENU_TOGGLE_DIRTY_BLOCKS                              :Toggle colouring of dirty blocks
  36.  ############ range ends here
  37.  
  38. -############ range for days starts (also used for the place in the highscore window)
  39. +############ range for ordinal numbers used for the place in the highscore window
  40.  STR_ORDINAL_NUMBER_1ST                                          :1st
  41.  STR_ORDINAL_NUMBER_2ND                                          :2nd
  42.  STR_ORDINAL_NUMBER_3RD                                          :3rd
  43. @@ -486,22 +486,39 @@ STR_ORDINAL_NUMBER_12TH                 
  44.  STR_ORDINAL_NUMBER_13TH                                         :13th
  45.  STR_ORDINAL_NUMBER_14TH                                         :14th
  46.  STR_ORDINAL_NUMBER_15TH                                         :15th
  47. -STR_ORDINAL_NUMBER_16TH                                         :16th
  48. -STR_ORDINAL_NUMBER_17TH                                         :17th
  49. -STR_ORDINAL_NUMBER_18TH                                         :18th
  50. -STR_ORDINAL_NUMBER_19TH                                         :19th
  51. -STR_ORDINAL_NUMBER_20TH                                         :20th
  52. -STR_ORDINAL_NUMBER_21ST                                         :21st
  53. -STR_ORDINAL_NUMBER_22ND                                         :22nd
  54. -STR_ORDINAL_NUMBER_23RD                                         :23rd
  55. -STR_ORDINAL_NUMBER_24TH                                         :24th
  56. -STR_ORDINAL_NUMBER_25TH                                         :25th
  57. -STR_ORDINAL_NUMBER_26TH                                         :26th
  58. -STR_ORDINAL_NUMBER_27TH                                         :27th
  59. -STR_ORDINAL_NUMBER_28TH                                         :28th
  60. -STR_ORDINAL_NUMBER_29TH                                         :29th
  61. -STR_ORDINAL_NUMBER_30TH                                         :30th
  62. -STR_ORDINAL_NUMBER_31ST                                         :31st
  63. +
  64. +############ range for days starts
  65. +STR_DAY_NUMBER_1ST                                          :1st
  66. +STR_DAY_NUMBER_2ND                                          :2nd
  67. +STR_DAY_NUMBER_3RD                                          :3rd
  68. +STR_DAY_NUMBER_4TH                                          :4th
  69. +STR_DAY_NUMBER_5TH                                          :5th
  70. +STR_DAY_NUMBER_6TH                                          :6th
  71. +STR_DAY_NUMBER_7TH                                          :7th
  72. +STR_DAY_NUMBER_8TH                                          :8th
  73. +STR_DAY_NUMBER_9TH                                          :9th
  74. +STR_DAY_NUMBER_10TH                                         :10th
  75. +STR_DAY_NUMBER_11TH                                         :11th
  76. +STR_DAY_NUMBER_12TH                                         :12th
  77. +STR_DAY_NUMBER_13TH                                         :13th
  78. +STR_DAY_NUMBER_14TH                                         :14th
  79. +STR_DAY_NUMBER_15TH                                         :15th
  80. +STR_DAY_NUMBER_16TH                                         :16th
  81. +STR_DAY_NUMBER_17TH                                         :17th
  82. +STR_DAY_NUMBER_18TH                                         :18th
  83. +STR_DAY_NUMBER_19TH                                         :19th
  84. +STR_DAY_NUMBER_20TH                                         :20th
  85. +STR_DAY_NUMBER_21ST                                         :21st
  86. +STR_DAY_NUMBER_22ND                                         :22nd
  87. +STR_DAY_NUMBER_23RD                                         :23rd
  88. +STR_DAY_NUMBER_24TH                                         :24th
  89. +STR_DAY_NUMBER_25TH                                         :25th
  90. +STR_DAY_NUMBER_26TH                                         :26th
  91. +STR_DAY_NUMBER_27TH                                         :27th
  92. +STR_DAY_NUMBER_28TH                                         :28th
  93. +STR_DAY_NUMBER_29TH                                         :29th
  94. +STR_DAY_NUMBER_30TH                                         :30th
  95. +STR_DAY_NUMBER_31ST                                         :31st
  96.  ############ range for days ends
  97.  
  98.  ############ range for months starts
  99. diff --git a/src/strings.cpp b/src/strings.cpp
  100. --- a/src/strings.cpp
  101. +++ b/src/strings.cpp
  102. @@ -409,7 +409,7 @@ static char *FormatYmdString(char *buff,
  103.  	YearMonthDay ymd;
  104.  	ConvertDateToYMD(date, &ymd);
  105.  
  106. -	int64 args[] = {ymd.day + STR_ORDINAL_NUMBER_1ST - 1, STR_MONTH_ABBREV_JAN + ymd.month, ymd.year};
  107. +	int64 args[] = {ymd.day + STR_DAY_NUMBER_1ST - 1, STR_MONTH_ABBREV_JAN + ymd.month, ymd.year};
  108.  	StringParameters tmp_params(args);
  109.  	return FormatString(buff, GetStringPtr(STR_FORMAT_DATE_LONG), &tmp_params, last, case_index);
  110.  }
  111.  

Return to top