Browse Source

Removed after-migration localization of fixtures

Rafał Pitoń 11 years ago
parent
commit
35275441bc

+ 3 - 3
misago/conf/forms.py

@@ -34,13 +34,13 @@ class ValidateChoicesNum(object):
 
 
 def basic_kwargs(setting, extra):
 def basic_kwargs(setting, extra):
     kwargs = {
     kwargs = {
-        'label': _(setting.name),
+        'label': setting.name,
         'initial': setting.value,
         'initial': setting.value,
         'required': extra.get('min_length') or extra.get('min'),
         'required': extra.get('min_length') or extra.get('min'),
     }
     }
 
 
     if setting.description:
     if setting.description:
-        kwargs['help_text'] = _(setting.description)
+        kwargs['help_text'] = setting.description
 
 
     if setting.form_field == 'yesno':
     if setting.form_field == 'yesno':
         # YesNoSwitch is int-base and setting is bool based
         # YesNoSwitch is int-base and setting is bool based
@@ -129,7 +129,7 @@ def setting_field(FormType, setting):
                                field_extra)
                                field_extra)
 
 
     if setting.legend:
     if setting.legend:
-        form_field.legend = _(setting.legend)
+        form_field.legend = setting.legend
 
 
     FormType = type('FormType%s' % setting.pk, (FormType,),
     FormType = type('FormType%s' % setting.pk, (FormType,),
                     {setting.setting: form_field})
                     {setting.setting: form_field})

+ 5 - 5
misago/templates/misago/admin/conf/group.html

@@ -2,7 +2,7 @@
 {% load i18n misago_forms %}
 {% load i18n misago_forms %}
 
 
 
 
-{% block title %}{% trans active_group.name %} | {{ block.super }}{% endblock %}
+{% block title %}{{ active_group.name }} | {{ block.super }}{% endblock %}
 
 
 
 
 {% block header %}
 {% block header %}
@@ -12,7 +12,7 @@
   </div>
   </div>
   <div class="sub">
   <div class="sub">
     <span class="fa fa-chevron-right"></span>
     <span class="fa fa-chevron-right"></span>
-    {% trans active_group.name %}
+    {{ active_group.name }}
   </div>
   </div>
 {% endblock header%}
 {% endblock header%}
 
 
@@ -23,9 +23,9 @@
     {% csrf_token %}
     {% csrf_token %}
 
 
     <div class="form-header">
     <div class="form-header">
-      <h1>{% trans active_group.name %}</h1>
+      <h1>{{ active_group.name }} </h1>
       {% if active_group.description %}
       {% if active_group.description %}
-      <p>{% trans active_group.description %}</p>
+      <p>{{ active_group.description }}</p>
       {% endif %}
       {% endif %}
     </div>
     </div>
 
 
@@ -41,7 +41,7 @@
         {% for fieldset in fieldsets %}
         {% for fieldset in fieldsets %}
         <fieldset>
         <fieldset>
           {% if fieldset.legend %}
           {% if fieldset.legend %}
-          <legend>{% trans fieldset.legend %}</legend>
+          <legend>{{ fieldset.legend }}</legend>
           {% endif %}
           {% endif %}
 
 
           {% for field in fieldset.form %}
           {% for field in fieldset.form %}

+ 3 - 3
misago/templates/misago/admin/conf/index.html

@@ -25,7 +25,7 @@
         {% for group in settings_groups %}
         {% for group in settings_groups %}
         <li {% if group.key == active_group.key %}class="active"{% endif %}>
         <li {% if group.key == active_group.key %}class="active"{% endif %}>
           <a href="{% url 'misago:admin:settings:group' group_key=group.key %}">
           <a href="{% url 'misago:admin:settings:group' group_key=group.key %}">
-            {% trans group.name %}
+            {{ group.name }}
           </a>
           </a>
         </li>
         </li>
         {% endfor %}
         {% endfor %}
@@ -40,9 +40,9 @@
 
 
           {% for group in settings_groups %}
           {% for group in settings_groups %}
           <a href="{% url 'misago:admin:settings:group' group_key=group.key %}" class="list-group-item">
           <a href="{% url 'misago:admin:settings:group' group_key=group.key %}" class="list-group-item">
-            <h4 class="list-group-item-heading">{% trans group.name %}</h4>
+            <h4 class="list-group-item-heading">{{ group.name }}</h4>
             {% if group.description %}
             {% if group.description %}
-            <p class="list-group-item-text">{% trans group.description %}</p>
+            <p class="list-group-item-text">{{ group.description }}</p>
             {% endif %}
             {% endif %}
           </a>
           </a>
           {% endfor %}
           {% endfor %}

