From 338abc715485104e2c92b6e52fba148765a84d33 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 22 Apr 2013 10:04:57 -0400 Subject: [PATCH 1/2] DOCSYSTEM Arreglo para setlocale para windows Arreglo para setlocale para windows --- .../engine/classes/class.configuration.php | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 40ed01f23..7ab70e9c7 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -532,12 +532,30 @@ class Configurations // extends Configuration } $langLocate = SYS_LANG; - if (SYS_LANG == 'es') { - $langLocate = 'es_ES'; - } else if (strlen(SYS_LANG) > 2) { - $langLocate = str_replace('-', '_', SYS_LANG); + if (G::toLower(PHP_OS) == 'linux') { + if (SYS_LANG == 'es') { + $langLocate = 'es_ES'; + } else if (strlen(SYS_LANG) > 2) { + $langLocate = str_replace('-', '_', SYS_LANG); + } else { + $langLocate = 'en_US'; + } } else { - $langLocate = 'en_US'; + switch (SYS_LANG) { + case 'es': + case 'es_ES': + $langLocate = 'ESN'; + break; + case 'pt': + case 'pt-BR': + $langLocate = 'PTB'; + break; + case 'en': + case 'en': + default: + $langLocate = 'EST'; + break; + } } setlocale(LC_TIME, $langLocate); From 3f4e328cf833b8a46d30a67d9431c08157bec2ad Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 22 Apr 2013 10:18:27 -0400 Subject: [PATCH 2/2] DOCSYSTEM Arreglo en setlocale para windows Arreglo en setlocale para windows --- workflow/engine/classes/class.configuration.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 7ab70e9c7..b3a7fa60b 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -532,7 +532,7 @@ class Configurations // extends Configuration } $langLocate = SYS_LANG; - if (G::toLower(PHP_OS) == 'linux') { + if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') { if (SYS_LANG == 'es') { $langLocate = 'es_ES'; } else if (strlen(SYS_LANG) > 2) { @@ -551,7 +551,7 @@ class Configurations // extends Configuration $langLocate = 'PTB'; break; case 'en': - case 'en': + case 'en_US': default: $langLocate = 'EST'; break;