diff --git a/phpBB/language/lang_spanish/lang_main.php b/phpBB/language/lang_spanish/lang_main.php
index 79f9c1625f..7db4b28d5a 100644
--- a/phpBB/language/lang_spanish/lang_main.php
+++ b/phpBB/language/lang_spanish/lang_main.php
@@ -936,47 +936,44 @@ $lang['tz']['10'] = "(GMT +10:00 horas) Canberra, Guam, Melbourne, Sydney, Vladi
 $lang['tz']['11'] = "(GMT +11:00 horas) Magadan, New Caledonia, Solomon Islands";
 $lang['tz']['12'] = "(GMT +12:00 horas) Auckland, Wellington, Fiji, Marshall Island";
 
-$lang['days_long'][0] = "Domingo";
-$lang['days_long'][1] = "Lunes";
-$lang['days_long'][2] = "Martes";
-$lang['days_long'][3] = "Miércoles";
-$lang['days_long'][4] = "Jueves";
-$lang['days_long'][5] = "Viernes";
-$lang['days_long'][6] = "Sábado";
-
-$lang['days_short'][0] = "Dom";
-$lang['days_short'][1] = "Lun";
-$lang['days_short'][2] = "Mar";
-$lang['days_short'][3] = "Mie";
-$lang['days_short'][4] = "Jue";
-$lang['days_short'][5] = "Vie";
-$lang['days_short'][6] = "Sab";
-
-$lang['months_long'][0] = "Enero";
-$lang['months_long'][1] = "Febrero";
-$lang['months_long'][2] = "Marzo";
-$lang['months_long'][3] = "Abril";
-$lang['months_long'][4] = "Mayo";
-$lang['months_long'][5] = "Junio";
-$lang['months_long'][6] = "Julio";
-$lang['months_long'][7] = "Agosto";
-$lang['months_long'][8] = "Setiembre";
-$lang['months_long'][9] = "Octubre";
-$lang['months_long'][10] = "Noviembre";
-$lang['months_long'][11] = "Diciembre";
-
-$lang['months_short'][0] = "Ene";
-$lang['months_short'][1] = "Feb";
-$lang['months_short'][2] = "Mar";
-$lang['months_short'][3] = "Abr";
-$lang['months_short'][4] = "May";
-$lang['months_short'][5] = "Jun";
-$lang['months_short'][6] = "Jul";
-$lang['months_short'][7] = "Ago";
-$lang['months_short'][8] = "Set";
-$lang['months_short'][9] = "Oct";
-$lang['months_short'][10] = "Nov";
-$lang['months_short'][11] = "Dic";
+$lang['datetime']['Sunday'] = "Domingo";
+$lang['datetime']['Monday'] = "Lunes";
+$lang['datetime']['Tuesday'] = "Martes";
+$lang['datetime']['Wednesday'] = "Miércoles";
+$lang['datetime']['Thursday'] = "Jueves";
+$lang['datetime']['Friday'] = "Viernes";
+$lang['datetime']['Saturday'] = "Sábado";
+$lang['datetime']['Sun'] = "Dom";
+$lang['datetime']['Mon'] = "Lun";
+$lang['datetime']['Tue'] = "Mar";
+$lang['datetime']['Wed'] = "Mie";
+$lang['datetime']['Thu'] = "Jue";
+$lang['datetime']['Fri'] = "Vie";
+$lang['datetime']['Sat'] = "Sab";
+$lang['datetime']['January'] = "Enero";
+$lang['datetime']['February'] = "Febrero";
+$lang['datetime']['March'] = "Marzo";
+$lang['datetime']['April'] = "Abril";
+$lang['datetime']['May'] = "Mayo";
+$lang['datetime']['June'] = "Junio";
+$lang['datetime']['July'] = "Julio";
+$lang['datetime']['August'] = "Augosto";
+$lang['datetime']['September'] = "Septiembre";
+$lang['datetime']['October'] = "Octubre";
+$lang['datetime']['November'] = "Noviembre";
+$lang['datetime']['December'] = "Diciembre";
+$lang['datetime']['Jan'] = "Ene";
+$lang['datetime']['Feb'] = "Feb";
+$lang['datetime']['Mar'] = "Mar";
+$lang['datetime']['Apr'] = "Abr";
+$lang['datetime']['May'] = "May";
+$lang['datetime']['Jun'] = "Jun";
+$lang['datetime']['Jul'] = "Jul";
+$lang['datetime']['Aug'] = "Ago";
+$lang['datetime']['Sep'] = "Sep";
+$lang['datetime']['Oct'] = "Oct";
+$lang['datetime']['Nov'] = "Nov";
+$lang['datetime']['Dec'] = "Dic";
 
 //
 // Errores (no relacionados con una falla específica en