diff --git a/NEWS.mdtext b/NEWS.mdtext index 17cc691..9a50b7b 100644 --- a/NEWS.mdtext +++ b/NEWS.mdtext @@ -8,6 +8,13 @@ ## Translations +# InDefero 1.2.1 - XXX XXX XX XX:XX:XX UTC 201X + +## Language and Translations + +- Multiple fixes to English source strings (fixes issues 763 and 766, + 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) diff --git a/src/IDF/Commit.php b/src/IDF/Commit.php index 0e724ad..aea863c 100644 --- a/src/IDF/Commit.php +++ b/src/IDF/Commit.php @@ -235,7 +235,7 @@ class IDF_Commit extends Pluf_Model -
'.sprintf(__('Commit %s, by %s'), ''.$this->scm_id.'', $user).'
'; +
'.sprintf(__('Commit %s, by %s'), ''.$this->scm_id.'', $user).'
'; return Pluf_Template::markSafe($out); } diff --git a/src/IDF/Form/Admin/ProjectCreate.php b/src/IDF/Form/Admin/ProjectCreate.php index c39a028..e57f3ed 100644 --- a/src/IDF/Form/Admin/ProjectCreate.php +++ b/src/IDF/Form/Admin/ProjectCreate.php @@ -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.' )); } diff --git a/src/IDF/Form/Admin/UserUpdate.php b/src/IDF/Form/Admin/UserUpdate.php index 9126bfa..fa2da76 100644 --- a/src/IDF/Form/Admin/UserUpdate.php +++ b/src/IDF/Form/Admin/UserUpdate.php @@ -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.'), )); } diff --git a/src/IDF/Form/IssueCreate.php b/src/IDF/Form/IssueCreate.php index 3f89988..f6b2d84 100644 --- a/src/IDF/Form/IssueCreate.php +++ b/src/IDF/Form/IssueCreate.php @@ -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.')); } } diff --git a/src/IDF/Form/Register.php b/src/IDF/Form/Register.php index dba6f30..985a8ac 100644 --- a/src/IDF/Form/Register.php +++ b/src/IDF/Form/Register.php @@ -94,7 +94,7 @@ class IDF_Form_Register extends Pluf_Form { $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 to, click on the help link to recover your password.'), $this->cleaned_data['email'])); + throw new Pluf_Form_Invalid(sprintf(__('The email "%1$s" is already used. If you need to, you can recover your password.'), $this->cleaned_data['email'], Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryAsk'))); } return $this->cleaned_data['email']; } diff --git a/src/IDF/Form/RegisterConfirmation.php b/src/IDF/Form/RegisterConfirmation.php index b652111..bfdf77e 100644 --- a/src/IDF/Form/RegisterConfirmation.php +++ b/src/IDF/Form/RegisterConfirmation.php @@ -107,7 +107,7 @@ class IDF_Form_RegisterConfirmation extends Pluf_Form throw new Pluf_Form_Invalid($error); } if ($users[0]->active) { - throw new Pluf_Form_Invalid(__('This account has already been confirmed. Maybe should you try to recover your password using the help link.')); + throw new Pluf_Form_Invalid(sprintf(__('This account has already been confirmed. Maybe should you try to recover your password.'), Pluf_HTTP_URL_urlForView('IDF_Views::passwordRecoveryAsk'))); } $this->_user_id = $email_id[1]; return $this->cleaned_data['key']; diff --git a/src/IDF/Form/SourceConf.php b/src/IDF/Form/SourceConf.php index df2a6cc..7cae6f3 100644 --- a/src/IDF/Form/SourceConf.php +++ b/src/IDF/Form/SourceConf.php @@ -55,7 +55,7 @@ class IDF_Form_SourceConf extends Pluf_Form array('required' => false, 'label' => __('Webhook URL'), 'initial' => $this->conf->getVal('webhook_url', ''), - 'help_text' => sprintf(__('Learn more about the post-commit web hooks.'), $url), + 'help_text' => sprintf(__('Learn more about the post-commit webhooks.'), $url), 'widget_attrs' => array('size' => 35), )); diff --git a/src/IDF/Form/UpdateUpload.php b/src/IDF/Form/UpdateUpload.php index 1544cb6..4cfe44c 100644 --- a/src/IDF/Form/UpdateUpload.php +++ b/src/IDF/Form/UpdateUpload.php @@ -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.')); } } diff --git a/src/IDF/Form/Upload.php b/src/IDF/Form/Upload.php index 592286e..e67d08c 100644 --- a/src/IDF/Form/Upload.php +++ b/src/IDF/Form/Upload.php @@ -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.')); } } diff --git a/src/IDF/Form/UserAccount.php b/src/IDF/Form/UserAccount.php index 7d9f716..37ba62b 100644 --- a/src/IDF/Form/UserAccount.php +++ b/src/IDF/Form/UserAccount.php @@ -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.'), )); } diff --git a/src/IDF/Form/WikiCreate.php b/src/IDF/Form/WikiCreate.php index df1f966..15dd17d 100644 --- a/src/IDF/Form/WikiCreate.php +++ b/src/IDF/Form/WikiCreate.php @@ -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.')); } } diff --git a/src/IDF/Form/WikiUpdate.php b/src/IDF/Form/WikiUpdate.php index 1b551c8..b8cf504 100644 --- a/src/IDF/Form/WikiUpdate.php +++ b/src/IDF/Form/WikiUpdate.php @@ -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.')); } } diff --git a/src/IDF/Issue.php b/src/IDF/Issue.php index 8d1ed34..5817775 100644 --- a/src/IDF/Issue.php +++ b/src/IDF/Issue.php @@ -211,7 +211,7 @@ class IDF_Issue extends Pluf_Model $ic = (in_array($this->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o'; $out .= sprintf(__('Issue %3$d, %4$s'), $url, $ic, $this->id, Pluf_esc($this->summary)).''; $out .= "\n".' -
'.sprintf(__('Creation of issue %d, by %s'), $url, $ic, $this->id, $user).'
'; +
'.sprintf(__('Creation of issue %d, by %s'), $url, $ic, $this->id, $user).'
'; return Pluf_Template::markSafe($out); } @@ -343,4 +343,4 @@ class IDF_Issue extends Pluf_Model } Pluf_Translation::loadSetLocale($current_locale); } -} \ No newline at end of file +} diff --git a/src/IDF/IssueComment.php b/src/IDF/IssueComment.php index dd4edd8..206f9f0 100644 --- a/src/IDF/IssueComment.php +++ b/src/IDF/IssueComment.php @@ -177,7 +177,7 @@ class IDF_IssueComment extends Pluf_Model } $out .= ''; $out .= "\n".' -
'.sprintf(__('Comment on issue %d, by %s'), $url, $ic, $issue->id, $user).'
'; +
'.sprintf(__('Comment on issue %d, by %s'), $url, $ic, $issue->id, $user).'
'; return Pluf_Template::markSafe($out); } diff --git a/src/IDF/Project.php b/src/IDF/Project.php index f23b34b..4199c6c 100644 --- a/src/IDF/Project.php +++ b/src/IDF/Project.php @@ -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( diff --git a/src/IDF/Review/Comment.php b/src/IDF/Review/Comment.php index 762973d..e247808 100644 --- a/src/IDF/Review/Comment.php +++ b/src/IDF/Review/Comment.php @@ -138,7 +138,7 @@ class IDF_Review_Comment extends Pluf_Model $ic = (in_array($review->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o'; $out .= sprintf(__('Review %3$d, %4$s'), $url, $ic, $review->id, Pluf_esc($review->summary)).''; $out .= "\n".' -
'.sprintf(__('Update of review %d, by %s'), $url, $ic, $review->id, $user).'
'; +
'.sprintf(__('Update of review %d, by %s'), $url, $ic, $review->id, $user).'
'; return Pluf_Template::markSafe($out); } diff --git a/src/IDF/Review/Patch.php b/src/IDF/Review/Patch.php index a98f49d..4acb772 100644 --- a/src/IDF/Review/Patch.php +++ b/src/IDF/Review/Patch.php @@ -150,7 +150,7 @@ class IDF_Review_Patch extends Pluf_Model $ic = (in_array($review->status, $request->project->getTagIdsByStatus('closed'))) ? 'issue-c' : 'issue-o'; $out .= sprintf(__('Review %3$d, %4$s'), $url, $ic, $review->id, Pluf_esc($review->summary)).''; $out .= "\n".' -
'.sprintf(__('Creation of review %d, by %s'), $url, $ic, $review->id, $user).'
'; +
'.sprintf(__('Creation of review %d, by %s'), $url, $ic, $review->id, $user).'
'; return Pluf_Template::markSafe($out); } diff --git a/src/IDF/Search/Occ.php b/src/IDF/Search/Occ.php index f878fa1..46b868f 100644 --- a/src/IDF/Search/Occ.php +++ b/src/IDF/Search/Occ.php @@ -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( diff --git a/src/IDF/Upload.php b/src/IDF/Upload.php index 2a78785..6a28c1b 100644 --- a/src/IDF/Upload.php +++ b/src/IDF/Upload.php @@ -201,7 +201,7 @@ class IDF_Upload extends Pluf_Model $out .= sprintf(__('Download %2$d, %3$s'), $url, $this->id, Pluf_esc($this->summary)).''; $out .= ''; $out .= "\n".' -
'.sprintf(__('Addition of download %d, by %s'), $url, $this->id, $user).'
'; +
'.sprintf(__('Addition of download %d, by %s'), $url, $this->id, $user).'
'; return Pluf_Template::markSafe($out); } diff --git a/src/IDF/WikiPage.php b/src/IDF/WikiPage.php index 23340f0..021115b 100644 --- a/src/IDF/WikiPage.php +++ b/src/IDF/WikiPage.php @@ -195,7 +195,7 @@ class IDF_WikiPage extends Pluf_Model $user = $stag->start($this->get_submitter(), $request, '', false); $out .= sprintf(__('%2$s, %3$s'), $url, Pluf_esc($this->title), Pluf_esc($this->summary)).''; $out .= "\n".' -
'.sprintf(__('Creation of page %s, by %s'), $url, Pluf_esc($this->title), $user).'
'; +
'.sprintf(__('Creation of page %s, by %s'), $url, Pluf_esc($this->title), $user).'
'; return Pluf_Template::markSafe($out); } @@ -221,4 +221,4 @@ class IDF_WikiPage extends Pluf_Model $tmpl = new Pluf_Template('idf/wiki/feedfragment.xml'); return $tmpl->render($context); } -} \ No newline at end of file +} diff --git a/src/IDF/templates/idf/admin/tabs.html b/src/IDF/templates/idf/admin/tabs.html index f221d61..decea32 100644 --- a/src/IDF/templates/idf/admin/tabs.html +++ b/src/IDF/templates/idf/admin/tabs.html @@ -14,7 +14,7 @@   {trans 'Access Rights'} -{trans 'Notification Email'} +{trans 'Notification Emails'} {$form.f.downloads_access_rights.labelTag}: diff --git a/src/IDF/templates/idf/issues/summary.html b/src/IDF/templates/idf/issues/summary.html index 7a7ccb0..8733158 100644 --- a/src/IDF/templates/idf/issues/summary.html +++ b/src/IDF/templates/idf/issues/summary.html @@ -5,7 +5,7 @@ {block body} {if $trackerEmpty} {aurl 'create_url', 'IDF_Views_Issue::create', array($project.shortname)} -

