From 8bb947486af87e15ba00b9b546a1d112fe50fcb5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 14 Jun 2009 17:26:56 +0000
Subject: [PATCH] New: Format of dates depends on language

---
 htdocs/langs/ca_ES/main.lang |  8 ++++++++
 htdocs/langs/en_AU/main.lang |  8 ++++++++
 htdocs/langs/en_GB/main.lang | 12 ++++++++++++
 htdocs/langs/en_US/main.lang |  8 ++++++++
 htdocs/langs/es_ES/main.lang |  8 ++++++++
 htdocs/langs/fi_FI/main.lang | 13 ++++++++++---
 htdocs/langs/fr_BE/main.lang | 10 +++++++++-
 htdocs/langs/fr_CA/main.lang | 12 ++++++++++++
 htdocs/langs/fr_CH/main.lang | 12 ++++++++++++
 htdocs/langs/fr_FR/main.lang |  2 +-
 htdocs/langs/it_IT/main.lang |  8 ++++++++
 htdocs/langs/nb_NO/main.lang | 12 ++++++++++--
 htdocs/langs/nl_BE/main.lang |  8 ++++++++
 htdocs/langs/nl_NL/main.lang |  9 ++++++++-
 htdocs/langs/pl_PL/main.lang |  9 ++++++++-
 htdocs/langs/pt_PT/main.lang |  8 ++++++++
 htdocs/langs/ro_RO/main.lang |  9 ++++++++-
 htdocs/langs/ru_RU/main.lang |  9 ++++++++-
 htdocs/translate.class.php   | 17 +++++++++--------
 19 files changed, 163 insertions(+), 19 deletions(-)
 create mode 100644 htdocs/langs/en_GB/main.lang
 create mode 100644 htdocs/langs/fr_CA/main.lang
 create mode 100644 htdocs/langs/fr_CH/main.lang

diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index e10113f2cda..103e156475e 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -2,6 +2,14 @@
 CHARSET = UTF-8
 SeparatorDecimal = ,
 SeparatorThousand = 
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection = Connexió a la base de dades
 Error = Error
 ErrorFieldRequired = El camp '%s' és obligatori
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index 1f17caf242e..877f2931d7b 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -3,6 +3,14 @@
 CHARSET=UTF-8
 SeparatorDecimal=.
 SeparatorThousand=,
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 UnitPrice=Unit price
 UnitPriceHT=Unit price (excl GST)
 UnitPriceTTC=Unit price
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
new file mode 100644
index 00000000000..129985adb7e
--- /dev/null
+++ b/htdocs/langs/en_GB/main.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - en_GB - main
+CHARSET=UTF-8
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 1077b3bcaac..cbb7a41b862 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -2,6 +2,14 @@
 CHARSET=UTF-8
 SeparatorDecimal=.
 SeparatorThousand=,
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%I:%M %p
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourTextShort=%b %d, %Y, %I:%M %p
+FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Database connection
 Error=Error
 ErrorFieldRequired=Field '%s' is required
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index 42fa2afb9f3..042f9d46426 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -2,6 +2,14 @@
 CHARSET = UTF-8
 SeparatorDecimal = ,
 SeparatorThousand = 
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection = Conexión a la base de datos
 Error = Error
 ErrorFieldRequired = El campo '%s' es obligatorio
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index f45108de53f..c57b531adbf 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -4,13 +4,20 @@
  * Generation date 2009-01-19 22:07:11
  */
 
-
 // Date 2009-01-19 22:07:11
 // START - Lines generated via autotranslator.php tool.
 // Reference language: en_US
 CHARSET=UTF-8
-SeparatorDecimal=.
-SeparatorThousand= 
+SeparatorDecimal=,
+SeparatorThousand=
+FormatDateShort=%d.%m.%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd.MM.yyyy		# Format of day with Java tags
+FormatHourShort=%H.%M
+FormatDateTextShort=%d. %b %Y
+FormatDateText=%d. %B %Y
+FormatDateHourShort=%d.%m.%Y %H.%M
+FormatDateHourTextShort=%d. %b %Y %H.%M
+FormatDateHourText=%d. %B %Y %H.%M
 DatabaseConnection=Tietokannan yhteydessä
 Error=Virhe
 ErrorFieldRequired=Kenttä &#39;% s&#39; on
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 8f3eb5bd741..fdd3457d9ee 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -1,4 +1,12 @@
 # Dolibarr language file - fr_BE - main
 CHARSET=UTF-8
 SeparatorDecimal=,
