Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Further reworking of translations

Roland Geideraa883cdfaf65
diff --git a/wger/config/views/languages.py b/wger/config/views/languages.py
index 7b53c0e38..e9d6b944e 100644
--- a/wger/config/views/languages.py
+++ b/wger/config/views/languages.py
@@ -59,7 +59,7 @@ class LanguageCreateView(WgerFormMixin, CreateView):
'''
model = Language
- title = ugettext_lazy('Add new language')
+ title = ugettext_lazy('Add')
form_action = reverse_lazy('config:language:add')
permission_required = 'core.add_language'
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index a06a65a8e..8ceb7d0dc 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -2,7 +2,7 @@
{% load i18n %}
{% load staticfiles %}
-{% block title %} {% trans "Dashboard" %}{% endblock %}
+{% block title %}{% trans "Dashboard" %}{% endblock %}
{% block header %}
{% endblock %}
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index cc20c86fa..3861ac024 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -40,7 +40,7 @@
</tr>
{% empty %}
<tr>
- <td colspan="2">{% trans "No licenses found" %}</td>
+ <td colspan="2">{% trans "Nothing found" %}</td>
</tr>
{% endfor %}
</tbody>
@@ -61,9 +61,9 @@
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
- alt="{% trans 'Add new license' %}"
- title="{% trans 'Add new license' %}">
- {% trans "Add new license" %}
+ alt="{% trans 'Add' %}"
+ title="{% trans 'Add' %}">
+ {% trans "Add" %}
</a>
</p>
diff --git a/wger/core/templates/user/delete_account.html b/wger/core/templates/user/delete_account.html
index b5078ad36..c3a4aa664 100644
--- a/wger/core/templates/user/delete_account.html
+++ b/wger/core/templates/user/delete_account.html
@@ -4,7 +4,7 @@
{% load staticfiles %}
{% load wger_extras %}
-{% block title %} {% trans "Delete account" %}{% endblock %}
+{% block title %}{% trans "Delete account" %}{% endblock %}
{% block header %}
diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
index 03dac47a5..bf3b95ff1 100644
--- a/wger/core/templates/user/login.html
+++ b/wger/core/templates/user/login.html
@@ -4,7 +4,7 @@
{% load staticfiles %}
{% load wger_extras %}
-{% block title %} {% trans "Login" %}{% endblock %}
+{% block title %}{% trans "Login" %}{% endblock %}
{% block header %}
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index 377186e09..2ac0d8ad2 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -51,7 +51,7 @@ class LicenseAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
model = License
success_url = reverse_lazy('core:license:list')
- title = ugettext_lazy('Add new license')
+ title = ugettext_lazy('Add')
form_action = reverse_lazy('core:license:add')
permission_required = 'core.add_license'
diff --git a/wger/exercises/templates/equipment/list.html b/wger/exercises/templates/equipment/list.html
index 4d7c60307..dbb380442 100644
--- a/wger/exercises/templates/equipment/list.html
+++ b/wger/exercises/templates/equipment/list.html
@@ -38,7 +38,7 @@
</tr>
{% empty %}
<tr>
- <td colspan="2">{% trans "No equipment found" %}</td>
+ <td colspan="2">{% trans "Nothing found" %}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/wger/exercises/templates/exercise/pending.html b/wger/exercises/templates/exercise/pending.html
index a0cf9c2d9..934d585b8 100644
--- a/wger/exercises/templates/exercise/pending.html
+++ b/wger/exercises/templates/exercise/pending.html
@@ -27,7 +27,7 @@
</tr>
{% empty %}
<tr>
- <td colspan="2">{% trans "No pending exercises at the moment" %}</td>
+ <td colspan="2">{% trans "Nothing found" %}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/wger/gym/templates/gym/member_list.html b/wger/gym/templates/gym/member_list.html
index 8c30d2995..73889f427 100644
--- a/wger/gym/templates/gym/member_list.html
+++ b/wger/gym/templates/gym/member_list.html
@@ -59,7 +59,7 @@ $(document).ready( function () {
{% endif %}
{% empty %}
<tr>
- <td colspan="4">{% trans "No users for this gym found" %}</td>
+ <td colspan="4">{% trans "Nothing found" %}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 962f7a824..a00a06ebb 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -117,7 +117,7 @@ class GymAddView(WgerFormMixin, CreateView):
model = Gym
success_url = reverse_lazy('gym:gym:list')
- title = ugettext_lazy('Add gym')
+ title = ugettext_lazy('Add new gym')
form_action = reverse_lazy('gym:gym:add')
permission_required = 'gym.add_gym'
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index 9bf8893cf..53578def6 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -3,7 +3,7 @@
{% load staticfiles %}
{% load wger_extras %}
-{% block title %}{% trans "New weight log" %} – {{day.description}}{% endblock %}
+{% block title %}{% trans "New weight log" %} – {{day.description}}{% endblock %}
{% block header %}
<script type="text/javascript">
@@ -51,7 +51,7 @@ $(document).ready(function () {
<tr>
{% for form in value.forms %}
<td>{% trans "Reps" %}</td>
- <td>{% trans "kg." %}</td>
+ <td>{% trans "kg" %}</td>
{% endfor %}
</tr>
</table>
diff --git a/wger/manager/templates/tags/render_weight_log.html b/wger/manager/templates/tags/render_weight_log.html
index c277b63eb..4a5f52524 100644
--- a/wger/manager/templates/tags/render_weight_log.html
+++ b/wger/manager/templates/tags/render_weight_log.html
@@ -23,7 +23,7 @@
<tr>
<td style="text-align:right;">{% trans "Reps" %}</td>
<td></td>
- <td style="padding:0px;">{% trans "kg." %}</td>
+ <td style="padding:0px;">{% trans "kg" %}</td>
</tr>
{% for entry in entry_list %}
<tr>
diff --git a/wger/manager/templates/workout/email_reminder.html b/wger/manager/templates/workout/email_reminder.html
index 6712c2089..20019fa91 100644
--- a/wger/manager/templates/workout/email_reminder.html
+++ b/wger/manager/templates/workout/email_reminder.html
@@ -11,7 +11,7 @@ Alternatively you can add workouts to a loop schedule, such schedules
never produce reminders. If you don't want to ever receive email
reminders, deactivate the option in your settings.{% endblocktrans %}
-{% trans " the wger.de team" %}
+{% trans "the wger.de team" %}
* http://{{site}}{{workout.get_absolute_url}}
diff --git a/wger/manager/templates/workout/timer.html b/wger/manager/templates/workout/timer.html
index 8b44b61a1..803108cb6 100644
--- a/wger/manager/templates/workout/timer.html
+++ b/wger/manager/templates/workout/timer.html
@@ -320,7 +320,7 @@ $(document).ready(function() {
<div class="sub_header">
<h2>
{% if step.weight %}
- {{step.reps}} × {{step.weight}} kg.
+ {{step.reps}} × {{step.weight}} {% trans "kg" %}.
{% else %}
{% if step.reps == 99 %}∞{% else %}{{step.reps}}{% endif %} {% trans "reps" %}
{% endif %}
diff --git a/wger/nutrition/templates/ingredient/email_new.html b/wger/nutrition/templates/ingredient/email_new.html
index 7e4856bf8..0546fdb82 100644
--- a/wger/nutrition/templates/ingredient/email_new.html
+++ b/wger/nutrition/templates/ingredient/email_new.html
@@ -6,4 +6,4 @@ added to nutrition plans. You can access it on this address:{% endblocktrans %}
{{url}}
{% blocktrans %}Thank you for contributing and making this site better!{% endblocktrans %}
- — {% blocktrans %}the wger.de team{% endblocktrans %}
\ No newline at end of file
+ — {% trans "the wger.de team" %}
\ No newline at end of file
diff --git a/wger/nutrition/templates/ingredient/pending.html b/wger/nutrition/templates/ingredient/pending.html
index ae9ce4620..7d049ba12 100644
--- a/wger/nutrition/templates/ingredient/pending.html
+++ b/wger/nutrition/templates/ingredient/pending.html
@@ -27,7 +27,7 @@
</tr>
{% empty %}
<tr>
- <td colspan="2">{% trans "No pending ingredients at the moment" %}</td>
+ <td colspan="2">{% trans "Nothing found" %}</td>
</tr>
{% endfor %}
</tbody>
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index bbfb76791..2bfa4483c 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -40,7 +40,7 @@
</tr>
{% empty %}
<tr>
- <td colspan="2">{% trans "No units found" %}</td>
+ <td colspan="2">{% trans "Nothing found" %}</td>
</tr>
{% endfor %}
</tbody>