Indefero Commit Details

Date:

2011-11-28 17:13:28 (13 years 5 months ago)

Author:

Jean-Philippe Fleury

Branch:

develop, release-1.2, release-1.3

Commit:

df1130b4c991830c27800de9985975cf56552226

Parents:

c9f2575469d84e152300775c0f14976a82d027c7

Message:

Multiple fixes to English language strings.

Changes:

File differences

-
2
3
4
5
6
1 7
2 8
3 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)␊
+# 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
200 200
201 201
202 
202
203 203
204 204
205 205
+                        $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.'␊
            ));␊
        }␊
␊
                         $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
162 162
163 163
164 
164
165 165
166 166
167 167
+                          '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.'),␊
                          ));␊
        }␊
␊
                           '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
215 215
216 216
217 
217
218 218
219 219
220 220
+            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.'));␊
            }␊
        }␊
             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.'));␊
             }␊
         }␊

-55
56 56
57 57
58 
58
59 59
60 60
61 61
+                    array('required' => false,␊
                          'label' => __('Webhook URL'),␊
                          'initial' => $this->conf->getVal('webhook_url', ''),␊
                          'help_text' => sprintf(__('Learn more about the <a href="%s">post-commit web hooks</a>.'), $url),␊
                          'help_text' => sprintf(__('Learn more about the <a href="%s">post-commit webhooks</a>.'), $url),␊
                          'widget_attrs' => array('size' => 35),␊
                          ));␊
␊
                     array('required' => false,␊
                           'label' => __('Webhook URL'),␊
                           'initial' => $this->conf->getVal('webhook_url', ''),␊
-                          'help_text' => sprintf(__('Learn more about the <a href="%s">post-commit web hooks</a>.'), $url),␊
+                          'help_text' => sprintf(__('Learn more about the <a href="%s">post-commit webhooks</a>.'), $url),␊
                           'widget_attrs' => array('size' => 35),␊
                           ));␊
 ␊

-106
107 107
108 108
109 
109
110 110
111 111
112 112
+            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.'));␊
            }␊
        }␊
             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
117 117
118 118
119 
119
120 120
121 121
122 122
+            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.'));␊
            }␊
        }␊
             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
57 57
58 58
59 
59
60 60
61 61
62 62
... ...
168 168
169 169
170 170
171 
171
172 172
173 
173
174 174
175 175
176 176
+␊
        $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.'),␊
                                            ));␊

␊
        $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.'),␊
                                            ));␊
    }␊
␊
 ...
 ␊
         $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.'),␊
                                             ));␊
 ␊
         $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
148 148
149 149
150 
150
151 151
152 152
153 153
+            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.'));␊
            }␊
        }␊
             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
159 159
160 160
161 
161
162 162
163 163
164 164
+            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.'));␊
            }␊
        }␊
             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
68 68
69 69
70 
70
71 71
72 72
73 73
... ...
84 84
85 85
86 86
87 
87
88 88
89 89
90 90
+                                  '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' =>␊

                                  '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(␊
 ...
                                   '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' =>␊
                                   '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(␊

-14
15 15
16 16
17 
17
18 18
19 19
20 20
+<tr>␊
<th>&nbsp;</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>␊
 <tr>␊
 <th>&nbsp;</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
45 45
46 46
47 
47
48 48
49 49
50 50
+<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>␊
 <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>␊

Download the corresponding diff file

Indefero

File differences

Branches

Tags