Skip to content

Commit

Permalink
Typos fixing
Browse files Browse the repository at this point in the history
  • Loading branch information
stloyd committed Sep 7, 2012
1 parent 1a09667 commit f121fc1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions app/Resources/TwigBundle/views/Exception/error404.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</section>

<section id="error-desc">
<p>Edgar and hid Jedi friends</p>
<p>Can't find page you're lookign for.</p>
<p>Edgar and his Jedi friends</p>
<p>Can't find page you're looking for.</p>
<p id="error-sorry">(we're terribly sorry about this)</p>
</section>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/Knp/Bundle/KnpBundlesBundle/Entity/Bundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@ public function setLastCheckAt(\DateTime $lastCheckAt)
*
* @return \Traversable
*/
public function getContributors($page = null, $limit = 1)
public function getContributors($page = null, $limit = 20)
{
if (null === $page) {
return $this->contributors;
Expand Down
4 changes: 2 additions & 2 deletions src/Knp/Bundle/KnpBundlesBundle/Entity/UserManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ public function getOrCreate($data)
$username = $data;
} elseif ($data instanceof UserResponseInterface) {
if ($data instanceof SensioConnectUserResponse) {
$username = $data->getLinkedAccount('github') ?: $data->getUsername();
$username = $data->getLinkedAccount('github') ?: $data->getNickname();
} else {
$username = $data->getUsername();
$username = $data->getNickname();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,9 @@
<span class="error"></span>
<p class="alert alert-error">Repository exist, validating data...</p>
</li>
{#% if error -%#}
<li class="alert alert-error hide">
Houston, we have a problem! Selected repo probably don’t exist. Try enter another repo.
{#{ errorMessage | trans }#}
<li class="alert alert-error{% if not error %} hide{% endif %}">
{{ errorMessage ? errorMessage|trans : 'Houston, we have a problem! Selected repo probably don’t exist. Try enter another repo.' }}
</li>
{#%- endif %#}
<li class="alert alert-success hide">
<strong>Hey, friend!</strong> Thanks for adding your bundle to our database!
</li>
Expand All @@ -58,7 +55,7 @@
<ul>
{% for bundle in bundles %}
<li>
<img src="{{ bundle.user.gravatarHash|default('http://www.gravatar.com/avatar/?s=30&d=identicon&f=y') }}" alt="">
<img src="{{ bundle.user.gravatarHash|default('http://www.gravatar.com/avatar/?s=30&d=identicon&f=y') }}" alt="" width="30" height="30">

<a href="{{ path('bundle_show', {'username': bundle.username, 'name': bundle.name}) }}">{{ bundle.name }}</a>
<span>{{ bundle.createdAt|date('d-m-Y') }} by <strong>{{ bundle.userName }}</strong></span>
Expand Down

0 comments on commit f121fc1

Please sign in to comment.