diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index e10113f2cda839a6321b692a3dc09b4effe6f3c4..103e156475e647f6b6b50231176016853cd08d04 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 1f17caf242ef839682a6715b76fa30f3781b0a7a..877f2931d7b7b2e9ebdf253c5663a85f94cba4cd 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 0000000000000000000000000000000000000000..129985adb7ec112903317b50e2965560c10911ed
--- /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 1077b3bcaac1ff5df91ec40b1440b786867ff21a..cbb7a41b862901fd388a314a61511449da5cfbf4 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 42fa2afb9f3fd7732e9f70253d19ca579ecffd26..042f9d464269d66a68ddd4d4a4e7c089a77b50f9 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 f45108de53f0c7b5a32996243d996e573e3d396d..c57b531adbf3202e12d4c1cfb87c95086b76b46e 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ä '% s' on
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 8f3eb5bd74131ea7615f26df59d9e31bd0fc332f..fdd3457d9eee4a3070185f73d0e6eb5ebdca9bb8 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 0000000000000000000000000000000000000000..adde4f6d991daa85f1f269cd63eb5c925c88b3ab
--- /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 0000000000000000000000000000000000000000..cb3880656518d1bd618ada83b4743874b0d1c2b6
--- /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 7dd3216bb37c49c300e9321bf57210b7ed0b6497..5c4ffb994fa8606dcce2fc984cd126e41413ab20 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 e70bdf9e5338081686ae4296a13b2f13db248a85..9179426c69b964b3b3262add4fc5cc5c7e17c5be 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 eeacb51c2a1de985edf261f7104579aa00c15c7f..9f5f0a154ffbf8a4d9591ceb6f1ea07027a48c04 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 e86728a92962a486a22f36e5a9ad9c5cc07e2ccc..9133223bbbd6e3177f0def58b50c94e7f3a2f693 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 68794e19d8d845d659bb525ea1c13519c784f6e7..7b31e5c0bdbc531b74d7267370bfecb2daeaf2e1 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 '% s' is vereist
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 80e3e48a756fe71d49ae203d8c0f2579cfd00cc4..3c3417cb051c975df6f13fe6d52bfee1a8592c20 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 '% s' jest wymagane
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index cb3b8d3a9b946a1e460152b086a24dee58157a17..c19acf1e334120fae84d797d26ff590f14f4d980 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 eb606a0f774cbcea9eb5f024c12e42435d200c7b..afcf8d5bbae15e7da31049a21dba0993c7ef2870 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 "% s" este necesar
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 965347320e9be744a72fe6e97a8e434b2f5012f3..e615b49a8fda1f73cd9fbb49eeea954650a08672 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=Поле '% S' требуется
diff --git a/htdocs/translate.class.php b/htdocs/translate.class.php
index e410a7ec107645ff13c022e16f671fbcf20ab4ad..5f6bcdcc0038ab30f90c384d25de0a9efcd70029 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