Merge pull request #280 from cuducos/cuducos-locale-files

Fix i18n bugs

Author: treyhunner

AUTHORS.rst

@@ -10,6 +10,7 @@ Authors
 - Daniel Levy
 - Daniel Roschka
 - David Hite
+- Eduardo Cuducos
 - George Vilches
 - Grzegorz Bialy
 - Hamish Downer

MANIFEST.in

@@ -2,4 +2,5 @@ include MANIFEST.in
 include *.rst
 include *.txt
 recursive-include docs *.rst
+recursive-include simple_history/locale *
 recursive-include simple_history/templates *

simple_history/models.py

@@ -12,7 +12,7 @@
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.encoding import smart_text
 from django.utils.timezone import now
-from django.utils.translation import string_concat
+from django.utils.translation import string_concat, ugettext as _
 
 try:
     from django.apps import apps
@@ -206,9 +206,9 @@ def get_instance(self):
                 user_model, null=True, related_name=self.user_related_name,
                 on_delete=models.SET_NULL),
             'history_type': models.CharField(max_length=1, choices=(
-                ('+', 'Created'),
-                ('~', 'Changed'),
-                ('-', 'Deleted'),
+                ('+', _('Created')),
+                ('~', _('Changed')),
+                ('-', _('Deleted')),
             )),
             'history_object': HistoricalObjectDescriptor(model),
             'instance': property(get_instance),

simple_history/templates/simple_history/object_history.html

@@ -35,7 +35,7 @@
                       {{ action.history_user }}
                     {% endif %}
                   {% else %}
-                    None
+                  {% trans "None" %}
                   {% endif %}
                 </td>
               </tr>