First set of files with English text corrections (partially resolves
issue 631)
This commit is contained in:
		
				
					committed by
					
						
						Thomas Keller
					
				
			
			
				
	
			
			
			
						parent
						
							0b3ce03036
						
					
				
				
					commit
					4411086f29
				
			@@ -182,7 +182,7 @@ class IDF_Form_Admin_ProjectCreate extends Pluf_Form
 | 
			
		||||
        // we accept only starting with http(s):// to avoid people
 | 
			
		||||
        // trying to access the local filesystem.
 | 
			
		||||
        if (!preg_match('#^(http|https)://#', $url)) {
 | 
			
		||||
            throw new Pluf_Form_Invalid(__('Only a remote repository available throught http or https are allowed. For example "http://somewhere.com/svn/trunk".'));
 | 
			
		||||
            throw new Pluf_Form_Invalid(__('Only a remote repository available through HTTP or HTTPS is allowed. For example "http://somewhere.com/svn/trunk".'));
 | 
			
		||||
        }
 | 
			
		||||
        return $url;
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -88,7 +88,7 @@ class IDF_Form_Admin_ProjectUpdate extends Pluf_Form
 | 
			
		||||
                        $mtn_master_branch)) {
 | 
			
		||||
            throw new Pluf_Form_Invalid(__(
 | 
			
		||||
                'The master branch is empty or contains illegal characters, '.
 | 
			
		||||
                'please use only letters, digits, dashs and dots as separators.'
 | 
			
		||||
                'please use only letters, digits, dashes and dots as separators.'
 | 
			
		||||
            ));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -68,7 +68,7 @@ class IDF_Form_Admin_UserCreate extends Pluf_Form
 | 
			
		||||
                                      array('required' => true,
 | 
			
		||||
                                            'label' => __('Email'),
 | 
			
		||||
                                            'initial' => '',
 | 
			
		||||
                                            'help_text' => __('Double check the email address as the password is directly sent to the user.'),
 | 
			
		||||
                                            'help_text' => __('Double check the email address as the password is sent directly to the user.'),
 | 
			
		||||
                                            ));
 | 
			
		||||
 | 
			
		||||
        $this->fields['language'] = new Pluf_Form_Field_Varchar(
 | 
			
		||||
 
 | 
			
		||||
@@ -78,7 +78,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
 | 
			
		||||
                                            'label' => __('Password'),
 | 
			
		||||
                                            'initial' => '',
 | 
			
		||||
                                            'widget' => 'Pluf_Form_Widget_PasswordInput',
 | 
			
		||||
                                            'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'<br />'.__('The password must be hard for other people to find it, but easy for the user to remember.')),
 | 
			
		||||
                                            'help_text' => Pluf_Template::markSafe(__('Leave blank if you do not want to change the password.').'<br />'.__('The password must be hard for other people to guess, but easy for the user to remember.')),
 | 
			
		||||
                                            'widget_attrs' => array(
 | 
			
		||||
                                                       'maxlength' => 50,
 | 
			
		||||
                                                       'size' => 15,
 | 
			
		||||
@@ -161,7 +161,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
 | 
			
		||||
                          'label' => __('Staff'),
 | 
			
		||||
                          'initial' => $this->user->staff,
 | 
			
		||||
                          'widget' => 'Pluf_Form_Widget_CheckboxInput',
 | 
			
		||||
                          'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
 | 
			
		||||
                          'help_text' => __('If you give staff rights to a user, you really need to trust them.'),
 | 
			
		||||
                          ));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
@@ -173,7 +173,7 @@ class IDF_Form_Admin_UserUpdate extends Pluf_Form
 | 
			
		||||
                          'initial' => $this->user->active,
 | 
			
		||||
                          'widget' => 'Pluf_Form_Widget_CheckboxInput',
 | 
			
		||||
                          'widget_attrs' => $attrs,
 | 
			
		||||
                          'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable his account here.'),
 | 
			
		||||
                          'help_text' => __('If the user is not getting the confirmation email or is abusing the system, you can directly enable or disable their account here.'),
 | 
			
		||||
                          ));
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user