1 # HG changeset patch

     1 # HG changeset patch

     2 # User Wolfgang Rosenauer <wr@rosenauer.org>

     2 # User Wolfgang Rosenauer <wr@rosenauer.org>

     4 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE

     4 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE

     5 

     5 

     6 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp

     6 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp

     7 --- a/intl/locale/src/nsLocaleService.cpp

     7 --- a/intl/locale/src/nsLocaleService.cpp

     8 +++ b/intl/locale/src/nsLocaleService.cpp

     8 +++ b/intl/locale/src/nsLocaleService.cpp

    39              }

    39              }

    40              if (NS_FAILED(result)) {

    40              if (NS_FAILED(result)) {

    41                  return;

    41                  return;

    42              }

    42              }

    43 +            // LANGUAGE is overriding LC_MESSAGES

    43 +            // LANGUAGE is overriding LC_MESSAGES

    45 +                CopyASCIItoUTF16(language, platformLocale);

    45 +                CopyASCIItoUTF16(language, platformLocale);

    46 +                result = posixConverter->GetXPLocale(language, xpLocale);

    46 +                result = posixConverter->GetXPLocale(language, xpLocale);

    47 +            }

    47 +            }

    48              resultLocale->AddCategory(category, xpLocale);

    48              resultLocale->AddCategory(category, xpLocale);

    49              resultLocale->AddCategory(category_platform, platformLocale);

    49              resultLocale->AddCategory(category_platform, platformLocale);