Indefero

Indefero Commit Details


Date:2011-03-10 02:23:01 (14 years 7 months ago)
Author:Ciaran Gultnieks
Branch:develop, feature-issue_links, feature.better-home, feature.content-md5, feature.diff-whitespace, feature.download-md5, feature.issue-links, feature.issue-of-others, feature.issue-summary, feature.search-filter, feature.webrepos, feature.wiki-default-page, release-1.1, release-1.2, release-1.3
Commit:4411086f29ef4e59d0aa78124fb461020539444d
Parents: 0b3ce03036340eb18ee5b50485c0380d924e0248
Message:First set of files with English text corrections (partially resolves issue 631)
Changes:

File differences

src/IDF/Form/Admin/ProjectCreate.php
182182
183183
184184
185
185
186186
187187
188188
// 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;␊
}␊
src/IDF/Form/Admin/ProjectUpdate.php
8888
8989
9090
91
91
9292
9393
9494
$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.'␊
));␊
}␊
␊
src/IDF/Form/Admin/UserCreate.php
6868
6969
7070
71
71
7272
7373
7474
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(␊
src/IDF/Form/Admin/UserUpdate.php
7878
7979
8080
81
81
8282
8383
8484
......
161161
162162
163163
164
164
165165
166166
167167
......
173173
174174
175175
176
176
177177
178178
179179
'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,␊
'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.'),␊
));␊
}␊
␊
'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.'),␊
));␊
}␊
␊
src/IDF/Form/IssueTrackingConf.php
7777
7878
7979
80
80
8181
8282
8383
{␊
$this->fields['labels_issue_template'] = new Pluf_Form_Field_Varchar(␊
array('required' => false,␊
'label' => __('Define an issue template to hint the reporter to provide certain information'),␊
'label' => __('Define an issue template to hint to the reporter to provide certain information'),␊
'initial' => self::init_template,␊
'widget_attrs' => array('rows' => 7,␊
'cols' => 75),␊
src/IDF/Form/Register.php
4242
4343
4444
45
45
4646
4747
4848
......
5252
5353
5454
55
55
5656
5757
5858
......
9494
9595
9696
97
97
9898
9999
100100
'max_length' => 15,␊
'min_length' => 3,␊
'initial' => $login,␊
'help_text' => __('The login must be between 3 and 15 characters long and contains only letters and digits.'),␊
'help_text' => __('The login must be between 3 and 15 characters long and contain only letters and digits.'),␊
'widget_attrs' => array(␊
'maxlength' => 15,␊
'size' => 10,␊
array('required' => true,␊
'label' => __('Your email'),␊
'initial' => '',␊
'help_text' => __('We will never send you any unsolicited emails. We hate spams too!'),␊
'help_text' => __('We will never send you any unsolicited emails. We hate spam too!'),␊
));␊
␊
$this->fields['terms'] = new Pluf_Form_Field_Boolean(␊
{␊
$this->cleaned_data['email'] = mb_strtolower(trim($this->cleaned_data['email']));␊
if (Pluf::factory('IDF_EmailAddress')->get_user_for_email_address($this->cleaned_data['email']) != null) {␊
throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need, click on the help link to recover your password.'), $this->cleaned_data['email']));␊
throw new Pluf_Form_Invalid(sprintf(__('The email "%s" is already used. If you need to, click on the help link to recover your password.'), $this->cleaned_data['email']));␊
}␊
return $this->cleaned_data['email'];␊
}␊
src/IDF/Form/RegisterConfirmation.php
6969
7070
7171
72
72
7373
7474
7575
'label' => __('Your password'),␊
'initial' => '',␊
'widget' => 'Pluf_Form_Widget_PasswordInput',␊
'help_text' => __('Your password must be hard for other people to find it, but easy for you to remember.'),␊
'help_text' => __('Your password must be hard for other people to guess, but easy for you to remember.'),␊
'widget_attrs' => array(␊
'maxlength' => 50,␊
'size' => 15,␊
src/IDF/Form/Upload.php
8383
8484
8585
86
86
8787
8888
8989
if (strlen($extra)) $extra .= '|';␊
if (!preg_match('/\.('.$extra.'png|jpg|jpeg|gif|bmp|psd|tif|aiff|asf|avi|bz2|css|doc|eps|gz|jar|mdtext|mid|mov|mp3|mpg|ogg|pdf|ppt|ps|qt|ra|ram|rm|rtf|sdd|sdw|sit|sxi|sxw|swf|tgz|txt|wav|xls|xml|war|wmv|zip)$/i', $this->cleaned_data['file'])) {␊
@unlink(Pluf::f('upload_path').'/'.$this->project->shortname.'/files/'.$this->cleaned_data['file']);␊
throw new Pluf_Form_Invalid(__('For security reason, you cannot upload a file with this extension.'));␊
throw new Pluf_Form_Invalid(__('For security reasons, you cannot upload a file with this extension.'));␊
}␊
return $this->cleaned_data['file'];␊
}␊
src/IDF/Form/UserAccount.php
163163
164164
165165
166
166
167167
168168
169169
......
359359
360360
361361
362
362
363363
364364
365365
'widget_attrs' => array('rows' => 3,␊
'cols' => 40),␊
'widget' => 'Pluf_Form_Widget_TextareaInput',␊
'help_text' => __('Paste a SSH or monotone public key. Be careful to not provide your private key here!')␊
'help_text' => __('Paste an SSH or monotone public key. Be careful to not provide your private key here!')␊
));␊
␊
$this->fields['secondary_mail'] = new Pluf_Form_Field_Email(␊
}␊
else {␊
throw new Pluf_Form_Invalid(␊
__('Public key looks neither like a SSH '.␊
__('Public key looks like neither an SSH '.␊
'nor monotone public key.'));␊
}␊
␊

Archive Download the corresponding diff file

Page rendered in 0.74301s using 14 queries.