+ 3 - 3
misago/templates/misago/admin/forumroles/form.html

@@ -4,7 +4,7 @@
 
 
 {% block title %}
 {% block title %}
 {% if target.pk %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target.name }}
 {% else %}
 {% else %}
 {% trans "New role" %}
 {% trans "New role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 
 {% block page-target %}
 {% block page-target %}
 {% if target.pk %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target.name }}
 {% else %}
 {% else %}
 {% trans "New role" %}
 {% trans "New role" %}
 {% endif %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 {% block form-header %}
 <h1>
 <h1>
   {% if target.pk %}
   {% if target.pk %}
-  {% trans target.name %}
+  {{ target.name }}
   {% else %}
   {% else %}
   {% trans "New role" %}
   {% trans "New role" %}
   {% endif %}
   {% endif %}

+ 3 - 3
misago/templates/misago/admin/ranks/form.html

@@ -4,7 +4,7 @@
 
 
 {% block title %}
 {% block title %}
 {% if target.pk %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target.name }}
 {% else %}
 {% else %}
 {% trans "New rank" %}
 {% trans "New rank" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 
 {% block page-target %}
 {% block page-target %}
 {% if target.pk %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target.name }}
 {% else %}
 {% else %}
 {% trans "New rank" %}
 {% trans "New rank" %}
 {% endif %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 {% block form-header %}
 <h1>
 <h1>
   {% if target.pk %}
   {% if target.pk %}
-  {% trans target.name %}
+  {{ target.name }}
   {% else %}
   {% else %}
   {% trans "New rank" %}
   {% trans "New rank" %}
   {% endif %}
   {% endif %}

+ 3 - 3
misago/templates/misago/admin/roles/form.html

@@ -4,7 +4,7 @@
 
 
 {% block title %}
 {% block title %}
 {% if target.pk %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target.name }}
 {% else %}
 {% else %}
 {% trans "New role" %}
 {% trans "New role" %}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
 {% endif %} | {{ active_link.name }} | {{ block.super }}
@@ -13,7 +13,7 @@
 
 
 {% block page-target %}
 {% block page-target %}
 {% if target.pk %}
 {% if target.pk %}
-{% trans target.name %}
+{{ target.name }}
 {% else %}
 {% else %}
 {% trans "New role" %}
 {% trans "New role" %}
 {% endif %}
 {% endif %}
@@ -23,7 +23,7 @@
 {% block form-header %}
 {% block form-header %}
 <h1>
 <h1>
   {% if target.pk %}
   {% if target.pk %}
-  {% trans target.name %}
+  {{ target.name }}
   {% else %}
   {% else %}
   {% trans "New role" %}
   {% trans "New role" %}
   {% endif %}
   {% endif %}

+ 5 - 5
misago/users/views/admin/ranks.py

@@ -43,15 +43,15 @@ class DeleteRank(RankAdmin, generic.ButtonView):
         if target.is_default:
         if target.is_default:
             message = _('Rank "%s" is default rank and '
             message = _('Rank "%s" is default rank and '
                         'can\'t be deleted.')
                         'can\'t be deleted.')
-            return message % unicode(target.name)
+            return message % target.name
         if target.user_set.exists():
         if target.user_set.exists():
             message = _('Rank "%s" is assigned to users and '
             message = _('Rank "%s" is assigned to users and '
                         'can\'t be deleted.')
                         'can\'t be deleted.')
-            return message % unicode(target.name)
+            return message % target.name
 
 
     def button_action(self, request, target):
     def button_action(self, request, target):
         target.delete()
         target.delete()
-        message = _('Rank "%s" has been deleted.') % unicode(target.name)
+        message = _('Rank "%s" has been deleted.') % target.name
         messages.success(request, message)
         messages.success(request, message)
 
 
 
 
@@ -100,9 +100,9 @@ class RankUsers(RankAdmin, generic.TargetedView):
 class DefaultRank(RankAdmin, generic.ButtonView):
 class DefaultRank(RankAdmin, generic.ButtonView):
     def check_permissions(self, request, target):
     def check_permissions(self, request, target):
         if target.is_default:
         if target.is_default:
-            return _('Rank "%s" is already default.') % unicode(target.name)
+            return _('Rank "%s" is already default.') % target.name
 
 
     def button_action(self, request, target):
     def button_action(self, request, target):
         Rank.objects.make_rank_default(target)
         Rank.objects.make_rank_default(target)
         message = _('Rank "%s" has been made default.')
         message = _('Rank "%s" has been made default.')
-        messages.success(request, message % unicode(target.name))
+        messages.success(request, message % target.name)