holyandrew (holyandrew) wrote in changelog,
holyandrew
holyandrew
changelog

[ljcom] r11858: LJSUP-11857: Cyr sub domains

Committer: akanashin
LJSUP-11857: Cyr sub domains
U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/Console/Command/DomainRU.pm
U   trunk/cgi-bin/LJ/Widget/ErrorPage.pm
U   trunk/htdocs/error-page.bml.text
Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-04-27 17:36:28 UTC (rev 11857)
+++ trunk/bin/upgrading/en_LJ.dat	2012-04-28 08:05:36 UTC (rev 11858)
@@ -8042,7 +8042,6 @@
 shop.error.domainru.errordomain=Invalid format. Please enter other domain name
 shop.error.domainru.needtokens=There was an error processing your request: You only have [[tokens]] LJ Tokens in your Wallet, which is not enough to pay [[price]] for domain RF.
 shop.error.domainru.not_your_account=You do not own this account
-shop.error.domainru.page_not_found=Account with name %domainname% doesn't exist. If you want to buy this domain %domainname%.жж.рф, please go to <here should be a link to appropriate page>
 shop.error.domainru.useddomain=Sorry, this domain is already in use. You can track user if he has been purged somewhen and his domain become vacant
 shop.error.domainru.warning.anon=This service is available for logged in users only. Please sign in or sign up
 shop.error.domainru.warning.upgrade=To buy domain please upgrade your account

Modified: trunk/cgi-bin/LJ/Console/Command/DomainRU.pm
===================================================================
--- trunk/cgi-bin/LJ/Console/Command/DomainRU.pm	2012-04-27 17:36:28 UTC (rev 11857)
+++ trunk/cgi-bin/LJ/Console/Command/DomainRU.pm	2012-04-28 08:05:36 UTC (rev 11858)
@@ -19,7 +19,6 @@
 
 sub can_execute {
     my $remote = LJ::get_remote();
-    return 1;
     return LJ::check_priv($remote, "domainru");
 }
 

Modified: trunk/cgi-bin/LJ/Widget/ErrorPage.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-04-27 17:36:28 UTC (rev 11857)
+++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-04-28 08:05:36 UTC (rev 11858)
@@ -113,6 +113,16 @@
         };
     },
 
+    'baddomainru' => sub {
+        my %args             = @_;
+        return {
+            'title'        => LJ::Lang::ml('.errorpage.baddomainru.title'),
+            'description'  => LJ::Lang::ml('.errorpage.baddomainru.description', { 'domainname' => $args{'journal_username'}, 'uri' => $args{'uri'} }),
+            'links'        => [qw( home faq sitemap )],
+            'ads_location' => 'error_page.baduser',
+        };
+    },
+
     'suspended_post' => sub {
         my %args             = @_;
         my $journal_username = $args{'journal_username'};

Modified: trunk/htdocs/error-page.bml.text
===================================================================
--- trunk/htdocs/error-page.bml.text	2012-04-27 17:36:28 UTC (rev 11857)
+++ trunk/htdocs/error-page.bml.text	2012-04-28 08:05:36 UTC (rev 11858)
@@ -5,12 +5,16 @@
 .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.baduser.description|staleness=1
 .errorpage.baduser.description=The username [[username]] is not currently registered.
 
 .errorpage.baduser.link.faq|staleness=1
 .errorpage.baduser.link.faq=<a [[aopts]]>FAQ</a>
 
+.errorpage.baddomainru.title=Unknown Domain
+
 .errorpage.baduser.title|staleness=1
 .errorpage.baduser.title=Unknown User
 

Tags: akanashin, dat, holyandrew, ljcom, pm, text
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments