Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[ljcom] r13049: LJSUP-14607 (Opportunity to show error p...

Committer: ailyin
LJSUP-14607 (Opportunity to show error page instead of pages, defined by URL)
U   trunk/bin/upgrading/proplists-local.dat
U   trunk/cgi-bin/LJ/Widget/ErrorPage.pm
U   trunk/htdocs/error-page.bml.text
Modified: trunk/bin/upgrading/proplists-local.dat
===================================================================
--- trunk/bin/upgrading/proplists-local.dat	2012-12-13 13:53:46 UTC (rev 13048)
+++ trunk/bin/upgrading/proplists-local.dat	2012-12-14 08:43:50 UTC (rev 13049)
@@ -62,6 +62,14 @@
   multihomed: 0
   prettyname: User banned from specified promos
 
+userproplist.blocked_countries_list:
+  cldversion: 8
+  datatype: char
+  des: List of contries this journal cannot be viewed in
+  indexed: 0
+  multihomed: 0
+  prettyname: Blocked countries list
+
 userproplist.check_suspicious:
   cldversion: 8
   datatype: char
@@ -1044,6 +1052,12 @@
   prettyname: Entry banned from specified promos
   sortorder: 105
 
+logproplist.blocked_countries_list:
+  datatype: char
+  des: List of contries this entry cannot be viewed in
+  prettyname: Blocked countries list
+  sortorder: 
+
 logproplist.ljtimes_recs:
   datatype: char
   des: Packed list of userids of users, recommended this entry for LJ Times

Modified: trunk/cgi-bin/LJ/Widget/ErrorPage.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-12-13 13:53:46 UTC (rev 13048)
+++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-12-14 08:43:50 UTC (rev 13049)
@@ -413,6 +413,15 @@
             'links'       => [ qw( home faq sitemap ) ],
         };
     },
+
+    'region_block' => sub {
+        return {
+            'title'       => LJ::Lang::ml('.errorpage.region_block.title'),
+            'description' => LJ::Lang::ml('.errorpage.region_block.description'),
+            'links'       => [qw( recent home faq sitemap status )],
+        };
+    },
+
 );
 
 $handlers{$_} = $handlers{'private'} foreach qw( forfriends custom members );

Modified: trunk/htdocs/error-page.bml.text
===================================================================
--- trunk/htdocs/error-page.bml.text	2012-12-13 13:53:46 UTC (rev 13048)
+++ trunk/htdocs/error-page.bml.text	2012-12-14 08:43:50 UTC (rev 13049)
@@ -126,6 +126,10 @@
 .errorpage.recent_entries|staleness=1
 .errorpage.recent_entries=<a [[aopts]]>Recent Entries</a> of this journal
 
+.errorpage.region_block.title=Blocked
+
+.errorpage.region_block.description=This page is not available in your region because the authorities have requested that we block it.
+
 .errorpage.suspend.link.faq|staleness=1
 .errorpage.suspend.link.faq=<a [[aopts]]>Learn about suspended journals</a>
 

Tags: ailyin, andy, dat, 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