-SeparatorThousand=
\ No newline at end of file
+SeparatorThousand=
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
new file mode 100644
index 00000000000..adde4f6d991
--- /dev/null
+++ b/htdocs/langs/fr_CA/main.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - fr_CA - main
+CHARSET=UTF-8
+SeparatorDecimal=,
+SeparatorThousand= 
+FormatDateShort=%d.%m.%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd.MM.yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d.%m.%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
\ No newline at end of file
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
new file mode 100644
index 00000000000..cb388065651
--- /dev/null
+++ b/htdocs/langs/fr_CH/main.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - fr_CH - main
+CHARSET=UTF-8
+SeparatorDecimal=,
+SeparatorThousand= 
+FormatDateShort=%d-%m-%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd-MM-yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d-%m-%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 7dd3216bb37..5c4ffb994fa 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			# Format of day with PHP/C tags (strftime functions)
-FormatDateShort_java=dd/MM/yyyy	# Format of day with Java tags
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
 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 e70bdf9e533..9179426c69b 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -2,6 +2,14 @@
 CHARSET							   =ISO-8859-1
 SeparatorDecimal					   =,
 SeparatorThousand					   =
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H.%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H.%M
+FormatDateHourTextShort=%d %b %Y %H.%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection					   =Connessione al database
 Error							   =Errore
 ErrorFieldRequired					   =Il campo '%s' � necessaria
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index eeacb51c2a1..9f5f0a154ff 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -1,8 +1,16 @@
 # Dolibarr language file - no_NB - main
 CHARSET=UTF-8
+SeparatorDecimal=,
+SeparatorThousand=
+FormatDateShort=%d.%m.%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd.MM.yyyy		# Format of day with Java tags
+FormatHourShort=%H.%M
+FormatDateTextShort=%d. %b %Y
+FormatDateText=%d. %B %Y
+FormatDateHourShort=%d.%m.%Y %H:%M
+FormatDateHourTextShort=%d. %b %Y %H:%M
+FormatDateHourText=%d. %B %Y %H:%M
 DatabaseConnection=Databasetilkobling
-SeparatorDecimal=.
-SeparatorThousand=,
 Error=Feil
 ErrorFieldRequired=Feltet '%s' er påkrevet
 ErrorFieldFormat=Feltet '%s' har ugyldig verdi
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index e86728a9296..9133223bbbd 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -2,6 +2,14 @@
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 Error=Fout
 ErrorForbidden=Toegang verboden
 ErrorFileDoesNotExists=Bestand %s bestaat niet
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 68794e19d8d..7b31e5c0bdb 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -6,13 +6,20 @@
  * Generation date 2009-01-19 00:04:30
  */
 
-
 // Date 2009-01-19 00:04:30
 // START - Lines generated via autotranslator.php tool.
 // Reference language: en_US
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
+FormatDateShort=%d-%m-%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd-MM-yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d-%m-%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Database connectie
 Error=Fout
 ErrorFieldRequired=Veld &#39;% s&#39; is vereist
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 80e3e48a756..3c3417cb051 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -6,13 +6,20 @@
  * Generation date 2009-01-19 00:44:06
  */
 
-
 // Date 2009-01-19 00:44:06
 // START - Lines generated via autotranslator.php tool.
 // Reference language: en_US
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
+FormatDateShort=%d-%m-%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd-MM-yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d-%m-%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Połączenia z bazą danych
 Error=Błąd
 ErrorFieldRequired=Pole &#39;% s&#39; jest wymagane
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index cb3b8d3a9b9..c19acf1e334 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -2,6 +2,14 @@
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
+FormatDateShort=%d/%m/%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd/MM/yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d/%m/%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Ligação à Base de Dados
 Error=Erro
 ErrorFieldRequired=O campo '%s' é obrigatório
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index eb606a0f774..afcf8d5bbae 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -4,13 +4,20 @@
  * Generation date 2009-01-19 21:32:52
  */
 
