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

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/htdocs/tools/endpoints/domain_ru.bml

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-04-24 11:56:32 UTC (rev 11772)
+++ trunk/bin/upgrading/en_LJ.dat	2012-04-24 12:33:43 UTC (rev 11773)
@@ -8139,6 +8139,8 @@
 
 shop.reports.detailed.diskquota.type.name=Package
 
+shop.reports.detailed.domainru.ask.delete=Are you sure you want to delete domain?
+
 shop.reports.detailed.heading=Detailed Metrics
 
 shop.reports.detailed.paidaccount.name=Paid Accounts
@@ -8449,7 +8451,13 @@
 shop.view.renameaccount.title=Rename Account
 
 shop.view.domainru.authas=You are now working as the username <strong>'[[username]]'</strong>.
-shop.view.domainru.nodomains=You have no domains.
+
+shop.view.domainru.buy=Buy
+
+shop.view.domainru.buydomain=Buy domain
+
+shop.view.domainru.checkbox=Yes, I understand rules and want to buy this domain
+
 shop.view.domainru.current|staleness=1
 shop.view.domainru.current=Current account
 
@@ -8460,33 +8468,32 @@
 shop.view.domainru.desired|staleness=1
 shop.view.domainru.desired=Desired domain
 
+shop.view.domainru.exists=Domain already exists
+
 shop.view.domainru.intro.text<<
 Brief description of the service
 .
 
-shop.view.domainru.checkbox=Yes, I understand rules and want to buy this domain
+shop.view.domainru.intro.title=Domain RF
 
-shop.view.domainru.intro.title=Domain РФ
+shop.view.domainru.invalid=Domain invalid
+ 
+shop.view.domainru.managedomains=Manage domains
 
-shop.view.domainru.title|staleness=1
-shop.view.domainru.title=Domain РФ
+shop.view.domainru.nodomains=You have no domains.
 
 shop.view.domainru.remove=Remove domain
 
-shop.view.domainru.buy=Buy
+shop.view.domainru.title|staleness=1
+shop.view.domainru.title=Domain RF
 
 shop.view.domainru.total=Total:
 
 shop.view.domainru.tokens=LJ Tokens
 
-shop.view.domainru.buydomain=BUY DOMAIN
-
-shop.view.domainru.managedomains=MANAGE DOMAINS
-
 shop.view.domainru.url=.zhzh.rf
 
 
-
 shop.view.selfpromo.promo.text<<
 This service allows you to promote any of your entries (from your journal or community) at the LiveJournal homepage.
 <br />The promoted entry will be placed on the LiveJournal homepage for up to 3 hours but it can be displaced by another user's entry. <br />

Modified: trunk/htdocs/tools/endpoints/domain_ru.bml
===================================================================
--- trunk/htdocs/tools/endpoints/domain_ru.bml	2012-04-24 11:56:32 UTC (rev 11772)
+++ trunk/htdocs/tools/endpoints/domain_ru.bml	2012-04-24 12:33:43 UTC (rev 11773)
@@ -34,8 +34,11 @@
     my $userid = LJ::load_user($user)->userid;
 
     if ($action eq 'delete') {
-        LJ::Pay::Payment::PayItem::DomainRU->delete_domains($userid, $src_name);
-        $ret->{status} = 'ok';
+        if (LJ::Pay::Payment::PayItem::DomainRU->delete_domains($userid, $src_name)) {
+            $ret->{status} = 'ok';
+        } else {
+            $ret->{error} = 'error';
+        }
     }
 
     if ($action eq 'check') {
@@ -53,7 +56,7 @@
             'rcptid'  => $remote->userid,
         );
         my @errs;
-        $ret->{status} = $it->can_belong_to(undef, \@errs, undef, 'additem') ? 'ok' : $errs[0];
+        $ret->{error} = $it->can_belong_to(undef, undef, \@errs, 'additem') ? 'ok' : $errs[0];
     }
 
     BML::set_content_type('text/javascript; charset=utf-8');