Merge lp:~unifield-team/unifield-server/server_aio49 into lp:unifield-server

[Xavier ALT]

Hi,

This is a fix for AIO-49:

- allow override language by env
- set a custom environment for openerp-server windows service to force it to "english" language, and "UTC" timezone.

Regards,
Xavier

=== modified file 'bin/tools/translate.py'
--- bin/tools/translate.py	2013-03-01 16:57:24 +0000
+++ bin/tools/translate.py	2013-03-11 06:58:20 +0000
@@ -985,7 +985,10 @@
 
 def get_locales(lang=None):
     if lang is None:
-        lang = locale.getdefaultlocale()[0]
+        if os.name == 'nt' and os.environ.get('LANG'):
+            lang = os.environ['LANG']
+        else:
+            lang = locale.getdefaultlocale()[0]
 
     if os.name == 'nt':
         lang = _LOCALE2WIN32.get(lang, lang)

=== modified file 'setup.nsi'
--- setup.nsi	2012-11-26 13:40:13 +0000
+++ setup.nsi	2013-03-11 06:58:20 +0000
@@ -206,7 +206,11 @@
 
     nsExec::Exec '"$INSTDIR\openerp-server.exe" --stop-after-init --logfile "$INSTDIR\openerp-server.log" -s'
     nsExec::Exec '"$INSTDIR\service\OpenERPServerService.exe" -auto -install'
+<<<<<<< TREE
     nsExec::Exec 'sc failure openerp-server-6.0 reset= 0 actions= restart/0/restart/0/restart/0'
+=======
+    nsExec::Exec 'reg add HKLM\SYSTEM\CurrentControlSet\services\openerp-server-6.0 /v Environment /t REG_MULTI_SZ /d LANG=en_US /f'
+>>>>>>> MERGE-SOURCE
 SectionEnd
 
 Section -RestartServer