{blocktrans}The issue tracker is empty.
You can create your first issue here.{/blocktrans}

+

{blocktrans}The issue tracker is empty.
Create your first issue.{/blocktrans}

{else}
{foreach $tagStatistics as $key => $class} diff --git a/src/IDF/templates/idf/issues/view.html b/src/IDF/templates/idf/issues/view.html index 452ffd7..606437d 100644 --- a/src/IDF/templates/idf/issues/view.html +++ b/src/IDF/templates/idf/issues/view.html @@ -3,11 +3,11 @@ {block body}
{if $previous_issue_id} -Previous issue +Previous issue {/if} {if $previous_issue_id and $next_issue_id} - {/if} {if $next_issue_id} -Next issue +Next issue {/if}
{assign $i = 0} diff --git a/src/IDF/templates/idf/login_form.html b/src/IDF/templates/idf/login_form.html index c7e8edb..a9f313c 100644 --- a/src/IDF/templates/idf/login_form.html +++ b/src/IDF/templates/idf/login_form.html @@ -30,6 +30,6 @@ document.getElementById('id_login').focus()

{trans 'Welcome.'}

{aurl 'url', 'IDF_Views::register', array()} -

{blocktrans}If you don't have an account yet, you can create one here.{/blocktrans}

+

{blocktrans}You can create an account if you don't have one yet.{/blocktrans}

