Merge branch 'develop' of https://github.com/tback/django-rosetta into tback-develop

Conflicts:
	rosetta/__init__.py
This commit is contained in:
Marco Bonetti 2013-12-26 15:02:38 +01:00
commit 5125ebac7f

View file

@ -1,4 +1,4 @@
{% extends "rosetta/base.html" %}
{% extends "rosetta/base.html" %}{% load admin_static %}
{% load rosetta i18n %}
{% load url from future %}
@ -40,23 +40,14 @@
</ul>
<div id="changelist" class="module{% if rosetta_i18n_lang_bidi %} rtl{% endif %}">
<div id="toolbar">
<form id="changelist-search" action="" method="post">
<div>
{% rosetta_csrf_token %}
<label for="searchbar"><img src="{{ADMIN_IMAGE_DIR}}/icon_searchbox.png" alt="{% trans "Search" %}" /></label>
<input type="text" size="40" name="query" value="{% if query %}{{query}}{% endif %}" id="searchbar" tabindex="0" />
<input type="submit" name="search" value="{% trans "Go" %}" />
</div>
</form>
{% comment %}
{% if rosetta_settings.ENABLE_TRANSLATION_SUGGESTIONS %}
<form id="translate-all">
<div>
<input type="submit" class="googleall" value="{% trans "Suggest All Translations" %}" />
</div>
</form>
{% endif %}
{% endcomment %}
<form id="changelist-search" action="" method="post">
<div>
{% rosetta_csrf_token %}
<label for="searchbar"><img src="{% static "admin/img/icon_searchbox.png" %}" alt="{% trans "Search" %}" /></label>
<input type="text" size="40" name="query" value="{% if query %}{{query}}{% endif %}" id="searchbar" tabindex="0" />
<input type="submit" name="search" value="{% trans "Go" %}" />
</div>
</form>
</div>
<form method="post" action="">