french translation

This commit is contained in:
Nicolas Lœuillet 2015-10-01 09:26:52 +02:00
parent 8e417206d5
commit cfb28c9da0
7 changed files with 21 additions and 45 deletions

View file

@ -15,7 +15,7 @@ class EntryFilterType extends AbstractType
private $repository;
/**
* Repository & user are used to get a list of language entries for this user
* Repository & user are used to get a list of language entries for this user.
*
* @param EntityRepository $entryRepository
* @param User $user

View file

@ -163,9 +163,9 @@ class EntryRepository extends EntityRepository
}
/**
* Used only in test case to get the right entry associated to the right user
* Used only in test case to get the right entry associated to the right user.
*
* @param string $username
* @param string $username
*
* @return Entry
*/

View file

@ -24,6 +24,7 @@ Add a new entry: 'Sauvegarder un nouvel article'
Search: 'Rechercher'
Filter entries: 'Filtrer les articles'
Enter your search here: 'Saisissez votre terme de recherche'
Save new entry: 'Sauvegarder un nouvel article'
# Config screen
Settings: 'Paramètres'
@ -115,3 +116,15 @@ Entry unstarred: "Article retiré des favoris"
Entry archived: "Article marqué comme lu"
Entry unarchived: "Article marqué comme non lu"
Entry deleted: "Article supprimé"
# Entry
Mark as read: 'Marquer comme lu'
Favorite: 'Mettre en favori'
back: 'Retour'
original article: 'Article original'
Add a tag: 'Ajouter un tag'
Share: 'Partager'
Download: 'Télécharger'
Does this article appear wrong?: "Est-ce que cet article s'affiche mal ?"
Problems?: 'Un problème ?'
Edit title: "Modifier le titre"

View file

@ -54,7 +54,7 @@
<li class="bold hide-on-med-and-down">
<a class="waves-effect collapsible-header" title="{% trans %}Mark as read{% endtrans %}" href="{{ path('archive_entry', { 'id': entry.id }) }}" id="markAsRead">
<i class="{% if entry.isArchived == 0 %}mdi-action-done{% else %}mdi-content-redo{% endif %} small"></i>
<span>{% trans %}Toggle mark as read{% endtrans %}</span>
<span>{% trans %}Mark as read{% endtrans %}</span>
</a>
<div class="collapsible-body"></div>
</li>
@ -62,7 +62,7 @@
<li class="bold hide-on-med-and-down">
<a class="waves-effect collapsible-header" title="{% trans %}Favorite{% endtrans %}" href="{{ path('star_entry', { 'id': entry.id }) }}" id="setFav">
<i class="{% if entry.isStarred == 0 %}mdi-action-favorite-outline{% else %}mdi-action-favorite{% endif %} small"></i>
<span>{% trans %}Toggle favorite{% endtrans %}</span>
<span>{% trans %}Favorite{% endtrans %}</span>
</a>
<div class="collapsible-body"></div>
</li>

View file

@ -42,10 +42,11 @@
<li class="bold {% if currentRoute == 'unread' or currentRoute == 'homepage' %}active{% endif %}"><a class="waves-effect" href="{{ path('unread') }}">{% trans %}unread{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'starred' %}active{% endif %}"><a class="waves-effect" href="{{ path('starred') }}">{% trans %}starred{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'archive' %}active{% endif %}"><a class="waves-effect" href="{{ path('archive') }}">{% trans %}archive{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
<li class="bold border-bottom {% if currentRoute == 'all' %}active{% endif %}"><a class="waves-effect" href="{{ path('all') }}">{% trans %}all{% endtrans %}</a></li>
<li class="bold border-bottom {% if currentRoute == 'tags' %}active{% endif %}"><a class="waves-effect" href="{{ path('tag') }}">{% trans %}tags{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'config' %}active{% endif %}"><a class="waves-effect" href="{{ path('config') }}">{% trans %}config{% endtrans %}</a></li>
<li class="bold {% if currentRoute == 'howto' %}active{% endif %}"><a class="waves-effect" href="{{ path('howto') }}">{% trans %}howto{% endtrans %}</a></li>
<li class="bold border-bottom {% if currentRoute == 'about' %}active{% endif %}"><a class="waves-effect" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a></li>
<li class="bold"><a class="waves-effect" class="icon icon-power" href="{{ path('logout') }}" title="{% trans %}logout{% endtrans %}">{% trans %}logout{% endtrans %}</a></li>
</ul>
<div class="nav-wrapper nav-panels">
@ -76,40 +77,3 @@
</div>
</nav>
{% endblock %}
{% block footer %}
<footer class="page-footer cyan darken-2">
<div class="container">
<div class="row">
<div class="col l6 s12">
<h5 class="white-text">{% trans %}Take wallabag with you{% endtrans %}</h5>
<p class="grey-text text-lighten-4">
{% trans %}We are available at{% endtrans %}
<a target="_blank" class="grey-text text-lighten-3" href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">android</a> (<a target="_blank" class="grey-text text-lighten-3" href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.InThePoche">f-droid</a>)
{% trans %}and{% endtrans %}
<a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015">iOS</a>.<br>
{% trans %}Install add-ons for{% endtrans %}
<a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/ru/firefox/addon/wallabag/">firefox</a>
{% trans %}and{% endtrans %}
<a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm">chrome</a>.
</p>
</div>
<div class="col l4 offset-l2 s12">
<h5 class="white-text">{% trans %}Social{% endtrans %}</h5>
<ul>
<li><a target="_blank" class="grey-text text-lighten-3" href="https://twitter.com/wallabagapp">twitter</a></li>
<li><a target="_blank" class="grey-text text-lighten-3" href="https://framasphere.org/u/wallabag">diaspora*</a></li>
<li><a target="_blank" class="grey-text text-lighten-3" href="https://plus.google.com/+WallabagOrg/posts">Google+</a></li>
<li><a target="_blank" class="grey-text text-lighten-3" href="https://facebook.com/Wallabag">Facebook</a></li>
</ul>
</div>
</div>
</div>
<div class="footer-copyright">
<div class="container">
<p>{% trans %}powered by{% endtrans %} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a></p>
<a class="grey-text text-lighten-4 right" href="{{ path('about') }}">{% trans %}About{% endtrans %}</a>
</div>
</div>
</footer>
{% endblock %}

View file

@ -3,7 +3,6 @@
namespace Wallabag\CoreBundle\Tests\Controller;
use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
use Doctrine\ORM\AbstractQuery;
class EntryControllerTest extends WallabagCoreTestCase
{

View file

@ -13,7 +13,7 @@ class WallabagExtension extends \Twig_Extension
public function removeWww($url)
{
return preg_replace('/^www\./i', '',$url);
return preg_replace('/^www\./i', '', $url);
}
public function getName()