{trans 'It takes less than a minute to create your account.'}

{/block} diff --git a/src/IDF/templates/idf/project/home.html b/src/IDF/templates/idf/project/home.html index d8b468d..58b9d5d 100644 --- a/src/IDF/templates/idf/project/home.html +++ b/src/IDF/templates/idf/project/home.html @@ -15,14 +15,14 @@ {foreach $downloads as $download} {$download}
{/foreach} - {trans 'show more...'} + {trans 'show more...'} {/if} {if count($pages) > 0}

{trans 'Featured Documentation'}
{foreach $pages as $page} {$page.title}
{/foreach} - {trans 'show more...'} + {trans 'show more...'} {/if} {assign $ko = 'owners'} {assign $km = 'members'} diff --git a/src/IDF/templates/idf/register/index.html b/src/IDF/templates/idf/register/index.html index 38c30bf..a5f9f64 100644 --- a/src/IDF/templates/idf/register/index.html +++ b/src/IDF/templates/idf/register/index.html @@ -34,7 +34,7 @@ {if $form.f.terms.errors}{$form.f.terms.fieldErrors}{/if} {$form.f.terms|unsafe} {$form.f.terms.labelTag}
-{blocktrans}Read the terms and conditions – basically "Please be nice, we respect you".{/blocktrans} +{blocktrans}Read the terms and conditions – basically "Please be nice, we respect you".{/blocktrans} @@ -49,7 +49,7 @@

