From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 13 Sep 2008 09:23:29 +0000 (+1200)
Subject: Merge from trunk
X-Git-Tag: SQUID_3_1_0_1~45^2~24^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a823d3447f82198379301802bc7fe3e57ffc87ff;p=thirdparty%2Fsquid.git

Merge from trunk
---

a823d3447f82198379301802bc7fe3e57ffc87ff
diff --cc src/errorpage.cc
index e057a1313f,ebfd5966e0..2630612405
--- a/src/errorpage.cc
+++ b/src/errorpage.cc
@@@ -975,11 -938,7 +975,11 @@@ ErrorState::BuildContent(
       */
      if(!m) {
          m = error_text[page_id];
 +#if USE_ERR_LOCALES
 +        if(!Config.errorDirectory)
 +            err_language = Config.errorDefaultLanguage;
 +#endif
-         debugs(4, 1, HERE << "No existing languages found. Fall back on default language.");
+         debugs(4, 2, HERE << "No existing error page language negotiated for " << page_id << ". Using default error file.");
      }
  
      assert(m);