Merge 1af428e into 27f943a

liqd · May 16, 2019 · adf134b · adf134b
2 parents 27f943a + 1af428e
commit adf134b
Show file tree

Hide file tree

Showing 9 changed files with 538 additions and 562 deletions.
diff --git a/liqd_product/apps/partners/migrations/0011_kommune_wording_change.py b/liqd_product/apps/partners/migrations/0011_kommune_wording_change.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.20 on 2019-05-16 11:36
+from __future__ import unicode_literals
+
+import adhocracy4.images.fields
+import ckeditor_uploader.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('liqd_product_partners', '0010_update_helptexts'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='partner',
+            name='description',
+            field=models.CharField(help_text='max. 400 characters', max_length=400, verbose_name='Short description of your organisation'),
+        ),
+        migrations.AlterField(
+            model_name='partner',
+            name='information',
+            field=ckeditor_uploader.fields.RichTextUploadingField(blank=True, verbose_name='Information about your organisation'),
+        ),
+        migrations.AlterField(
+            model_name='partner',
+            name='logo',
+            field=adhocracy4.images.fields.ConfiguredImageField('logo', blank=True, help_prefix='The Logo representing your organisation', upload_to='partners/logos', verbose_name='Logo'),
+        ),
+    ]
diff --git a/liqd_product/apps/partners/models.py b/liqd_product/apps/partners/models.py
@@ -19,13 +19,13 @@ class Partner(models.Model):
     )
     description = models.CharField(
         max_length=400,
-        verbose_name=_('Short description of your municipality'),
+        verbose_name=_('Short description of your organisation'),
         help_text=_('max. 400 characters')
     )
     logo = images_fields.ConfiguredImageField(
         'logo',
         verbose_name=_('Logo'),
-        help_prefix=_('The Logo representing your municipality'),
+        help_prefix=_('The Logo representing your organisation'),
         upload_to='partners/logos',
         blank=True
     )
@@ -46,7 +46,7 @@ class Partner(models.Model):
     )
     information = RichTextUploadingField(
         config_name='image-editor',
-        verbose_name=_('Information about your municipality'),
+        verbose_name=_('Information about your organisation'),
         blank=True
     )
     imprint = RichTextField(

diff --git a/liqd_product/apps/partners/templates/partner_form.html b/liqd_product/apps/partners/templates/partner_form.html
@@ -6,7 +6,7 @@
 {% block content %}
 <div class="l-wrapper">
     <div class="l-center-8">
-        <h1>{% trans "Edit your municipality information" %}</h1>
+        <h1>{% trans "Edit your organisation information" %}</h1>
 
         <form enctype="multipart/form-data" action="{{ request.path }}" method="post">
             {% csrf_token %}

diff --git a/liqd_product/apps/partners/views.py b/liqd_product/apps/partners/views.py
@@ -63,7 +63,7 @@ class PartnerUpdateView(rules_mixins.PermissionRequiredMixin,
     form_class = forms.PartnerForm
     slug_url_kwarg = 'partner_slug'
     template_name = 'partner_form.html'
-    success_message = _('Municipality successfully updated.')
+    success_message = _('Organisation successfully updated.')
     permission_required = 'liqd_product_partners.change_partner'
     menu_item = 'partner'
 

diff --git a/liqd_product/templates/a4dashboard/base_project_list.html b/liqd_product/templates/a4dashboard/base_project_list.html
@@ -22,7 +22,7 @@
         {% if user_may_change_partner %}
             <a href="{% url 'partner-settings' partner_slug=view.organisation.partner.slug %}"
                class="btn btn--light btn--full">
-                {% trans 'Municipality settings' %}
+                {% trans 'Organisation settings' %}
             </a>
         {% endif %}
     </nav>