[ljcom] r11909: LJSUP-12103: Incorrect Unknown journal p...

LJSUP-12103: Incorrect Unknown journal page

U   trunk/cgi-bin/LJ/Widget/ErrorPage.pm
U   trunk/htdocs/error-page.bml.text

Modified: trunk/cgi-bin/LJ/Widget/ErrorPage.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-05-10 08:30:14 UTC (rev 11908)
+++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-05-10 09:20:49 UTC (rev 11909)
@@ -118,7 +118,7 @@
         my %args             = @_;
         return {
             'title'        => LJ::Lang::ml('.errorpage.baddomainru.title'),
-            'description'  => LJ::Lang::ml('.errorpage.baddomainru.description', { 'domainname' => $args{'domainname'}, 'uri' => $args{'uri_domain_shop'} }),
+            'description'  => LJ::Lang::ml('.errorpage.baddomainru.description', { 'domainname' => LJ::Request->header_in('Host'), 'uri' => "$LJ::SITEROOT/shop/domain_ru.bml" }),
             'links'        => [qw( home faq sitemap )],
             'ads_location' => 'error_page.baduser',
         };
@@ -372,9 +372,6 @@
     my $remote                  = $args{'remote'};
     my $active_journal_username = $args{'active_journal_username'};
 
-    my $domainname = $args{'domainname'};
-    my $uri_domain_shop = $args{'uri_domain_shop'};
-
     my $journal;
     if ( defined $active_journal_username ) {
         $journal = LJ::load_user($active_journal_username);
@@ -386,8 +383,6 @@
         'remote'                => $remote,
         'journal_username'      => $active_journal_username,
         'remote_equals_journal' => LJ::u_equals( $remote, $journal ),
-        'domainname'            => $domainname,
-        'uri_domain_shop'       => $uri_domain_shop,
     );
 
     LJ::Lang::current_scope('/error-page.bml');

Modified: trunk/htdocs/error-page.bml.text
===================================================================
--- trunk/htdocs/error-page.bml.text	2012-05-10 08:30:14 UTC (rev 11908)
+++ trunk/htdocs/error-page.bml.text	2012-05-10 09:20:49 UTC (rev 11909)
@@ -5,7 +5,8 @@
 .errorpage.advanced_search.label|staleness=1
 .errorpage.advanced_search.label=Advanced Search
 
-.errorpage.baddomainru.description=Account with name [[domainname]] doesn't exist. If you want to buy this domain [[domainname]].жж.рф, please go to [[uri]]
+.errorpage.baddomainru.description|staleness=1
+.errorpage.baddomainru.description=Account with name [[domainname]] doesn't exist. If you want to buy this domain [[domainname]], please go to [[uri]]
 
 .errorpage.baduser.description|staleness=1
 .errorpage.baduser.description=The username [[username]] is not currently registered.
@@ -13,6 +14,7 @@
 .errorpage.baduser.link.faq|staleness=1
 .errorpage.baduser.link.faq=<a [[aopts]]>FAQ</a>
 
+.errorpage.baddomainru.title|staleness=1
 .errorpage.baddomainru.title=Unknown Domain
 
 .errorpage.baduser.title|staleness=1