Merge remote branch 'upstream/master' into BUG-10852

2013-04-23 18:27:19 -04:00
parent fe2a36a417 7d33d4ce06
commit dbf73b721e
8 changed files with 32 additions and 24 deletions
--- a/workflow/engine/classes/class.configuration.php
+++ b/workflow/engine/classes/class.configuration.php
@@ -551,7 +551,7 @@ class Configurations // extends Configuration
                            $langLocate = 'PTB';
                            break;
                        case 'en':
-                        case 'en_US':
+                        case 'en-US':
                        default:
                            $langLocate = 'EST';
                            break;