Changeset 206

Timestamp:

12/25/08 10:33:52 (1 year ago)

Author:

aprice30

Message:

Added extra language strings for application/controllers/admin/settings.php, Closes #73

Files:

• trunk/modules/preferences/language/english/preferences_lang.php (modified) (1 diff)
• trunk/system/application/controllers/admin/settings.php (modified) (2 diffs)
• trunk/user_guide/general/changelog.html (modified) (2 diffs)

trunk/modules/preferences/language/english/preferences_lang.php

@@ -26 +26 @@
-$lang['preference_desc_autologin_period'] = 'Number of days for which the user will be logged in automaticaly';
-$lang['preference_desc_login_field'] = 'What way to allow users to login to the system using';
+
+$lang['preference_field_activation_method_none'] = 'No activation required';
+$lang['preference_field_activation_method_email'] = 'Self activation by email';
+$lang['preference_field_activation_method_admin'] = 'Manual activation by an administrator';
-
-// Security Preferences

trunk/system/application/controllers/admin/settings.php

@@ -29 +29 @@
-                parent::Admin_Controller();
-
+                $this->lang->module_load('preferences','preferences');
+
-                log_message('debug','BackendPro : Settings class loaded');
-        }
@@ -52 +54 @@
-
-                $config['field']['allow_user_registration'] = array('type'=>'boolean');
-'No activation required','email'=>'Self activation by email','admin'=>'Manual activation by an administrator'
+$this->lang->line('preference_field_activation_method_none'),'email'=>$this->lang->line('preference_field_activation_method_email'),'admin'=>$this->lang->line('preference_field_activation_method_admin')
-                $config['field']['account_activation_time'] = array('rules'=>'trim|required|numeric');
-                $config['field']['autologin_period'] = array('rules'=>'trim|required|numeric');
-                $config['field']['default_user_group'] = array('type'=>'dropdown','params'=>array('options'=>$this->access_control_model->buildACLDropdown('group','id')));
-                $config['field']['allow_user_profiles'] = array('type'=>'boolean');
-'Email','username'=>'Username','either'=>'Either'
+$this->lang->line('userlib_email'),'username'=>$this->lang->line('userlib_username'),'either'=>$this->lang->line('userlib_email_username')
-
-                $config['field']['use_login_captcha'] = array('type'=>'boolean');

trunk/user_guide/general/changelog.html

@@ -56 +56 @@
-<h3>Additions</h3>
-<ul>
-Status Class 
+
-        <li>CI Profiler Intergration - The CI profiler is now intergrated into the admin control panel. When turned on in the <a href="../features/preferences.html#page_debug">system settings</a> rather than some of the output being hidden it is now clearly visible, See <a href="http://trac2.assembla.com/backendpro/ticket/41">Enhancement #41</a></li>
-        <li>Login Selection - It is now possible to select how a user can login, either with their email, username or either.</li>
@@ -62 +62 @@
-<h3>Modifications</h3>
-<ul>
+        <li>Added some extra language strings for the dropdown options inside <var>application/controllers/admin/settings.php</var>, See <a href="http://trac2.assembla.com/backendpro/ticket/73">Enhancement #73</a></li>
-        <li>Updated the Page Module so it uses the functions in the <a href="http://codeigniter.com/user_guide/helpers/html_helper.html">CodeIgniter HTML helper</a>, See <a href="http://trac2.assembla.com/backendpro/ticket/36">Enhancement #36</a></li>
-        <li>Changed the MY_Controller so the charset header and metatag value is taken from the CI config file, See <a href="http://trac2.assembla.com/backendpro/ticket/74">Enhancement #74</a></li>