From 80e2827db1f7583b1856d4d1accf78a3337c82c5 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Jun 2009 14:50:22 +0000 Subject: [PATCH] Trad: Now date format is stored in language files. --- htdocs/langs/ca_ES/main.lang | 2 +- htdocs/langs/en_AU/main.lang | 2 +- htdocs/langs/en_GB/main.lang | 2 +- htdocs/langs/en_US/main.lang | 2 +- htdocs/langs/es_ES/main.lang | 2 +- htdocs/langs/fi_FI/main.lang | 2 +- htdocs/langs/fr_BE/main.lang | 2 +- htdocs/langs/fr_CA/main.lang | 2 +- htdocs/langs/fr_CH/main.lang | 2 +- htdocs/langs/fr_FR/main.lang | 2 +- htdocs/langs/it_IT/main.lang | 2 +- htdocs/langs/nb_NO/main.lang | 2 +- htdocs/langs/nl_BE/main.lang | 2 +- htdocs/langs/nl_NL/main.lang | 2 +- htdocs/langs/pl_PL/main.lang | 2 +- htdocs/langs/pt_PT/main.lang | 2 +- htdocs/langs/ro_RO/main.lang | 2 +- htdocs/langs/ru_RU/main.lang | 2 +- htdocs/translate.class.php | 4 ++-- 19 files changed, 20 insertions(+), 20 deletions(-) diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang index bf5baffbb0f..9ab3d12454f 100644 --- a/htdocs/langs/ca_ES/main.lang +++ b/htdocs/langs/ca_ES/main.lang @@ -3,7 +3,7 @@ CHARSET = UTF-8 SeparatorDecimal = , SeparatorThousand = FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang index 8dc1c921b50..02b689c7c47 100644 --- a/htdocs/langs/en_AU/main.lang +++ b/htdocs/langs/en_AU/main.lang @@ -4,7 +4,7 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang index 9f9ad2eab89..531d80748dd 100644 --- a/htdocs/langs/en_GB/main.lang +++ b/htdocs/langs/en_GB/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 3c923062f01..4275fab4854 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=. SeparatorThousand=, FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%I:%M %p FormatDateTextShort=%b %d, %Y FormatDateText=%B %d, %Y diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 213f9792cbc..dda70b717f6 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -3,7 +3,7 @@ CHARSET = UTF-8 SeparatorDecimal = , SeparatorThousand = FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang index 8f9cbf5028e..977e23c9daf 100644 --- a/htdocs/langs/fi_FI/main.lang +++ b/htdocs/langs/fi_FI/main.lang @@ -11,7 +11,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y -FormatDateShort_java=dd.MM.yyyy +FormatDateShortJava=dd.MM.yyyy FormatHourShort=%H.%M FormatDateTextShort=%d. %b %Y FormatDateText=%d. %B %Y diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang index 2845f793fa9..3a222bdd6b9 100644 --- a/htdocs/langs/fr_BE/main.lang +++ b/htdocs/langs/fr_BE/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang index 292e5dad3f2..3cd76162e3d 100644 --- a/htdocs/langs/fr_CA/main.lang +++ b/htdocs/langs/fr_CA/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y -FormatDateShort_java=dd.MM.yyyy +FormatDateShortJava=dd.MM.yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang index 2baceb389e4..dbe4956c684 100644 --- a/htdocs/langs/fr_CH/main.lang +++ b/htdocs/langs/fr_CH/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y -FormatDateShort_java=dd-MM-yyyy +FormatDateShortJava=dd-MM-yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index 20df8a8b43d..80d13db9839 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang index 407cf4c9c2b..0818b414534 100644 --- a/htdocs/langs/it_IT/main.lang +++ b/htdocs/langs/it_IT/main.lang @@ -3,7 +3,7 @@ CHARSET =ISO-8859-1 SeparatorDecimal =, SeparatorThousand = FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H.%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang index 8b9023d67ff..fe297a5b768 100644 --- a/htdocs/langs/nb_NO/main.lang +++ b/htdocs/langs/nb_NO/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y -FormatDateShort_java=dd.MM.yyyy +FormatDateShortJava=dd.MM.yyyy FormatHourShort=%H.%M FormatDateTextShort=%d. %b %Y FormatDateText=%d. %B %Y diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang index c117cf3f1cf..d1572b37abb 100644 --- a/htdocs/langs/nl_BE/main.lang +++ b/htdocs/langs/nl_BE/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang index 3f4386b3dbe..9ebbc3a95f3 100644 --- a/htdocs/langs/nl_NL/main.lang +++ b/htdocs/langs/nl_NL/main.lang @@ -13,7 +13,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y -FormatDateShort_java=dd-MM-yyyy +FormatDateShortJava=dd-MM-yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang index 1fb924568cd..eacc62edb37 100644 --- a/htdocs/langs/pl_PL/main.lang +++ b/htdocs/langs/pl_PL/main.lang @@ -13,7 +13,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d-%m-%Y -FormatDateShort_java=dd-MM-yyyy +FormatDateShortJava=dd-MM-yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang index 90420ec5abf..615e2ddfa10 100644 --- a/htdocs/langs/pt_PT/main.lang +++ b/htdocs/langs/pt_PT/main.lang @@ -3,7 +3,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d/%m/%Y -FormatDateShort_java=dd/MM/yyyy +FormatDateShortJava=dd/MM/yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang index 33269ffcc4e..6a850d791df 100644 --- a/htdocs/langs/ro_RO/main.lang +++ b/htdocs/langs/ro_RO/main.lang @@ -11,7 +11,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y -FormatDateShort_java=dd.MM.yyyy +FormatDateShortJava=dd.MM.yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang index c571b4714bd..c0e57c305da 100644 --- a/htdocs/langs/ru_RU/main.lang +++ b/htdocs/langs/ru_RU/main.lang @@ -11,7 +11,7 @@ CHARSET=UTF-8 SeparatorDecimal=, SeparatorThousand= FormatDateShort=%d.%m.%Y -FormatDateShort_java=dd.MM.yyyy +FormatDateShortJava=dd.MM.yyyy FormatHourShort=%H:%M FormatDateTextShort=%d %b %Y FormatDateText=%d %B %Y diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php index 5f6bcdcc003..3f9bd3f9e63 100644 --- a/htdocs/translate.class.php +++ b/htdocs/translate.class.php @@ -290,8 +290,8 @@ class Translate { // Format for date if ($domain == 'main') { - $conf->format_date_short=empty($this->tab_translate['FormatDateShort'])?"%d/%m/%Y":$this->tab_translate['FormatDateShort']; # Format of day with PHP/C tags (strftime functions) - $conf->format_date_short_java=empty($this->tab_translate['FormatDateShort'])?"dd/MM/yyyy":$this->tab_translate['FormatDateShort']; # Format of day with Java tags + $conf->format_date_short=empty($this->tab_translate['FormatDateShort'])?"%d/%m/%Y":$this->tab_translate['FormatDateShort']; # Format of day with PHP/C tags (strftime functions) + $conf->format_date_short_java=empty($this->tab_translate['FormatDateShortJava'])?"dd/MM/yyyy":$this->tab_translate['FormatDateShortJava']; # Format of day with Java tags $conf->format_hour_short=empty($this->tab_translate['FormatHourShort'])?"%H:%M":$this->tab_translate['FormatHourShort']; $conf->format_date_text_short=empty($this->tab_translate['FormatDateTextShort'])?"%d %b %Y":$this->tab_translate['FormatDateTextShort']; $conf->format_date_text=empty($this->tab_translate['FormatDateText'])?"%d %B %Y":$this->tab_translate['FormatDateText'];