ecere/sys/GetEnvironment (win32); i18n: More fixes

diff --git a/ecere/src/sys/System.c b/ecere/src/sys/System.c
index 87ea268..8f06578 100644 (file)
--- a/ecere/src/sys/System.c
+++ b/ecere/src/sys/System.c
@@ -263,7 +263,8 @@ char * System_GetEnvironment(char * envName, char * envValue, int max)
       envValue[0] = 0;
 
    __ecereNameSpace__ecere__com__eSystem_Delete(_wenvName);
-   return success ? envValue : null;
+   // Distinguish empty vs. unexisting environment variables with GetLastError()
+   return (success || !GetLastError()) ? envValue : null;
 #else
    char * result = getenv(envName);
    if(result)

diff --git a/ecere/src/sys/i18n.ec b/ecere/src/sys/i18n.ec
index e31f8fa..709189b 100644 (file)
--- a/ecere/src/sys/i18n.ec
+++ b/ecere/src/sys/i18n.ec
@@ -60,7 +60,10 @@ public dllexport void LoadTranslatedStrings(String moduleName, char * name)
       colon = strstr(language, ":");
       if(colon) *colon = 0;
       locale = language;
+      if(!strcmpi(locale, "zh"))
+         strcpy(locale, "zh_CN");
    }
+
    if(locale)
    {
       char * under;