-
 // Date 2009-01-19 21:32:52
 // START - Lines generated via autotranslator.php tool.
 // Reference language: en_US
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
+FormatDateShort=%d.%m.%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd.MM.yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d.%m.%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Baza de date de conectare
 Error=Eroare
 ErrorFieldRequired=Câmp &quot;% s&quot; este necesar
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 965347320e9..e615b49a8fd 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -4,13 +4,20 @@
  * Generation date 2009-01-19 21:30:52
  */
 
-
 // Date 2009-01-19 21:30:52
 // START - Lines generated via autotranslator.php tool.
 // Reference language: en_US
 CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
+FormatDateShort=%d.%m.%Y			# Format of day with PHP/C tags (strftime functions)
+FormatDateShort_java=dd.MM.yyyy		# Format of day with Java tags
+FormatHourShort=%H:%M
+FormatDateTextShort=%d %b %Y
+FormatDateText=%d %B %Y
+FormatDateHourShort=%d.%m.%Y %H:%M
+FormatDateHourTextShort=%d %b %Y %H:%M
+FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Подключение к базе данных
 Error=Ошибка
 ErrorFieldRequired=Поле &#39;% S&#39; требуется
diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php
index e410a7ec107..5f6bcdcc003 100644
--- a/htdocs/translate.class.php
+++ b/htdocs/translate.class.php
@@ -290,14 +290,15 @@ class Translate {
 		// Format for date
 		if ($domain == 'main')
 		{
-			$this->format_date_short=empty($this->tab_translate['FormatDateShort'])?"%d/%m/%Y":$this->tab_translate['FormatDateShort'];			# Format of day with PHP/C tags (strftime functions)
-			$this->format_date_short_java=empty($this->tab_translate['FormatDateShort'])?"dd/MM/yyyy":$this->tab_translate['FormatDateShort'];		# Format of day with Java tags
-			$this->format_hour_short=empty($this->tab_translate['FormatHourShort'])?"%H:%M":$this->tab_translate['FormatHourShort'];
-			$this->format_date_text_short=empty($this->tab_translate['FormatDateTextShort'])?"%d %b %Y":$this->tab_translate['FormatDateTextShort'];
-			$this->format_date_text=empty($this->tab_translate['FormatDateText'])?"%d %B %Y":$this->tab_translate['FormatDateText'];
-			$this->format_date_hour_short=empty($this->tab_translate['FormatDateHourShort'])?"%d/%m/%Y %H:%M":$this->tab_translate['FormatDateHourShort'];
-			$this->format_date_hour_text_short=empty($this->tab_translate['FormatDateHourTextShort'])?"%d %b %Y %H:%M":$this->tab_translate['FormatDateHourTextShort'];
-			$this->format_date_hour_text=empty($this->tab_translate['FormatDateHourText'])?"%d %B %Y %H:%M":$this->tab_translate['FormatDateHourText'];
+			$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_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'];
+			$conf->format_date_hour_short=empty($this->tab_translate['FormatDateHourShort'])?"%d/%m/%Y %H:%M":$this->tab_translate['FormatDateHourShort'];
+			$conf->format_date_hour_text_short=empty($this->tab_translate['FormatDateHourTextShort'])?"%d %b %Y %H:%M":$this->tab_translate['FormatDateHourTextShort'];
+			$conf->format_date_hour_text=empty($this->tab_translate['FormatDateHourText'])?"%d %B %Y %H:%M":$this->tab_translate['FormatDateHourText'];
+			//print $domain." => ".$this->defaultlang." ".$conf->format_date_hour_short." ".$this->tab_translate['FormatDateHourShort'];
 		}
 
 		if (empty($this->tab_loaded[$domain])) $this->tab_loaded[$domain]=2;           // Marque ce fichier comme non trouve
-- 
GitLab