Updating language files for new Walled Garden support.

git-svn-id: http://code.elgg.org/elgg/trunk@6048 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index fb47dc012c01bbed1c0f7ca0d2b30fc321ec679b..36630548e9f7e285abb708e72419b6d6a10a2648 100644 (file)
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -251,7 +251,7 @@ class ElggSite extends ElggEntity {
                        register_plugin_hook('index', 'system', 'elgg_walled_garden_index');
                        
                        if (!$this->is_public_page()) {
-                               register_error(elgg_echo('walled_garden:private_page') . current_page_url());
+                               register_error(elgg_echo('loggedinrequired'));
                                forward();
                        }
                }

diff --git a/languages/en.php b/languages/en.php
index 83a7c5159c3a5f86617ff829142e6f9ea09122bd..11ecfbdb687d2b99f1ca1ca36608b0ba6651a648 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -774,6 +774,13 @@ Alternatively, you can enter your database settings below and we will try and do
        'installation:debug:error' => 'Display only critical errors',
        'installation:debug:warning' => 'Display errors and warnings',
        'installation:debug:notice' => 'Log all errors, warnings and notices',
+       
+       // Walled Garden support
+       'installation:registration:description' => 'User registration is enabled by default. Turn this off if you do not want new users to be able to register on their own.',
+       'installation:registration:label' => 'Allow new users to register',
+       'installation:walled_garden:description' => 'Enable the site to run as a Walled Garden. This will not allow non logged-in users to view any site pages other than those specifically marked as public.',
+       'installation:walled_garden:label' => 'Restrict pages to logged-in users',
+       
        'installation:httpslogin' => "Enable this to have user logins performed over HTTPS. You will need to have https enabled on your server for this to work.",
        'installation:httpslogin:label' => "Enable HTTPS logins",
        'installation:view' => "Enter the view which will be used as the default for your site or leave this blank for the default view (if in doubt, leave as default):",