[Gemstracker-svn] SF.net SVN: gemstracker:[1152] trunk/library/classes/Gems/Default/ StaffAction.php

[<gem...@li...>]

Revision: 1152
          http://sourceforge.net/p/gemstracker/code/1152
Author:   matijsdejong
Date:     2013-02-21 16:56:30 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
A better language default

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/StaffAction.php

Modified: trunk/library/classes/Gems/Default/StaffAction.php
===================================================================
--- trunk/library/classes/Gems/Default/StaffAction.php	2013-02-21 15:49:51 UTC (rev 1151)
+++ trunk/library/classes/Gems/Default/StaffAction.php	2013-02-21 16:56:30 UTC (rev 1152)
@@ -59,6 +59,13 @@
     public $defaultStaffDefinition = Gems_User_UserLoader::USER_STAFF;
 
     public $filterStandard = array('gsf_active' => 1);
+
+    /**
+     *
+     * @var Gems_Project_ProjectSettings
+     */
+    public $project;
+
     public $sortKey = array('name' => SORT_ASC);
 
     /**
@@ -348,7 +355,11 @@
             $org    = $this->loader->getOrganization($this->menu->getParameterSource()->getMenuParameter('gsf_id_organization', $this->loader->getCurrentUser()->getCurrentOrganizationId()));
             $orgDef = $org->get('gor_user_class', $this->defaultStaffDefinition);
             $model->set('gul_user_class',       'default', $orgDef, 'multiOptions', $this->loader->getUserLoader()->getAvailableStaffDefinitions());
-            $model->set('gsf_iso_lang',         'label', $this->_('Language'), 'multiOptions', $this->util->getLocalized()->getLanguages());
+            $model->set('gsf_iso_lang',
+                    'label', $this->_('Language'),
+                    'multiOptions', $this->util->getLocalized()->getLanguages(),
+                    'default', $this->project->locale['default']
+                    );
             $model->set('gul_can_login',        'label', $this->_('Can login'), 'multiOptions', $this->util->getTranslated()->getYesNo(), 'default', 1);
             $model->set('gsf_logout_on_survey', 'label', $this->_('Logout on survey'), 'multiOptions', $this->util->getTranslated()->getYesNo());
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.