[Rt-commit] rt branch, master, updated. rt-3.9.7-1167-g4af89b5

[? sunnavy]

The branch, master has been updated
       via  4af89b550a672a3f5c6b5337d879b3a41162837d (commit)
       via  8c796049ca380d2e92117377908db9c0e7d4b148 (commit)
      from  9fd4796113958251fbcfa7b4f1795e32353c0fb6 (commit)

Summary of changes:
 lib/RT/Test.pm                |    2 +-
 share/html/Install/index.html |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 8c796049ca380d2e92117377908db9c0e7d4b148
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jan 6 10:14:46 2011 +0800

    site config file is not always etc/RT_SiteConfig.pm

diff --git a/share/html/Install/index.html b/share/html/Install/index.html
index cc94003..7c62232 100644
--- a/share/html/Install/index.html
+++ b/share/html/Install/index.html
@@ -91,7 +91,8 @@
 my @errors;
 my $locked;
 
-my $file = File::Spec->catfile( $RT::EtcPath, 'RT_SiteConfig.pm' );
+require RT::Installer;
+my $file = RT::Installer->ConfigFile();
 
 if ( ! -e $file ) {
     # write a blank RT_SiteConfig.pm

commit 4af89b550a672a3f5c6b5337d879b3a41162837d
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu Jan 6 10:15:21 2011 +0800

    add zh_CN support in tests

diff --git a/lib/RT/Test.pm b/lib/RT/Test.pm
index 9ecbd29..d7b7d3b 100644
--- a/lib/RT/Test.pm
+++ b/lib/RT/Test.pm
@@ -231,7 +231,7 @@ sub bootstrap_config {
 Set( \$WebDomain, "localhost");
 Set( \$WebPort,   $port);
 Set( \$WebPath,   "");
-Set( \@LexiconLanguages, qw(en zh_TW fr));
+Set( \@LexiconLanguages, qw(en zh_TW zh_CN fr));
 Set( \$RTAddressRegexp , qr/^bad_re_that_doesnt_match\$/);
 };
     if ( $ENV{'RT_TEST_DB_SID'} ) { # oracle case

-----------------------------------------------------------------------