{trans 'Be sure to provide a valid email address, as we are sending a validation link by email.'}

{aurl 'url', 'IDF_Views::passwordRecoveryAsk'} -

{blocktrans}If you have just forgotten your login information, then there is no need to create a new account. Just go here to recover your login name and password.{/blocktrans}

+

{blocktrans}If you have just forgotten your login information, then there is no need to create a new account. You can just recover your login name and password.{/blocktrans}

{trans 'Did you know?'}
{aurl 'url', 'IDF_Views::faq'} {blocktrans}With your account, you will able to participate in the life of all the projects hosted here. Participating in a software project must be fun, so if you have troubles, you can let us know about your issues at anytime!{/blocktrans}

diff --git a/src/IDF/templates/idf/source/commit.html b/src/IDF/templates/idf/source/commit.html index 6b88158..4ff919b 100644 --- a/src/IDF/templates/idf/source/commit.html +++ b/src/IDF/templates/idf/source/commit.html @@ -44,7 +44,7 @@ M{$filename}{if !empty($diff.files[$filename])}{assign $ndiff = count($diff.files[$filename]['chunks'])} ({blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}){/if} {/foreach} {foreach $changes.properties as $filename => $properties} -P{$filename} +P{$filename} {foreach $properties as $key => $value}
{$key}