Multiple fixes to English language strings.
This commit is contained in:
parent
c9f2575469
commit
df1130b4c9
@ -1,3 +1,9 @@
|
||||
# InDefero 1.2.1 - XXX XXX XX XX:XX:XX UTC 201X
|
||||
|
||||
## Language and Translations
|
||||
|
||||
- Multiple fixes to English source strings (thanks to JP Fleury!)
|
||||
|
||||
# InDefero 1.2 - Sun Nov 6 23:04:00 UTC 2011
|
||||
|
||||
ATTENTION: You need Pluf [46b7f251](http://projects.ceondo.com/p/pluf/source/commit/46b7f251)
|
||||
|
@ -199,7 +199,7 @@ class IDF_Form_Admin_ProjectCreate 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.'
|
||||
));
|
||||
}
|
||||
|
||||
|
@ -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 them.'),
|
||||
'help_text' => __('If you give staff rights to a user, you really need to trust him.'),
|
||||
));
|
||||
}
|
||||
|
||||
|
@ -214,7 +214,7 @@ class IDF_Form_IssueCreate extends Pluf_Form
|
||||
else $count[$class] += 1;
|
||||
if (in_array($class, $onemax) and $count[$class] > 1) {
|
||||
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to an issue.'), $class);
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to an issue.'), $class);
|
||||
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
|
||||
}
|
||||
}
|
||||
|
@ -106,7 +106,7 @@ class IDF_Form_UpdateUpload extends Pluf_Form
|
||||
else $count[$class] += 1;
|
||||
if (in_array($class, $onemax) and $count[$class] > 1) {
|
||||
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to an issue.'), $class);
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to an issue.'), $class);
|
||||
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
|
||||
}
|
||||
}
|
||||
|
@ -116,7 +116,7 @@ class IDF_Form_Upload extends Pluf_Form
|
||||
else $count[$class] += 1;
|
||||
if (in_array($class, $onemax) and $count[$class] > 1) {
|
||||
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to an issue.'), $class);
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to an issue.'), $class);
|
||||
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
|
||||
}
|
||||
}
|
||||
|
@ -56,7 +56,7 @@ class IDF_Form_UserAccount extends Pluf_Form
|
||||
|
||||
$this->fields['email'] = new Pluf_Form_Field_Email(
|
||||
array('required' => true,
|
||||
'label' => __('Your mail'),
|
||||
'label' => __('Your email'),
|
||||
'initial' => $this->user->email,
|
||||
'help_text' => __('If you change your email address, an email will be sent to the new address to confirm it.'),
|
||||
));
|
||||
@ -168,9 +168,9 @@ class IDF_Form_UserAccount extends Pluf_Form
|
||||
|
||||
$this->fields['secondary_mail'] = new Pluf_Form_Field_Email(
|
||||
array('required' => false,
|
||||
'label' => __('Add a secondary mail address'),
|
||||
'label' => __('Add a secondary email address'),
|
||||
'initial' => '',
|
||||
'help_text' => __('You will get a mail to confirm that you own the address you specify.'),
|
||||
'help_text' => __('You will get an email to confirm that you own the address you specify.'),
|
||||
));
|
||||
}
|
||||
|
||||
|
@ -147,7 +147,7 @@ Add your content here. Format your content with:
|
||||
else $count[$class] += 1;
|
||||
if (in_array($class, $onemax) and $count[$class] > 1) {
|
||||
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to a page.'), $class);
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to a page.'), $class);
|
||||
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
|
||||
}
|
||||
}
|
||||
|
@ -158,7 +158,7 @@ class IDF_Form_WikiUpdate extends Pluf_Form
|
||||
else $count[$class] += 1;
|
||||
if (in_array($class, $onemax) and $count[$class] > 1) {
|
||||
if (!isset($this->errors['label'.$i])) $this->errors['label'.$i] = array();
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than label from the %s class to a page.'), $class);
|
||||
$this->errors['label'.$i][] = sprintf(__('You cannot provide more than one label from the %s class to a page.'), $class);
|
||||
throw new Pluf_Form_Invalid(__('You provided an invalid label.'));
|
||||
}
|
||||
}
|
||||
|
@ -67,7 +67,7 @@ class IDF_Project extends Pluf_Model
|
||||
'blank' => false,
|
||||
'size' => 50,
|
||||
'verbose' => __('short name'),
|
||||
'help_text' => __('Used in the url to access the project, must be short with only letters and numbers.'),
|
||||
'help_text' => __('Used in the URL to access the project, must be short with only letters and numbers.'),
|
||||
'unique' => true,
|
||||
),
|
||||
'shortdesc' =>
|
||||
@ -84,7 +84,7 @@ class IDF_Project extends Pluf_Model
|
||||
'blank' => false,
|
||||
'size' => 250,
|
||||
'verbose' => __('description'),
|
||||
'help_text' => __('The description can be extended using the markdown syntax.'),
|
||||
'help_text' => __('The description can be extended using the Markdown syntax.'),
|
||||
),
|
||||
'private' =>
|
||||
array(
|
||||
|
@ -22,7 +22,7 @@
|
||||
# ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/**
|
||||
* Storage of the occurence of the words.
|
||||
* Storage of the occurrence of the words.
|
||||
*/
|
||||
class IDF_Search_Occ extends Pluf_Model
|
||||
{
|
||||
@ -30,7 +30,7 @@ class IDF_Search_Occ extends Pluf_Model
|
||||
|
||||
function init()
|
||||
{
|
||||
$this->_a['verbose'] = __('occurence');
|
||||
$this->_a['verbose'] = __('occurrence');
|
||||
$this->_a['table'] = 'idf_search_occs';
|
||||
$this->_a['model'] = 'IDF_Search_Occ';
|
||||
$this->_a['cols'] = array(
|
||||
@ -72,13 +72,13 @@ class IDF_Search_Occ extends Pluf_Model
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Integer',
|
||||
'blank' => false,
|
||||
'verbose' => __('occurences'),
|
||||
'verbose' => __('occurrences'),
|
||||
),
|
||||
'pondocc' =>
|
||||
array(
|
||||
'type' => 'Pluf_DB_Field_Float',
|
||||
'blank' => false,
|
||||
'verbose' => __('ponderated occurence'),
|
||||
'verbose' => __('ponderated occurrence'),
|
||||
),
|
||||
);
|
||||
$this->_a['idx'] = array(
|
||||
|
@ -14,7 +14,7 @@
|
||||
<tr>
|
||||
<th> </th>
|
||||
<th class="a-c"><strong>{trans 'Access Rights'}</strong></th>
|
||||
<th class="a-c"><strong>{trans 'Notification Email'}</strong></th>
|
||||
<th class="a-c"><strong>{trans 'Notification Emails'}</strong></th>
|
||||
</tr>
|
||||
<tr>
|
||||
<th><strong>{$form.f.downloads_access_rights.labelTag}:</strong></th>
|
||||
|
@ -44,7 +44,7 @@
|
||||
<tr><td><span class="scm-action patched" title="{trans 'modified'}">M</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])}{assign $ndiff = count($diff.files[$filename]['chunks'])} (<a href="#diff-{$filename|md5}">{blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}</a>){/if}</td></tr>
|
||||
{/foreach}
|
||||
{foreach $changes.properties as $filename => $properties}
|
||||
<tr><td><span class="scm-action property-changed" title="{trans 'properies changed'}">P</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>
|
||||
<tr><td><span class="scm-action property-changed" title="{trans 'properties changed'}">P</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>
|
||||
<table class="properties">
|
||||
{foreach $properties as $key => $value}
|
||||
<tr><td>{$key}</td>
|
||||
|
Loading…
Reference in New Issue
Block a user